rearranged menu items

This commit is contained in:
Wisser
2018-04-13 12:56:34 +02:00
parent 4ea49d5544
commit 124b4e291a
5 changed files with 211 additions and 171 deletions
+16 -16
View File
@@ -6,6 +6,7 @@
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
@@ -24,7 +25,7 @@
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" value="Home"/>
<Property name="text" type="java.lang.String" value="&lt;html&gt;Home&lt;br&gt;&amp;nbsp;&lt;/html&gt;"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -54,7 +55,7 @@
</Component>
<Component class="javax.swing.JLabel" name="nameLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Database Subsetting Tool"/>
<Property name="text" type="java.lang.String" value="Database Subsetting and Relational Data Browsing Tool"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
@@ -65,20 +66,6 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="homeTextField">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="text" type="java.lang.String" value="http://jailer.sourceforge.net"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="forumTextField">
<Properties>
<Property name="editable" type="boolean" value="false"/>
@@ -117,5 +104,18 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextArea" name="jTextArea1">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="columns" type="int" value="20"/>
<Property name="rows" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="http://jailer.sourceforge.net&#xa;https://github.com/Wisser/Jailer"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Form>
+91 -91
View File
@@ -38,113 +38,113 @@ public class About extends javax.swing.JDialog {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
jLabel1 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
jLabel3 = new javax.swing.JLabel();
nameLabel = new javax.swing.JLabel();
homeTextField = new javax.swing.JTextField();
forumTextField = new javax.swing.JTextField();
jTextField3 = new javax.swing.JTextField();
jButton1 = new javax.swing.JButton();
jLabel1 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
jLabel3 = new javax.swing.JLabel();
nameLabel = new javax.swing.JLabel();
forumTextField = new javax.swing.JTextField();
jTextField3 = new javax.swing.JTextField();
jButton1 = new javax.swing.JButton();
jTextArea1 = new javax.swing.JTextArea();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
getContentPane().setLayout(new java.awt.GridBagLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
getContentPane().setLayout(new java.awt.GridBagLayout());
jLabel1.setText("Home");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel1, gridBagConstraints);
jLabel1.setText("<html>Home<br>&nbsp;</html>");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel1, gridBagConstraints);
jLabel2.setText("Forum");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel2, gridBagConstraints);
jLabel2.setText("Forum");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel2, gridBagConstraints);
jLabel3.setText("Support ");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel3, gridBagConstraints);
jLabel3.setText("Support ");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 12, 2, 0);
getContentPane().add(jLabel3, gridBagConstraints);
nameLabel.setText("Database Subsetting Tool");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12);
getContentPane().add(nameLabel, gridBagConstraints);
nameLabel.setText("Database Subsetting and Relational Data Browsing Tool");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12);
getContentPane().add(nameLabel, gridBagConstraints);
homeTextField.setEditable(false);
homeTextField.setText("http://jailer.sourceforge.net");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
getContentPane().add(homeTextField, gridBagConstraints);
forumTextField.setEditable(false);
forumTextField.setText("https://sourceforge.net/forum/?group_id=197260");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
getContentPane().add(forumTextField, gridBagConstraints);
forumTextField.setEditable(false);
forumTextField.setText("https://sourceforge.net/forum/?group_id=197260");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
getContentPane().add(forumTextField, gridBagConstraints);
jTextField3.setEditable(false);
jTextField3.setText("rwisser@users.sourceforge.net");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 3;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
getContentPane().add(jTextField3, gridBagConstraints);
jTextField3.setEditable(false);
jTextField3.setText("rwisser@users.sourceforge.net");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 3;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
getContentPane().add(jTextField3, gridBagConstraints);
jButton1.setText(" Ok ");
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 10;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.insets = new java.awt.Insets(12, 0, 12, 0);
getContentPane().add(jButton1, gridBagConstraints);
jButton1.setText(" Ok ");
jButton1.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 10;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.insets = new java.awt.Insets(12, 0, 12, 0);
getContentPane().add(jButton1, gridBagConstraints);
jTextArea1.setEditable(false);
jTextArea1.setColumns(20);
jTextArea1.setRows(2);
jTextArea1.setText("http://jailer.sourceforge.net\nhttps://github.com/Wisser/Jailer");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
getContentPane().add(jTextArea1, gridBagConstraints);
pack();
}// </editor-fold>//GEN-END:initComponents
pack();
}// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
this.setVisible(false);
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
public javax.swing.JTextField forumTextField;
public javax.swing.JTextField homeTextField;
private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JTextField jTextField3;
public javax.swing.JLabel nameLabel;
// End of variables declaration//GEN-END:variables
// Variables declaration - do not modify//GEN-BEGIN:variables
public javax.swing.JTextField forumTextField;
private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JTextArea jTextArea1;
private javax.swing.JTextField jTextField3;
public javax.swing.JLabel nameLabel;
// End of variables declaration//GEN-END:variables
private static final long serialVersionUID = -6499791486275376059L;
}
@@ -126,16 +126,34 @@ public class DbConnectionDialog extends javax.swing.JDialog {
* @return <code>true</code> if connection succeeded
*/
public boolean connect(String reason) {
setTitle((reason == null ? "" : (reason + " - ")) + "Connect.");
sortConnectionList();
refresh();
setVisible(true);
if (currentConnection == null) {
isConnected = false;
}
return isConnected;
return connect(reason, false);
}
/**
* Gets connection to DB.
*
* @return <code>true</code> if connection succeeded
*/
public boolean connect(String reason, boolean keepState) {
boolean oldIsConnected = isConnected;
ConnectionInfo oldCurrentConnection = currentConnection;
try {
setTitle((reason == null ? "" : (reason + " - ")) + "Connect.");
sortConnectionList();
refresh();
setVisible(true);
if (currentConnection == null) {
isConnected = false;
}
return isConnected;
} finally {
if (keepState) {
isConnected = oldIsConnected;
currentConnection = oldCurrentConnection;
}
}
}
private final InfoBar infoBar;
private final String currentModelSubfolder;
private final boolean dataModelAware;
@@ -36,16 +36,6 @@
<Property name="text" type="java.lang.String" value="File"/>
</Properties>
<SubComponents>
<MenuItem class="javax.swing.JMenuItem" name="newBrowserjMenuItem">
<Properties>
<Property name="text" type="java.lang.String" value="New Data Browser"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="newBrowserjMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator11">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="loadScriptMenuItem">
<Properties>
<Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
@@ -89,6 +79,17 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem3ActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="closeAllMenuItem">
<Properties>
<Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
<KeyStroke key="Shift+Ctrl+F4"/>
</Property>
<Property name="text" type="java.lang.String" value="Close All Tables"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="closeAllMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator4">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="storeSessionItem">
@@ -113,7 +114,7 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="restoreSessionItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator2">
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator7">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="reconnectMenuItem">
<Properties>
@@ -123,25 +124,22 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="reconnectMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator7">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="cloaseAllMenuItem">
<MenuItem class="javax.swing.JMenuItem" name="newBrowserjMenuItem">
<Properties>
<Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
<KeyStroke key="Shift+Ctrl+F4"/>
</Property>
<Property name="text" type="java.lang.String" value="Close All"/>
<Property name="text" type="java.lang.String" value="New Data Browser"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cloaseAllMenuItemActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="newBrowserjMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="schemaMappingMenuItem">
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator12">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="exitMenuItem">
<Properties>
<Property name="text" type="java.lang.String" value="Schema Mapping"/>
<Property name="text" type="java.lang.String" value="Exit"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="schemaMappingMenuItemActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="exitMenuItemActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
@@ -177,6 +175,14 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showDataModelMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="schemaMappingMenuItem">
<Properties>
<Property name="text" type="java.lang.String" value="Schema Mapping"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="schemaMappingMenuItemActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Menu>
<Menu class="javax.swing.JMenu" name="jMenu2">
@@ -341,7 +341,9 @@ public class DataBrowser extends javax.swing.JFrame {
icon = tableIcon;
}
} else {
icon = databaseIcon;
if (((JLabel) render).getText().trim().length() > 0) {
icon = databaseIcon;
}
}
((JLabel) render).setIcon(icon);
}
@@ -411,7 +413,8 @@ public class DataBrowser extends javax.swing.JFrame {
@Override
protected void updateMenu(boolean hasTableBrowser, boolean hasIFrame) {
storeSessionItem.setEnabled(hasIFrame);
storeSessionItem.setEnabled(hasIFrame);
closeAllMenuItem.setEnabled(hasIFrame);
exportDataMenuItem.setEnabled(hasTableBrowser);
createExtractionModelMenuItem.setEnabled(hasTableBrowser);
updateIFramesBar();
@@ -903,26 +906,26 @@ public class DataBrowser extends javax.swing.JFrame {
jLabel26 = new javax.swing.JLabel();
menuBar = new javax.swing.JMenuBar();
jMenu1 = new javax.swing.JMenu();
newBrowserjMenuItem = new javax.swing.JMenuItem();
jSeparator11 = new javax.swing.JPopupMenu.Separator();
loadScriptMenuItem = new javax.swing.JMenuItem();
saveScriptMenuItem = new javax.swing.JMenuItem();
saveScriptAsMenuItem = new javax.swing.JMenuItem();
jSeparator9 = new javax.swing.JPopupMenu.Separator();
jMenuItem3 = new javax.swing.JMenuItem();
closeAllMenuItem = new javax.swing.JMenuItem();
jSeparator4 = new javax.swing.JPopupMenu.Separator();
storeSessionItem = new javax.swing.JMenuItem();
restoreSessionItem = new javax.swing.JMenuItem();
jSeparator2 = new javax.swing.JPopupMenu.Separator();
reconnectMenuItem = new javax.swing.JMenuItem();
jSeparator7 = new javax.swing.JPopupMenu.Separator();
cloaseAllMenuItem = new javax.swing.JMenuItem();
schemaMappingMenuItem = new javax.swing.JMenuItem();
reconnectMenuItem = new javax.swing.JMenuItem();
newBrowserjMenuItem = new javax.swing.JMenuItem();
jSeparator12 = new javax.swing.JPopupMenu.Separator();
exitMenuItem = new javax.swing.JMenuItem();
menuTools = new javax.swing.JMenu();
analyseMenuItem = new javax.swing.JMenuItem();
dataModelEditorjMenuItem = new javax.swing.JMenuItem();
jSeparator10 = new javax.swing.JPopupMenu.Separator();
showDataModelMenuItem = new javax.swing.JCheckBoxMenuItem();
schemaMappingMenuItem = new javax.swing.JMenuItem();
jMenu2 = new javax.swing.JMenu();
exportDataMenuItem = new javax.swing.JMenuItem();
dataImport = new javax.swing.JMenuItem();
@@ -1376,15 +1379,6 @@ public class DataBrowser extends javax.swing.JFrame {
jMenu1.setText("File");
newBrowserjMenuItem.setText("New Data Browser");
newBrowserjMenuItem.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
newBrowserjMenuItemActionPerformed(evt);
}
});
jMenu1.add(newBrowserjMenuItem);
jMenu1.add(jSeparator11);
loadScriptMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.CTRL_MASK));
loadScriptMenuItem.setText("Open SQL Script...");
loadScriptMenuItem.addActionListener(new java.awt.event.ActionListener() {
@@ -1420,6 +1414,15 @@ public class DataBrowser extends javax.swing.JFrame {
}
});
jMenu1.add(jMenuItem3);
closeAllMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F4, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK));
closeAllMenuItem.setText("Close All Tables");
closeAllMenuItem.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
closeAllMenuItemActionPerformed(evt);
}
});
jMenu1.add(closeAllMenuItem);
jMenu1.add(jSeparator4);
storeSessionItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_P, java.awt.event.InputEvent.CTRL_MASK));
@@ -1439,7 +1442,7 @@ public class DataBrowser extends javax.swing.JFrame {
}
});
jMenu1.add(restoreSessionItem);
jMenu1.add(jSeparator2);
jMenu1.add(jSeparator7);
reconnectMenuItem.setText("Reconnect...");
reconnectMenuItem.addActionListener(new java.awt.event.ActionListener() {
@@ -1448,24 +1451,23 @@ public class DataBrowser extends javax.swing.JFrame {
}
});
jMenu1.add(reconnectMenuItem);
jMenu1.add(jSeparator7);
cloaseAllMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F4, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK));
cloaseAllMenuItem.setText("Close All");
cloaseAllMenuItem.addActionListener(new java.awt.event.ActionListener() {
newBrowserjMenuItem.setText("New Data Browser");
newBrowserjMenuItem.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cloaseAllMenuItemActionPerformed(evt);
newBrowserjMenuItemActionPerformed(evt);
}
});
jMenu1.add(cloaseAllMenuItem);
jMenu1.add(newBrowserjMenuItem);
jMenu1.add(jSeparator12);
schemaMappingMenuItem.setText("Schema Mapping");
schemaMappingMenuItem.addActionListener(new java.awt.event.ActionListener() {
exitMenuItem.setText("Exit");
exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
schemaMappingMenuItemActionPerformed(evt);
exitMenuItemActionPerformed(evt);
}
});
jMenu1.add(schemaMappingMenuItem);
jMenu1.add(exitMenuItem);
menuBar.add(jMenu1);
@@ -1496,6 +1498,14 @@ public class DataBrowser extends javax.swing.JFrame {
});
menuTools.add(showDataModelMenuItem);
schemaMappingMenuItem.setText("Schema Mapping");
schemaMappingMenuItem.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
schemaMappingMenuItemActionPerformed(evt);
}
});
menuTools.add(schemaMappingMenuItem);
menuBar.add(menuTools);
jMenu2.setText("Tools");
@@ -1754,7 +1764,7 @@ public class DataBrowser extends javax.swing.JFrame {
private void reconnectMenuItemActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_reconnectMenuItemActionPerformed
synchronized (this) {
if (dbConnectionDialog.connect("Reconnect")) {
if (dbConnectionDialog.connect("Reconnect", true)) {
try {
setConnection(dbConnectionDialog);
} catch (Exception e) {
@@ -1773,7 +1783,7 @@ public class DataBrowser extends javax.swing.JFrame {
openNewTableBrowser(false);
}// GEN-LAST:event_jMenuItem1ActionPerformed
private void cloaseAllMenuItemActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_cloaseAllMenuItemActionPerformed
private void closeAllMenuItemActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_cloaseAllMenuItemActionPerformed
desktop.closeAll();
}// GEN-LAST:event_cloaseAllMenuItemActionPerformed
@@ -2188,7 +2198,7 @@ public class DataBrowser extends javax.swing.JFrame {
private javax.swing.JLabel associatedWith;
private javax.swing.JPanel borderBrowserPanel;
private javax.swing.JPanel borderBrowserTabPane;
private javax.swing.JMenuItem cloaseAllMenuItem;
private javax.swing.JMenuItem closeAllMenuItem;
private javax.swing.JPanel closurePanel;
public javax.swing.JLabel connectivityState;
private javax.swing.JMenuItem consistencyCheckMenuItem;
@@ -2200,6 +2210,7 @@ public class DataBrowser extends javax.swing.JFrame {
private javax.swing.JSplitPane desktopSplitPane;
private javax.swing.JTabbedPane detailsAndBorderBrowserTabbedPane;
private javax.swing.JPanel dummy;
private javax.swing.JMenuItem exitMenuItem;
private javax.swing.JMenuItem exportDataMenuItem;
private javax.swing.JLabel hasDependent;
private javax.swing.JMenuItem helpForum;
@@ -2241,8 +2252,7 @@ public class DataBrowser extends javax.swing.JFrame {
private javax.swing.JScrollPane jScrollPane3;
private javax.swing.JPopupMenu.Separator jSeparator1;
private javax.swing.JPopupMenu.Separator jSeparator10;
private javax.swing.JPopupMenu.Separator jSeparator11;
private javax.swing.JPopupMenu.Separator jSeparator2;
private javax.swing.JPopupMenu.Separator jSeparator12;
private javax.swing.JPopupMenu.Separator jSeparator3;
private javax.swing.JPopupMenu.Separator jSeparator4;
private javax.swing.JPopupMenu.Separator jSeparator5;
@@ -3268,6 +3278,12 @@ public class DataBrowser extends javax.swing.JFrame {
}
}//GEN-LAST:event_saveScriptAsMenuItemActionPerformed
private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
if (closeAllSQLConsoles()) {
DataBrowser.this.dispose();
}
}//GEN-LAST:event_exitMenuItemActionPerformed
private MetaDataDetailsPanel metaDataDetailsPanel;
private List<SQLConsoleWithTitle> sqlConsoles = new ArrayList<SQLConsoleWithTitle>();