|
|
@ -73,6 +73,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
private UIComboBox charSetComboBox; |
|
|
|
private UIComboBox charSetComboBox; |
|
|
|
private String originalCharSet = null; |
|
|
|
private String originalCharSet = null; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private JPanel mainPanel; |
|
|
|
// Database pane
|
|
|
|
// Database pane
|
|
|
|
public DatabaseConnectionPane() { |
|
|
|
public DatabaseConnectionPane() { |
|
|
|
this.initComponents(); |
|
|
|
this.initComponents(); |
|
|
@ -248,7 +249,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void populateBean(com.fr.data.impl.Connection ob) { |
|
|
|
public void populateBean(com.fr.data.impl.Connection ob) { |
|
|
|
populateSubDatabaseConnectionBean((E) ob); |
|
|
|
populateSubDatabaseConnectionBean((E) ob); |
|
|
|
if (mainPanel() instanceof JDBCDefPane) { |
|
|
|
if (mainPanel instanceof JDBCDefPane) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
this.originalCharSet = ob.getOriginalCharsetName(); |
|
|
|
this.originalCharSet = ob.getOriginalCharsetName(); |
|
|
@ -264,7 +265,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public com.fr.data.impl.Connection updateBean() { |
|
|
|
public com.fr.data.impl.Connection updateBean() { |
|
|
|
E ob = updateSubDatabaseConnectionBean(); |
|
|
|
E ob = updateSubDatabaseConnectionBean(); |
|
|
|
if (mainPanel() instanceof JDBCDefPane) { |
|
|
|
if (mainPanel instanceof JDBCDefPane) { |
|
|
|
return ob; |
|
|
|
return ob; |
|
|
|
} |
|
|
|
} |
|
|
|
ob.setOriginalCharsetName(this.originalCharSet); |
|
|
|
ob.setOriginalCharsetName(this.originalCharSet); |
|
|
@ -306,13 +307,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4)); |
|
|
|
testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4)); |
|
|
|
|
|
|
|
|
|
|
|
// Center
|
|
|
|
// Center
|
|
|
|
northPane.add(mainPanel(), BorderLayout.CENTER); |
|
|
|
mainPanel = mainPanel(); |
|
|
|
|
|
|
|
northPane.add(mainPanel, BorderLayout.CENTER); |
|
|
|
JPanel advancedPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); |
|
|
|
JPanel advancedPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); |
|
|
|
advancedPanel.setBorder(BorderFactory.createTitledBorder( |
|
|
|
advancedPanel.setBorder(BorderFactory.createTitledBorder( |
|
|
|
new ModLineBorder(ModLineBorder.TOP), |
|
|
|
new ModLineBorder(ModLineBorder.TOP), |
|
|
|
Toolkit.i18nText("Fine-Design_Basic_Advanced") |
|
|
|
Toolkit.i18nText("Fine-Design_Basic_Advanced") |
|
|
|
)); |
|
|
|
)); |
|
|
|
if (mainPanel() instanceof JDBCDefPane) { |
|
|
|
if (mainPanel instanceof JDBCDefPane) { |
|
|
|
ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr")); |
|
|
|
ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr")); |
|
|
|
actionLabel.addActionListener(new ActionListener() { |
|
|
|
actionLabel.addActionListener(new ActionListener() { |
|
|
|
public void actionPerformed(ActionEvent evt) { |
|
|
|
public void actionPerformed(ActionEvent evt) { |
|
|
@ -340,7 +342,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private JDialog createJDialog() { |
|
|
|
private JDialog createJDialog() { |
|
|
|
return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel())) : null; |
|
|
|
return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel)) : null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void initDialogPane() { |
|
|
|
private void initDialogPane() { |
|
|
@ -420,7 +422,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti |
|
|
|
private static JNDIDefPane jndiDefPane = new JNDIDefPane(); |
|
|
|
private static JNDIDefPane jndiDefPane = new JNDIDefPane(); |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
protected JPanel mainPanel() { |
|
|
|
protected JPanel mainPanel() { |
|
|
|
return jndiDefPane; |
|
|
|
return jndiDefPane; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|