|
From: <ger...@us...> - 2011-08-19 22:21:10
|
Revision: 6369
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6369&view=rev
Author: gerdwagner
Date: 2011-08-19 22:21:04 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Introduced performance warning for the global preference " Save Preferences Immediately
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-08-19 21:50:43 UTC (rev 6368)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-08-19 22:21:04 UTC (rev 6369)
@@ -17,10 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
@@ -37,6 +34,7 @@
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
+import com.jidesoft.swing.MultilineLabel;
import net.sourceforge.squirrel_sql.client.ApplicationArguments;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
@@ -358,7 +356,7 @@
gbc.gridx = 0;
gbc.gridy = 5;
- pnl.add(_savePreferencesImmediately, gbc);
+ pnl.add(getSavePreferencesImmediatelyPanel(), gbc);
gbc.gridx = 0;
gbc.gridy = 6;
@@ -383,8 +381,19 @@
return pnl;
}
+ private JPanel getSavePreferencesImmediatelyPanel()
+ {
+ JPanel ret = new JPanel(new GridLayout(2,1));
- private JPanel createLoggingPanel()
+ ret.add(new MultilineLabel(s_stringMgr.getString("GeneralPreferencesPanel.savePreferencesImmediatelyWarning")));
+ ret.add(_savePreferencesImmediately);
+
+ ret.setBorder(BorderFactory.createEtchedBorder());
+ return ret;
+ }
+
+
+ private JPanel createLoggingPanel()
{
final JPanel pnl = new JPanel();
pnl.setBorder(BorderFactory.createTitledBorder(s_stringMgr.getString("GeneralPreferencesPanel.logging")));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java 2011-08-19 21:50:43 UTC (rev 6368)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java 2011-08-19 22:21:04 UTC (rev 6369)
@@ -223,7 +223,7 @@
private boolean _showErrorLogMessages = true;
/** Always save preferences immediately when they change, instead of at shutdown */
- private boolean _savePreferencesImmediately = true;
+ private boolean _savePreferencesImmediately = false;
/** Whether or not to change the selection while right-clicking on list or tree node */
private boolean _selectOnRightMouseClick = true;
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties 2011-08-19 21:50:43 UTC (rev 6368)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties 2011-08-19 22:21:04 UTC (rev 6369)
@@ -140,3 +140,5 @@
GeneralPreferencesPanel.useScrollableTabbedPanesForSessionTabs=Use scrollable tabbed panes for Session tabs (needs restart)
GeneralPreferencesPanel.internalFrameStyle=Use MDI/Internal Frame layout (needs restart)
GeneralPreferencesPanel.showTabbedStyleHint=Warn MDI/Internal Frame layout is deprecated
+
+GeneralPreferencesPanel.savePreferencesImmediatelyWarning=Warning: May significantly slow down execution of multiple statements
\ No newline at end of file
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-08-19 21:50:43 UTC (rev 6368)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-08-19 22:21:04 UTC (rev 6369)
@@ -108,6 +108,9 @@
Bug-fixes:
+Introduced performance warning for the global preference " Save Preferences Immediately" when
+multiple statements are executed and set the property's default value to false.
+
2985845: Create table script generates incorrect foreign key stmt: Foreign key columns were used as primary key columns.
If the global setting "General => Save preferences immediately" is enabled, the SQLHistory will be saved immediately after the execution of a statement.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
