Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/preferences GeneralPrefer
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11466/app/src/net/sourceforge/squirrel_sql/client/preferences Modified Files: GeneralPreferencesPanel.java I18NStrings.properties SquirrelPreferences.java SquirrelPreferencesBeanInfo.java Log Message: Configurable Schema loading and caching Index: GeneralPreferencesPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GeneralPreferencesPanel.java 5 May 2006 11:11:04 -0000 1.16 --- GeneralPreferencesPanel.java 27 Jun 2006 01:20:30 -0000 1.17 *************** *** 101,125 **** { ! private JCheckBox _showAliasesToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showaliasestoolbar")); ! private JCheckBox _showDriversToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showdriverstoolbar")); ! private JCheckBox _showMainStatusBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showmainwinstatusbar")); ! private JCheckBox _showMainToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showmainwintoolbar")); ! private JCheckBox _showContents = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showwindowcontents")); ! private JCheckBox _showToolTips = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showtooltips")); ! private JCheckBox _useScrollableTabbedPanes = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.usescrolltabs")); ! private JCheckBox _maximimizeSessionSheet = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.maxonopen")); ! private JCheckBox _showColoriconsInToolbar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showcoloricons")); ! private JCheckBox _showPluginFilesInSplashScreen = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showpluginfiles")); ! private JLabel _executionLogFileNameLbl = new OutputLabel(" "); ! // Must have at least 1 blank otherwise width gets set to zero. ! private JLabel _logConfigFileNameLbl = new OutputLabel(" "); ! // Must have at least 1 blank otherwise width gets set to zero. ! private JCheckBox _confirmSessionCloseChk = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.confirmSessionClose")); ! private JCheckBox _warnJreJdbcMismatch = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnJreJdbcMismatch")); ! private JCheckBox _warnForUnsavedFileEdits = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnForUnsavedFileEdits")); ! private JCheckBox _warnForUnsavedBufferEdits = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnForUnsavedBufferEdits")); ! MyPanel() { super(new GridBagLayout()); --- 101,127 ---- { ! private JCheckBox _showAliasesToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showaliasestoolbar")); ! private JCheckBox _showDriversToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showdriverstoolbar")); ! private JCheckBox _showMainStatusBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showmainwinstatusbar")); ! private JCheckBox _showMainToolBar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showmainwintoolbar")); ! private JCheckBox _showContents = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showwindowcontents")); ! private JCheckBox _showToolTips = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showtooltips")); ! private JCheckBox _useScrollableTabbedPanes = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.usescrolltabs")); ! private JCheckBox _maximimizeSessionSheet = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.maxonopen")); ! private JCheckBox _showColoriconsInToolbar = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showcoloricons")); ! private JCheckBox _showPluginFilesInSplashScreen = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showpluginfiles")); ! private JLabel _executionLogFileNameLbl = new OutputLabel(" "); ! // Must have at least 1 blank otherwise width gets set to zero. ! private JLabel _logConfigFileNameLbl = new OutputLabel(" "); ! // Must have at least 1 blank otherwise width gets set to zero. ! private JCheckBox _confirmSessionCloseChk = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.confirmSessionClose")); ! private JCheckBox _warnJreJdbcMismatch = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnJreJdbcMismatch")); ! private JCheckBox _warnForUnsavedFileEdits = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnForUnsavedFileEdits")); ! private JCheckBox _warnForUnsavedBufferEdits = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.warnForUnsavedBufferEdits")); ! private JCheckBox _showSessionStartupTimeHint = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showSessionStartupTimeHint")); ! ! MyPanel() { super(new GridBagLayout()); *************** *** 127,174 **** } ! void loadData(IApplication app, SquirrelPreferences prefs) ! { ! final ApplicationFiles appFiles = new ApplicationFiles(); ! _showContents.setSelected(prefs.getShowContentsWhenDragging()); ! _showToolTips.setSelected(prefs.getShowToolTips()); ! _useScrollableTabbedPanes.setSelected(prefs.useScrollableTabbedPanes()); ! _showMainStatusBar.setSelected(prefs.getShowMainStatusBar()); ! _showMainToolBar.setSelected(prefs.getShowMainToolBar()); ! _showAliasesToolBar.setSelected(prefs.getShowAliasesToolBar()); ! _showDriversToolBar.setSelected(prefs.getShowDriversToolBar()); ! _maximimizeSessionSheet.setSelected(prefs.getMaximizeSessionSheetOnOpen()); ! _showColoriconsInToolbar.setSelected(prefs.getShowColoriconsInToolbar()); ! _showPluginFilesInSplashScreen.setSelected(prefs.getShowPluginFilesInSplashScreen()); ! _executionLogFileNameLbl.setText(appFiles.getExecutionLogFile().getPath()); ! String configFile = ApplicationArguments.getInstance().getLoggingConfigFileName(); ! _logConfigFileNameLbl.setText( ! configFile != null ? configFile ! : s_stringMgr.getString("GeneralPreferencesPanel.unspecified")); ! _confirmSessionCloseChk.setSelected(prefs.getConfirmSessionClose()); ! _warnJreJdbcMismatch.setSelected(prefs.getWarnJreJdbcMismatch()); ! _warnForUnsavedFileEdits.setSelected(prefs.getWarnForUnsavedFileEdits()); ! _warnForUnsavedBufferEdits.setSelected(prefs.getWarnForUnsavedBufferEdits()); ! } ! void applyChanges(SquirrelPreferences prefs) { ! prefs.setShowContentsWhenDragging(_showContents.isSelected()); ! prefs.setShowToolTips(_showToolTips.isSelected()); ! prefs.setUseScrollableTabbedPanes(_useScrollableTabbedPanes.isSelected()); ! prefs.setShowMainStatusBar(_showMainStatusBar.isSelected()); ! prefs.setShowMainToolBar(_showMainToolBar.isSelected()); ! prefs.setShowAliasesToolBar(_showAliasesToolBar.isSelected()); ! prefs.setShowDriversToolBar(_showDriversToolBar.isSelected()); ! prefs.setMaximizeSessionSheetOnOpen(_maximimizeSessionSheet.isSelected()); ! prefs.setShowColoriconsInToolbar(_showColoriconsInToolbar.isSelected()); ! prefs.setShowPluginFilesInSplashScreen(_showPluginFilesInSplashScreen.isSelected()); ! prefs.setConfirmSessionClose(_confirmSessionCloseChk.isSelected()); ! prefs.setWarnJreJdbcMismatch(_warnJreJdbcMismatch.isSelected()); ! prefs.setWarnForUnsavedFileEdits(_warnForUnsavedFileEdits.isSelected()); ! prefs.setWarnForUnsavedBufferEdits(_warnForUnsavedBufferEdits.isSelected()); ! } private void createUserInterface() --- 129,178 ---- } ! void loadData(IApplication app, SquirrelPreferences prefs) ! { ! final ApplicationFiles appFiles = new ApplicationFiles(); ! _showContents.setSelected(prefs.getShowContentsWhenDragging()); ! _showToolTips.setSelected(prefs.getShowToolTips()); ! _useScrollableTabbedPanes.setSelected(prefs.useScrollableTabbedPanes()); ! _showMainStatusBar.setSelected(prefs.getShowMainStatusBar()); ! _showMainToolBar.setSelected(prefs.getShowMainToolBar()); ! _showAliasesToolBar.setSelected(prefs.getShowAliasesToolBar()); ! _showDriversToolBar.setSelected(prefs.getShowDriversToolBar()); ! _maximimizeSessionSheet.setSelected(prefs.getMaximizeSessionSheetOnOpen()); ! _showColoriconsInToolbar.setSelected(prefs.getShowColoriconsInToolbar()); ! _showPluginFilesInSplashScreen.setSelected(prefs.getShowPluginFilesInSplashScreen()); ! _executionLogFileNameLbl.setText(appFiles.getExecutionLogFile().getPath()); ! String configFile = ApplicationArguments.getInstance().getLoggingConfigFileName(); ! _logConfigFileNameLbl.setText( ! configFile != null ? configFile ! : s_stringMgr.getString("GeneralPreferencesPanel.unspecified")); ! _confirmSessionCloseChk.setSelected(prefs.getConfirmSessionClose()); ! _warnJreJdbcMismatch.setSelected(prefs.getWarnJreJdbcMismatch()); ! _warnForUnsavedFileEdits.setSelected(prefs.getWarnForUnsavedFileEdits()); ! _warnForUnsavedBufferEdits.setSelected(prefs.getWarnForUnsavedBufferEdits()); ! _showSessionStartupTimeHint.setSelected(prefs.getShowSessionStartupTimeHint()); ! } ! void applyChanges(SquirrelPreferences prefs) { ! prefs.setShowContentsWhenDragging(_showContents.isSelected()); ! prefs.setShowToolTips(_showToolTips.isSelected()); ! prefs.setUseScrollableTabbedPanes(_useScrollableTabbedPanes.isSelected()); ! prefs.setShowMainStatusBar(_showMainStatusBar.isSelected()); ! prefs.setShowMainToolBar(_showMainToolBar.isSelected()); ! prefs.setShowAliasesToolBar(_showAliasesToolBar.isSelected()); ! prefs.setShowDriversToolBar(_showDriversToolBar.isSelected()); ! prefs.setMaximizeSessionSheetOnOpen(_maximimizeSessionSheet.isSelected()); ! prefs.setShowColoriconsInToolbar(_showColoriconsInToolbar.isSelected()); ! prefs.setShowPluginFilesInSplashScreen(_showPluginFilesInSplashScreen.isSelected()); ! prefs.setConfirmSessionClose(_confirmSessionCloseChk.isSelected()); ! prefs.setWarnJreJdbcMismatch(_warnJreJdbcMismatch.isSelected()); ! prefs.setWarnForUnsavedFileEdits(_warnForUnsavedFileEdits.isSelected()); ! prefs.setWarnForUnsavedBufferEdits(_warnForUnsavedBufferEdits.isSelected()); ! prefs.setShowSessionStartupTimeHint(_showSessionStartupTimeHint.isSelected()); ! } private void createUserInterface() *************** *** 246,270 **** pnl.setLayout(new GridBagLayout()); ! final GridBagConstraints gbc = new GridBagConstraints(); ! gbc.fill = GridBagConstraints.HORIZONTAL; ! gbc.insets = new Insets(2, 4, 2, 4); ! gbc.gridx = 0; ! gbc.gridy = 0; ! gbc.weightx = 1; ! pnl.add(_confirmSessionCloseChk, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 1; ! pnl.add(_warnJreJdbcMismatch, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 2; ! pnl.add(_warnForUnsavedFileEdits, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 3; ! pnl.add(_warnForUnsavedBufferEdits, gbc); ! ! return pnl; } --- 250,278 ---- pnl.setLayout(new GridBagLayout()); ! final GridBagConstraints gbc = new GridBagConstraints(); ! gbc.fill = GridBagConstraints.HORIZONTAL; ! gbc.insets = new Insets(2, 4, 2, 4); ! gbc.gridx = 0; ! gbc.gridy = 0; ! gbc.weightx = 1; ! pnl.add(_confirmSessionCloseChk, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 1; ! pnl.add(_warnJreJdbcMismatch, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 2; ! pnl.add(_warnForUnsavedFileEdits, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 3; ! pnl.add(_warnForUnsavedBufferEdits, gbc); ! ! gbc.gridx = 0; ! gbc.gridy = 4; ! pnl.add(_showSessionStartupTimeHint, gbc); ! ! return pnl; } Index: SquirrelPreferencesBeanInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SquirrelPreferencesBeanInfo.java 5 Apr 2006 13:20:36 -0000 1.16 --- SquirrelPreferencesBeanInfo.java 27 Jun 2006 01:20:30 -0000 1.17 *************** *** 107,111 **** new PropertyDescriptor(WARN_FOR_UNSAVED_BUFFER_EDITS, CLS, "getWarnForUnsavedBufferEdits", "setWarnForUnsavedBufferEdits"), ! }; } --- 107,113 ---- new PropertyDescriptor(WARN_FOR_UNSAVED_BUFFER_EDITS, CLS, "getWarnForUnsavedBufferEdits", "setWarnForUnsavedBufferEdits"), ! new PropertyDescriptor(SHOW_SESSION_STARTUP_TIME_HINT, CLS, ! "getShowSessionStartupTimeHint", "setShowSessionStartupTimeHint"), ! }; } Index: SquirrelPreferences.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** SquirrelPreferences.java 5 Apr 2006 13:20:36 -0000 1.23 --- SquirrelPreferences.java 27 Jun 2006 01:20:30 -0000 1.24 *************** *** 51,89 **** public interface IPropertyNames ! { ! String ACTION_KEYS = "actionKeys"; ! String ALIASES_SELECTED_INDEX = "aliasesSelectdIndex"; ! String CONFIRM_SESSION_CLOSE = "confirmSessionClose"; ! String DRIVERS_SELECTED_INDEX = "driversSelectdIndex"; ! String FIRST_RUN = "firstRun"; ! String JDBC_DEBUG_TYPE = "jdbcDebugtype"; ! String LOGIN_TIMEOUT = "loginTimeout"; ! String MAIN_FRAME_STATE = "mainFrameWindowState"; ! String MAXIMIMIZE_SESSION_SHEET_ON_OPEN = "maximizeSessionSheetOnOpen"; ! String NEW_SESSION_VIEW = "newSessionView"; ! String PLUGIN_OBJECTS = "pluginObjects"; ! String PLUGIN_STATUSES = "pluginStatuses"; ! String PROXY = "proxyPerferences"; ! String SCROLLABLE_TABBED_PANES = "useScrollableTabbedPanes"; ! String SESSION_PROPERTIES = "sessionProperties"; String SHOW_ALIASES_TOOL_BAR = "showAliasesToolBar"; ! String SHOW_CONTENTS_WHEN_DRAGGING = "showContentsWhenDragging"; ! String SHOW_DRIVERS_TOOL_BAR = "showDriversToolBar"; ! String SHOW_LOADED_DRIVERS_ONLY = "showLoadedDriversOnly"; ! String SHOW_MAIN_STATUS_BAR = "showMainStatusBar"; ! String SHOW_MAIN_TOOL_BAR = "showMainToolBar"; ! String SHOW_TOOLTIPS = "showToolTips"; ! String SHOW_COLOR_ICONS_IN_TOOLBAR="showColorIconsInToolbars"; ! String SHOW_PLUGIN_FILES_IN_SPLASH_SCREEN="showPluginFilesInSplashScreen"; String FILE_OPEN_IN_PREVIOUS_DIR = "fileOpenInPreviousDir"; String FILE_OPEN_IN_SPECIFIED_DIR = "fileOpenInSpecifiedDir"; String FILE_SPECIFIED_DIR = "fileSpecifiedDir"; String FILE_PREVIOUS_DIR = "filePreviousdDir"; ! String WARN_JRE_JDBC_MISMATCH = "warnJreJdbcMismatch"; ! String WARN_FOR_UNSAVED_FILE_EDITS = "warnForUnsavedFileEdits"; ! String WARN_FOR_UNSAVED_BUFFER_EDITS = "warnForUnsavedBufferEdits"; } ! public interface IJdbcDebugTypes { int NONE = 0; --- 51,90 ---- public interface IPropertyNames ! { ! String ACTION_KEYS = "actionKeys"; ! String ALIASES_SELECTED_INDEX = "aliasesSelectdIndex"; ! String CONFIRM_SESSION_CLOSE = "confirmSessionClose"; ! String DRIVERS_SELECTED_INDEX = "driversSelectdIndex"; ! String FIRST_RUN = "firstRun"; ! String JDBC_DEBUG_TYPE = "jdbcDebugtype"; ! String LOGIN_TIMEOUT = "loginTimeout"; ! String MAIN_FRAME_STATE = "mainFrameWindowState"; ! String MAXIMIMIZE_SESSION_SHEET_ON_OPEN = "maximizeSessionSheetOnOpen"; ! String NEW_SESSION_VIEW = "newSessionView"; ! String PLUGIN_OBJECTS = "pluginObjects"; ! String PLUGIN_STATUSES = "pluginStatuses"; ! String PROXY = "proxyPerferences"; ! String SCROLLABLE_TABBED_PANES = "useScrollableTabbedPanes"; ! String SESSION_PROPERTIES = "sessionProperties"; String SHOW_ALIASES_TOOL_BAR = "showAliasesToolBar"; ! String SHOW_CONTENTS_WHEN_DRAGGING = "showContentsWhenDragging"; ! String SHOW_DRIVERS_TOOL_BAR = "showDriversToolBar"; ! String SHOW_LOADED_DRIVERS_ONLY = "showLoadedDriversOnly"; ! String SHOW_MAIN_STATUS_BAR = "showMainStatusBar"; ! String SHOW_MAIN_TOOL_BAR = "showMainToolBar"; ! String SHOW_TOOLTIPS = "showToolTips"; ! String SHOW_COLOR_ICONS_IN_TOOLBAR = "showColorIconsInToolbars"; ! String SHOW_PLUGIN_FILES_IN_SPLASH_SCREEN = "showPluginFilesInSplashScreen"; String FILE_OPEN_IN_PREVIOUS_DIR = "fileOpenInPreviousDir"; String FILE_OPEN_IN_SPECIFIED_DIR = "fileOpenInSpecifiedDir"; String FILE_SPECIFIED_DIR = "fileSpecifiedDir"; String FILE_PREVIOUS_DIR = "filePreviousdDir"; ! String WARN_JRE_JDBC_MISMATCH = "warnJreJdbcMismatch"; ! String WARN_FOR_UNSAVED_FILE_EDITS = "warnForUnsavedFileEdits"; ! String WARN_FOR_UNSAVED_BUFFER_EDITS = "warnForUnsavedBufferEdits"; ! String SHOW_SESSION_STARTUP_TIME_HINT = "showSessionStartupTimeHint"; } ! public interface IJdbcDebugTypes { int NONE = 0; *************** *** 190,195 **** /** Warning when closing session if a buffer was edited but not saved. */ private boolean _warnForUnsavedBufferEdits = true; ! ! /** * Objects stored by plugins. Each element of this collection is a <TT>Map</TT> * keyed by the plugin's internal name and containing all objects for that --- 191,200 ---- /** Warning when closing session if a buffer was edited but not saved. */ private boolean _warnForUnsavedBufferEdits = true; ! ! ! /** Hint to Alias Schema Properties when Session startup takes considerable time */ ! private boolean _showSessionStartupTimeHint = true; ! ! /** * Objects stored by plugins. Each element of this collection is a <TT>Map</TT> * keyed by the plugin's internal name and containing all objects for that *************** *** 929,932 **** return _warnForUnsavedBufferEdits; } ! } --- 934,963 ---- return _warnForUnsavedBufferEdits; } ! ! ! ! /** ! * @param _warnForUnsavedBufferEdits The _warnForUnsavedBufferEdits to set. ! */ ! public synchronized void setShowSessionStartupTimeHint(boolean data) ! { ! if (data != _showSessionStartupTimeHint) ! { ! final boolean oldValue = _showSessionStartupTimeHint; ! _showSessionStartupTimeHint = data; ! getPropertyChangeReporter().firePropertyChange( ! IPropertyNames.SHOW_SESSION_STARTUP_TIME_HINT, ! oldValue, _showSessionStartupTimeHint); ! } ! } ! ! /** ! * @return Returns the _warnForUnsaveFileEdits. ! */ ! public boolean getShowSessionStartupTimeHint() ! { ! return _showSessionStartupTimeHint; ! } ! ! } Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** I18NStrings.properties 5 Apr 2006 13:20:36 -0000 1.10 --- I18NStrings.properties 27 Jun 2006 01:20:30 -0000 1.11 *************** *** 24,27 **** --- 24,28 ---- GeneralPreferencesPanel.warnForUnsavedFileEdits=Warning for unsaved file edits GeneralPreferencesPanel.warnForUnsavedBufferEdits=Warning for unsaved buffer edits + GeneralPreferencesPanel.showSessionStartupTimeHint=Show Session startup time hint GlobalPreferencesSheet.close=Close |