Browse Source

Pull request #12107: REPORT-90546 把设计器和平台调用的方法区分开

Merge in DESIGN/design from ~MAXIMUS/design:final/11.0 to final/11.0

* commit '83fd0c01a08ea08e1632801b93c583777ce34223':
  REPORT-90546 把设计器和平台调用的方法区分开
  REPORT-90546 把设计器和平台调用的方法区分开
new-design
Maximus-郭晓龙 2 years ago
parent
commit
07ec6457c4
  1. 6
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

6
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@ -589,7 +589,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
} else { } else {
path = driverPath; path = driverPath;
} }
if(JarFileParseUtil.hasDuplicateDriver(con.getDriver(), path)) { if(hasDuplicateDriver(con.getDriver(), path)) {
testResult.setForeground(Color.RED); testResult.setForeground(Color.RED);
testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_Conflict")); testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_Conflict"));
} else { } else {
@ -605,7 +605,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
return xBorderPanel; return xBorderPanel;
} }
private boolean hasDuplicateDriver(String driver, String folder) {
return JarFileParseUtil.hasDuplicateDriver(driver, folder);
}
} }
} }

Loading…
Cancel
Save