Browse Source

Merge pull request #13237 in DESIGN/design from release/10.0 to final/10.0

* commit 'e2a41a3a3b5d139625405aa4702039a6afee53bf':
  无jira 添加日志
final/10.0
superman 12 months ago
parent
commit
315aff60ba
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

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

@ -129,6 +129,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
} catch (InterruptedException e) { } catch (InterruptedException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} catch (ExecutionException e) { } catch (ExecutionException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
dialog.setSize(new Dimension(380, 142)); dialog.setSize(new Dimension(380, 142));
midPane.setVisible(true); midPane.setVisible(true);
hiddenPanel.setVisible(false); hiddenPanel.setVisible(false);
@ -339,6 +340,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
if (mainPanel instanceof JDBCDefPane) { if (mainPanel instanceof JDBCDefPane) {
ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup")); ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup"));
actionLabel.addActionListener(new ActionListener() { actionLabel.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
JDialog wDialog = createJDialog(); JDialog wDialog = createJDialog();
if (wDialog != null) { if (wDialog != null) {

Loading…
Cancel
Save