1.1 --- a/Options/src/org/netbeans/modules/plsqlsupport/options/Bundle.properties Mon Jul 23 14:06:23 2012 +0530
1.2 +++ b/Options/src/org/netbeans/modules/plsqlsupport/options/Bundle.properties Mon Jul 23 14:28:34 2012 +0530
1.3 @@ -37,5 +37,6 @@
1.4 GeneralPanel.jPanel3.AccessibleContext.accessibleName=Command Window
1.5 GeneralPanel.cbDeployAllDatabasesAutomatically.text=Prompt before deploying to databases other than the project's main database
1.6 GeneralPanel.jPanel3.border.title=Command Window
1.7 -GeneralPanel.cbAutoCommit.text=Auto Commit
1.8 +GeneralPanel.cbAutoCommit.text=AutoCommit SQL
1.9 +GeneralPanel.cbAutoSelect.text=AutoSelect Statement
1.10 GeneralPanel.cbExpandFolds.text=Expand All Code Folds by Default
2.1 --- a/Options/src/org/netbeans/modules/plsqlsupport/options/GeneralPanel.form Mon Jul 23 14:06:23 2012 +0530
2.2 +++ b/Options/src/org/netbeans/modules/plsqlsupport/options/GeneralPanel.form Mon Jul 23 14:28:34 2012 +0530
2.3 @@ -36,7 +36,7 @@
2.4 <Component id="jPanel2" min="-2" max="-2" attributes="0"/>
2.5 <EmptySpace type="unrelated" max="-2" attributes="0"/>
2.6 <Component id="jPanel3" min="-2" max="-2" attributes="0"/>
2.7 - <EmptySpace pref="79" max="32767" attributes="0"/>
2.8 + <EmptySpace pref="56" max="32767" attributes="0"/>
2.9 </Group>
2.10 </Group>
2.11 </DimensionLayout>
2.12 @@ -64,7 +64,7 @@
2.13 <Group type="102" alignment="0" attributes="0">
2.14 <EmptySpace max="-2" attributes="0"/>
2.15 <Component id="cbDeployAllDatabasesAutomatically" min="-2" max="-2" attributes="0"/>
2.16 - <EmptySpace pref="94" max="32767" attributes="0"/>
2.17 + <EmptySpace pref="215" max="32767" attributes="0"/>
2.18 </Group>
2.19 </Group>
2.20 </DimensionLayout>
2.21 @@ -109,7 +109,7 @@
2.22 <Group type="102" alignment="0" attributes="0">
2.23 <EmptySpace max="-2" attributes="0"/>
2.24 <Component id="cbExpandFolds" min="-2" max="-2" attributes="0"/>
2.25 - <EmptySpace pref="384" max="32767" attributes="0"/>
2.26 + <EmptySpace pref="429" max="32767" attributes="0"/>
2.27 </Group>
2.28 </Group>
2.29 </DimensionLayout>
2.30 @@ -151,10 +151,13 @@
2.31 <Layout>
2.32 <DimensionLayout dim="0">
2.33 <Group type="103" groupAlignment="0" attributes="0">
2.34 - <Group type="102" alignment="0" attributes="0">
2.35 + <Group type="102" attributes="0">
2.36 <EmptySpace max="-2" attributes="0"/>
2.37 - <Component id="cbAutoCommit" min="-2" max="-2" attributes="0"/>
2.38 - <EmptySpace pref="509" max="32767" attributes="0"/>
2.39 + <Group type="103" groupAlignment="0" attributes="0">
2.40 + <Component id="cbAutoCommit" alignment="0" min="-2" max="-2" attributes="0"/>
2.41 + <Component id="cbAutoSelect" min="-2" max="-2" attributes="0"/>
2.42 + </Group>
2.43 + <EmptySpace pref="483" max="32767" attributes="0"/>
2.44 </Group>
2.45 </Group>
2.46 </DimensionLayout>
2.47 @@ -162,6 +165,8 @@
2.48 <Group type="103" groupAlignment="0" attributes="0">
2.49 <Group type="102" alignment="0" attributes="0">
2.50 <Component id="cbAutoCommit" min="-2" max="-2" attributes="0"/>
2.51 + <EmptySpace max="-2" attributes="0"/>
2.52 + <Component id="cbAutoSelect" min="-2" max="-2" attributes="0"/>
2.53 <EmptySpace max="32767" attributes="0"/>
2.54 </Group>
2.55 </Group>
2.56 @@ -175,6 +180,13 @@
2.57 </Property>
2.58 </Properties>
2.59 </Component>
2.60 + <Component class="javax.swing.JCheckBox" name="cbAutoSelect">
2.61 + <Properties>
2.62 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
2.63 + <ResourceString bundle="org/netbeans/modules/plsqlsupport/options/Bundle.properties" key="GeneralPanel.cbAutoSelect.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
2.64 + </Property>
2.65 + </Properties>
2.66 + </Component>
2.67 </SubComponents>
2.68 </Container>
2.69 </SubComponents>
3.1 --- a/Options/src/org/netbeans/modules/plsqlsupport/options/GeneralPanel.java Mon Jul 23 14:06:23 2012 +0530
3.2 +++ b/Options/src/org/netbeans/modules/plsqlsupport/options/GeneralPanel.java Mon Jul 23 14:28:34 2012 +0530
3.3 @@ -67,6 +67,7 @@
3.4 cbExpandFolds = new javax.swing.JCheckBox();
3.5 jPanel3 = new javax.swing.JPanel();
3.6 cbAutoCommit = new javax.swing.JCheckBox();
3.7 + cbAutoSelect = new javax.swing.JCheckBox();
3.8
3.9 jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.Database.Border.Title"))); // NOI18N
3.10
3.11 @@ -79,7 +80,7 @@
3.12 .addGroup(jPanel1Layout.createSequentialGroup()
3.13 .addContainerGap()
3.14 .addComponent(cbDeployAllDatabasesAutomatically)
3.15 - .addContainerGap(94, Short.MAX_VALUE))
3.16 + .addContainerGap(215, Short.MAX_VALUE))
3.17 );
3.18 jPanel1Layout.setVerticalGroup(
3.19 jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
3.20 @@ -99,7 +100,7 @@
3.21 .addGroup(jPanel2Layout.createSequentialGroup()
3.22 .addContainerGap()
3.23 .addComponent(cbExpandFolds)
3.24 - .addContainerGap(384, Short.MAX_VALUE))
3.25 + .addContainerGap(429, Short.MAX_VALUE))
3.26 );
3.27 jPanel2Layout.setVerticalGroup(
3.28 jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
3.29 @@ -112,19 +113,25 @@
3.30
3.31 org.openide.awt.Mnemonics.setLocalizedText(cbAutoCommit, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.cbAutoCommit.text")); // NOI18N
3.32
3.33 + org.openide.awt.Mnemonics.setLocalizedText(cbAutoSelect, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.cbAutoSelect.text")); // NOI18N
3.34 +
3.35 javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
3.36 jPanel3.setLayout(jPanel3Layout);
3.37 jPanel3Layout.setHorizontalGroup(
3.38 jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
3.39 .addGroup(jPanel3Layout.createSequentialGroup()
3.40 .addContainerGap()
3.41 - .addComponent(cbAutoCommit)
3.42 - .addContainerGap(509, Short.MAX_VALUE))
3.43 + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
3.44 + .addComponent(cbAutoCommit)
3.45 + .addComponent(cbAutoSelect))
3.46 + .addContainerGap(483, Short.MAX_VALUE))
3.47 );
3.48 jPanel3Layout.setVerticalGroup(
3.49 jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
3.50 .addGroup(jPanel3Layout.createSequentialGroup()
3.51 .addComponent(cbAutoCommit)
3.52 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
3.53 + .addComponent(cbAutoSelect)
3.54 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
3.55 );
3.56
3.57 @@ -149,7 +156,7 @@
3.58 .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
3.59 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
3.60 .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
3.61 - .addContainerGap(79, Short.MAX_VALUE))
3.62 + .addContainerGap(56, Short.MAX_VALUE))
3.63 );
3.64
3.65 jPanel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.Database.Border.Title")); // NOI18N
3.66 @@ -161,12 +168,14 @@
3.67 cbDeployAllDatabasesAutomatically.setSelected(NbPreferences.forModule(GeneralPanel.class).getBoolean(OptionsUtilities.AUTO_DEPLOY_ALL_DATABASES_KEY, true));
3.68 cbExpandFolds.setSelected(NbPreferences.forModule(GeneralPanel.class).getBoolean(OptionsUtilities.PLSQL_EXPAND_FOLDS_KEY, false));
3.69 cbAutoCommit.setSelected(NbPreferences.forModule(GeneralPanel.class).getBoolean(OptionsUtilities.COMMAND_WINDOW_AUTO_COMMIT_KEY, false));
3.70 + cbAutoSelect.setSelected(NbPreferences.forModule(GeneralPanel.class).getBoolean(OptionsUtilities.COMMAND_WINDOW_AUTO_SELECT_KEY, false));
3.71 }
3.72
3.73 void store() {
3.74 NbPreferences.forModule(GeneralPanel.class).putBoolean(OptionsUtilities.AUTO_DEPLOY_ALL_DATABASES_KEY, cbDeployAllDatabasesAutomatically.isSelected());
3.75 NbPreferences.forModule(GeneralPanel.class).putBoolean(OptionsUtilities.PLSQL_EXPAND_FOLDS_KEY, cbExpandFolds.isSelected());
3.76 NbPreferences.forModule(GeneralPanel.class).putBoolean(OptionsUtilities.COMMAND_WINDOW_AUTO_COMMIT_KEY, cbAutoCommit.isSelected());
3.77 + NbPreferences.forModule(GeneralPanel.class).putBoolean(OptionsUtilities.COMMAND_WINDOW_AUTO_SELECT_KEY, cbAutoSelect.isSelected());
3.78 }
3.79
3.80 boolean valid() {
3.81 @@ -175,6 +184,7 @@
3.82 }
3.83 // Variables declaration - do not modify//GEN-BEGIN:variables
3.84 private javax.swing.JCheckBox cbAutoCommit;
3.85 + private javax.swing.JCheckBox cbAutoSelect;
3.86 private javax.swing.JCheckBox cbDeployAllDatabasesAutomatically;
3.87 private javax.swing.JCheckBox cbExpandFolds;
3.88 private javax.swing.JPanel jPanel1;
4.1 --- a/Options/src/org/netbeans/modules/plsqlsupport/options/OptionsUtilities.java Mon Jul 23 14:06:23 2012 +0530
4.2 +++ b/Options/src/org/netbeans/modules/plsqlsupport/options/OptionsUtilities.java Mon Jul 23 14:28:34 2012 +0530
4.3 @@ -49,6 +49,7 @@
4.4 public static final String PLSQL_ANNOTATIONS_ENABLED_KEY = "plsql.annotations.enabled";
4.5 public static final String PLSQL_EXPAND_FOLDS_KEY = "plsql.folds.expand";
4.6 public static final String COMMAND_WINDOW_AUTO_COMMIT_KEY = "command.window.auto.commit";
4.7 + public static final String COMMAND_WINDOW_AUTO_SELECT_KEY = "command.window.auto.select";
4.8 public static final String PLSQL_ANNOTATIONS_GENERAL_KEY = "plsql.annotations.general";
4.9 public static final String PLSQL_ANNOTATIONS_IFS_KEY = "plsql.annotations.ifs";
4.10 public static final String PLSQL_ANNOTATIONS_CURSOR_WHERE_KEY = "plsql.annotations.cursor.where";
4.11 @@ -78,6 +79,10 @@
4.12 public static boolean isCommandWindowAutoCommitEnabled() {
4.13 return NbPreferences.forModule(GeneralPanel.class).getBoolean(COMMAND_WINDOW_AUTO_COMMIT_KEY, false);
4.14 }
4.15 +
4.16 + public static boolean isCommandWindowAutoSelectEnabled() {
4.17 + return NbPreferences.forModule(GeneralPanel.class).getBoolean(COMMAND_WINDOW_AUTO_SELECT_KEY, false);
4.18 + }
4.19
4.20 public static boolean isPlSqlAnnotationCursorWhereEnabled() {
4.21 return NbPreferences.forModule(PLSQLAnnotationsPanel.class).getBoolean(PLSQL_ANNOTATIONS_CURSOR_WHERE_KEY, true);