Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel I18NStrin
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2006-01-29 19:24:11
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17038/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel Modified Files: I18NStrings.properties SQLResultExecuterPanel.java Log Message: i18n. Also, removed duplicate logger declaration. Index: SQLResultExecuterPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SQLResultExecuterPanel.java 18 Dec 2005 00:43:51 -0000 1.21 --- SQLResultExecuterPanel.java 29 Jan 2006 19:24:00 -0000 1.22 *************** *** 36,39 **** --- 36,41 ---- import net.sourceforge.squirrel_sql.fw.sql.SQLConnection; import net.sourceforge.squirrel_sql.fw.util.Resources; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.fw.util.StringUtilities; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; *************** *** 63,68 **** { /** Logger for this class. */ ! private static final ILogger s_log = LoggerController.createLogger(SQLResultExecuterPanel.class); private ISession _session; --- 65,75 ---- { /** Logger for this class. */ ! private static final ILogger s_log = ! LoggerController.createLogger(SQLResultExecuterPanel.class); + /** Internationalized strings for this class. */ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(SQLResultExecuterPanel.class); + private ISession _session; *************** *** 95,100 **** private IntegerIdentifierFactory _idFactory = new IntegerIdentifierFactory(); private ResultTab _stickyTab; ! ! private ILogger _log = LoggerController.createLogger(SQLResultExecuterPanel.class); --- 102,106 ---- private IntegerIdentifierFactory _idFactory = new IntegerIdentifierFactory(); private ResultTab _stickyTab; ! *************** *** 117,121 **** public String getTitle() { ! return "Results"; } --- 123,128 ---- public String getTitle() { ! // i18n[SQLResultExecuterPanel.title=Results] ! return s_stringMgr.getString("SQLResultExecuterPanel.title"); } *************** *** 228,233 **** else { ! _session.getMessageHandler().showErrorMessage( ! "No SQL selected for execution."); } } --- 235,242 ---- else { ! // i18n[SQLResultExecuterPanel.nosqlselected=No SQL selected for execution.] ! String msg = ! s_stringMgr.getString("SQLResultExecuterPanel.nosqlselected"); ! _session.getMessageHandler().showErrorMessage(msg); } } *************** *** 807,812 **** final JPopupMenu popup = new JPopupMenu(); ! ! JMenuItem mnuClose = new JMenuItem("Close"); initAccelerator(CloseCurrentSQLResultTabAction.class, mnuClose); mnuClose.addActionListener(new ActionListener() --- 816,822 ---- final JPopupMenu popup = new JPopupMenu(); ! // i18n[SQLResultExecuterPanel.close=Close] ! String closeLabel = s_stringMgr.getString("SQLResultExecuterPanel.close"); ! JMenuItem mnuClose = new JMenuItem(closeLabel); initAccelerator(CloseCurrentSQLResultTabAction.class, mnuClose); mnuClose.addActionListener(new ActionListener() *************** *** 819,823 **** popup.add(mnuClose); ! JMenuItem mnuCloseAllButThis = new JMenuItem("Close all but this"); initAccelerator(CloseAllSQLResultTabsButCurrentAction.class, mnuCloseAllButThis); mnuCloseAllButThis.addActionListener(new ActionListener() --- 829,836 ---- popup.add(mnuClose); ! // i18n[SQLResultExecuterPanel.closeAllButThis=Close all but this] ! String cabtLabel = ! s_stringMgr.getString("SQLResultExecuterPanel.closeAllButThis"); ! JMenuItem mnuCloseAllButThis = new JMenuItem(cabtLabel); initAccelerator(CloseAllSQLResultTabsButCurrentAction.class, mnuCloseAllButThis); mnuCloseAllButThis.addActionListener(new ActionListener() *************** *** 830,835 **** popup.add(mnuCloseAllButThis); ! ! JMenuItem mnuCloseAll = new JMenuItem("Close all"); initAccelerator(CloseAllSQLResultTabsAction.class, mnuCloseAll); mnuCloseAll.addActionListener(new ActionListener() --- 843,849 ---- popup.add(mnuCloseAllButThis); ! // i18n[SQLResultExecuterPanel.closeAll=Close all] ! String caLabel = s_stringMgr.getString("SQLResultExecuterPanel.closeAll"); ! JMenuItem mnuCloseAll = new JMenuItem(caLabel); initAccelerator(CloseAllSQLResultTabsAction.class, mnuCloseAll); mnuCloseAll.addActionListener(new ActionListener() *************** *** 842,846 **** popup.add(mnuCloseAll); ! JMenuItem mnuToggleSticky = new JMenuItem("Toggle sticky"); initAccelerator(ToggleCurrentSQLResultTabStickyAction.class, mnuToggleSticky); mnuToggleSticky.addActionListener(new ActionListener() --- 856,863 ---- popup.add(mnuCloseAll); ! // i18n[SQLResultExecuterPanel.toggleSticky=Toggle sticky] ! String tsLabel = ! s_stringMgr.getString("SQLResultExecuterPanel.toggleSticky"); ! JMenuItem mnuToggleSticky = new JMenuItem(tsLabel); initAccelerator(ToggleCurrentSQLResultTabStickyAction.class, mnuToggleSticky); mnuToggleSticky.addActionListener(new ActionListener() *************** *** 913,917 **** { _cancelPanel.setSQL(StringUtilities.cleanString(sql)); ! _cancelPanel.setStatusLabel("Executing SQL..."); } }); --- 930,937 ---- { _cancelPanel.setSQL(StringUtilities.cleanString(sql)); ! // i18n[SQLResultExecuterPanel.execStatus=Executing SQL...] ! String status = ! s_stringMgr.getString("SQLResultExecuterPanel.execStatus"); ! _cancelPanel.setStatusLabel(status); } }); *************** *** 920,924 **** public void sqlExecutionComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount) { - // i18n final NumberFormat nbrFmt = NumberFormat.getNumberInstance(); double executionLength = exInfo.getSQLExecutionElapsedMillis() / 1000.0; --- 940,943 ---- *************** *** 939,952 **** public void sqlExecutionCancelled() { ! if (rsds != null) rsds.cancelProcessing(); ! getSession().getMessageHandler().showMessage( ! "Query execution cancelled by user."); } public void sqlDataUpdated(int updateCount) { ! getSession().getMessageHandler().showMessage( ! updateCount + " Rows Updated"); } --- 958,977 ---- public void sqlExecutionCancelled() { ! if (rsds != null) { rsds.cancelProcessing(); ! } ! // i18n[SQLResultExecuterPanel.cancelled=Query execution cancelled by user.] ! String canc = ! s_stringMgr.getString("SQLResultExecuterPanel.cancelled"); ! getSession().getMessageHandler().showMessage(canc); } public void sqlDataUpdated(int updateCount) { ! // i18n[SQLResultExecuterPanel.rowsUpdated={0} Rows Updated] ! String rowsUpdated = ! s_stringMgr.getString("SQLResultExecuterPanel.rowsUpdated", ! new Integer(updateCount)); ! getSession().getMessageHandler().showMessage(rowsUpdated); } *************** *** 959,963 **** IDataSetUpdateableTableModel model) { ! _cancelPanel.setStatusLabel("Building output..."); rsds = new ResultSetDataSet(); SessionProperties props = getSession().getProperties(); --- 984,991 ---- IDataSetUpdateableTableModel model) { ! // i18n[SQLResultExecuterPanel.outputStatus=Building output...] ! String outputStatus = ! s_stringMgr.getString("SQLResultExecuterPanel.outputStatus"); ! _cancelPanel.setStatusLabel(outputStatus); rsds = new ResultSetDataSet(); SessionProperties props = getSession().getProperties(); *************** *** 1022,1026 **** if(getSession().getProperties().getWriteSQLErrorsToLog()) { ! _log.info(msg); } } --- 1050,1054 ---- if(getSession().getProperties().getWriteSQLErrorsToLog()) { ! s_log.info(msg); } } *************** *** 1049,1053 **** public void run() { ! _tabbedResultsPanel.addTab("Executing SQL", null, panel, "Press Cancel to Stop"); _tabbedResultsPanel.setSelectedComponent(panel); } --- 1077,1088 ---- public void run() { ! // i18n[SQLResultExecuterPanel.exec=Executing SQL] ! String execMsg = ! s_stringMgr.getString("SQLResultExecuterPanel.exec"); ! // i18n[SQLResultExecuterPanel.cancelMsg=Press Cancel to Stop] ! String cancMsg = ! s_stringMgr.getString("SQLResultExecuterPanel.cancelMsg"); ! ! _tabbedResultsPanel.addTab(execMsg, null, panel, cancMsg); _tabbedResultsPanel.setSelectedComponent(panel); } *************** *** 1071,1075 **** super(new GridBagLayout()); ! JButton cancelBtn = new JButton("Cancel"); cancelBtn.addActionListener(this); --- 1106,1113 ---- super(new GridBagLayout()); ! // i18n[SQLResultExecuterPanel.cancelButtonLabel=Cancel] ! String label = ! s_stringMgr.getString("SQLResultExecuterPanel.cancelButtonLabel"); ! JButton cancelBtn = new JButton(label); cancelBtn.addActionListener(this); *************** *** 1081,1085 **** gbc.gridx = 0; gbc.gridy = 0; ! add(new JLabel("SQL:"), gbc); gbc.weightx = 1; --- 1119,1126 ---- gbc.gridx = 0; gbc.gridy = 0; ! ! // i18n[SQLResultExecuterPanel.sqlLabel=SQL:] ! label = s_stringMgr.getString("SQLResultExecuterPanel.sqlLabel"); ! add(new JLabel(label), gbc); gbc.weightx = 1; *************** *** 1090,1094 **** gbc.gridx = 0; ++gbc.gridy; ! add(new JLabel("Status:"), gbc); ++gbc.gridx; --- 1131,1138 ---- gbc.gridx = 0; ++gbc.gridy; ! // i18n[SQLResultExecuterPanel.statusLabel=Status:] ! label = ! s_stringMgr.getString("SQLResultExecuterPanel.statusLabel"); ! add(new JLabel(label), gbc); ++gbc.gridx; *************** *** 1104,1112 **** { ++_currentQueryIndex; ! StringBuffer buf = new StringBuffer(); ! buf.append(String.valueOf(_currentQueryIndex)).append(" of ") ! .append(String.valueOf(_queryCount)).append(" - ") ! .append(sql); ! _sqlLbl.setText(buf.toString()); } --- 1148,1159 ---- { ++_currentQueryIndex; ! ! // i18n[SQLResultExecuterPanel.currentSQLLabel={0} of {1} - {2}] ! String label = ! s_stringMgr.getString("SQLResultExecuterPanel.currentSQLLabel", ! new Object[] { String.valueOf(_currentQueryIndex), ! String.valueOf(_queryCount), ! sql} ); ! _sqlLbl.setText(label); } Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** I18NStrings.properties 28 Jan 2006 21:40:44 -0000 1.2 --- I18NStrings.properties 29 Jan 2006 19:24:00 -0000 1.3 *************** *** 6,9 **** --- 6,26 ---- SQLPanel.limitrowscheckbox.label=Limit rows: + SQLResultExecuterPanel.cancelButtonLabel=Cancel + SQLResultExecuterPanel.cancelled=Query execution cancelled by user. + SQLResultExecuterPanel.cancelMsg=Press Cancel to Stop + SQLResultExecuterPanel.close=Close + SQLResultExecuterPanel.closeAll=Close all + SQLResultExecuterPanel.closeAllButThis=Close all but this + SQLResultExecuterPanel.currentSQLLabel={0} of {1} - {2} + SQLResultExecuterPanel.exec=Executing SQL + SQLResultExecuterPanel.execStatus=Executing SQL... + SQLResultExecuterPanel.nosqlselected=No SQL selected for execution. + SQLResultExecuterPanel.outputStatus=Building output... + SQLResultExecuterPanel.rowsUpdated={0} Rows Updated + SQLResultExecuterPanel.sqlLabel=SQL: + SQLResultExecuterPanel.statusLabel=Status: + SQLResultExecuterPanel.title=Results + SQLResultExecuterPanel.toggleSticky=Toggle sticky + SQLTab.hint=Execute SQL statements SQLTab.title=SQL |