From: <sv...@us...> - 2007-02-02 17:31:06
|
Revision: 8857 http://svn.sourceforge.net/jedit/?rev=8857&view=rev Author: svu Date: 2007-02-02 09:30:49 -0800 (Fri, 02 Feb 2007) Log Message: ----------- make requery period configurable Modified Paths: -------------- plugins/SQL/trunk/ChangeLog plugins/SQL/trunk/SqlPlugin.props plugins/SQL/trunk/sql/ResultSetPanel.java plugins/SQL/trunk/sql/options/GeneralOptionPane.java Modified: plugins/SQL/trunk/ChangeLog =================================================================== --- plugins/SQL/trunk/ChangeLog 2007-02-02 15:52:52 UTC (rev 8856) +++ plugins/SQL/trunk/ChangeLog 2007-02-02 17:30:49 UTC (rev 8857) @@ -1,3 +1,8 @@ +2007-02-02 svu + + * SqlPlugin.props, sql/ResultSetPanel.java, + sql/options/GeneralOptionPane.java: make requery period configurable + 2007-02-01 svu * sql/SqlTextPublisher.java, sql/ResultSetWindow.java: requerying Modified: plugins/SQL/trunk/SqlPlugin.props =================================================================== --- plugins/SQL/trunk/SqlPlugin.props 2007-02-02 15:52:52 UTC (rev 8856) +++ plugins/SQL/trunk/SqlPlugin.props 2007-02-02 17:30:49 UTC (rev 8857) @@ -64,6 +64,7 @@ sql.options.recordSetView.label=Record Set dockable sql.options.maxRecs2Show.label=Max no. of records to show +sql.options.queryExectionPeriod.label=Query reexecution period, sec sql.options.autoresizeResult.label=Autoresize sql.options.closeWithBuffer.label=Close with buffer Modified: plugins/SQL/trunk/sql/ResultSetPanel.java =================================================================== --- plugins/SQL/trunk/sql/ResultSetPanel.java 2007-02-02 15:52:52 UTC (rev 8856) +++ plugins/SQL/trunk/sql/ResultSetPanel.java 2007-02-02 17:30:49 UTC (rev 8857) @@ -60,15 +60,13 @@ protected HelpfulJTable dataTable; protected final static String MAX_RECS_TO_SHOW_PROP = "sql.maxRecordsToShow"; + protected final static String QUERY_EXEC_PERIOD_PROP = "sql.queryExecutionPeriod"; protected final static String AUTORESIZE = "sql.autoresizeResult"; protected final static String CLOSE_WITH_BUFFER = "sql.closeWithBuffer"; protected int sortOrder = HelpfulJTable.SORT_OFF; protected int sortColumn = -1; - // TODO: put into plugin options dialog - public final static int REEXEC_PERIOD = 3; - /** * Constructor for the ResultSetWindow object * @@ -202,7 +200,7 @@ ppm.add(new JSeparator()); - final Object[] args = new Object[]{ new Integer(REEXEC_PERIOD) }; + final Object[] args = new Object[]{ new Integer(getQueryExecutionPeriod()) }; final JMenuItem remi = new JCheckBoxMenuItem(jEdit.getProperty("sql.resultSet.repeatQuery.every.label", args)); remi.setFocusPainted(false); remi.setToolTipText(jEdit.getProperty("sql.resultSet.repeatQuery.every.tooltip", args)); @@ -448,6 +446,27 @@ } + public final static void setQueryExecutionPeriod(int secs) + { + SqlPlugin.setGlobalProperty(QUERY_EXEC_PERIOD_PROP, "" + secs); + } + + + public final static int getQueryExecutionPeriod() + { + try + { + return Integer.parseInt(SqlPlugin.getGlobalProperty(QUERY_EXEC_PERIOD_PROP)); + } catch (NumberFormatException ex) + { + return 3; + } catch (NullPointerException ex) + { + return 3; + } + } + + /** * Gets the AutoResize attribute of the ResultSetWindow class * @@ -814,7 +833,7 @@ ResultSetPanel.this); try { - Thread.sleep(1000L * REEXEC_PERIOD); + Thread.sleep(1000L * getQueryExecutionPeriod()); } catch (Exception ex) {} } repeaterThread = null; Modified: plugins/SQL/trunk/sql/options/GeneralOptionPane.java =================================================================== --- plugins/SQL/trunk/sql/options/GeneralOptionPane.java 2007-02-02 15:52:52 UTC (rev 8856) +++ plugins/SQL/trunk/sql/options/GeneralOptionPane.java 2007-02-02 17:30:49 UTC (rev 8857) @@ -49,6 +49,7 @@ public class GeneralOptionPane extends SqlOptionPane { private JTextField maxRecsField; + private JTextField queryExecPeriodField; private JCheckBox showToolBar; private JCheckBox showTitle; private JCheckBox autoresizeResult; @@ -96,8 +97,20 @@ JPanel panel1 = new JPanel(); { panel1.setLayout(new BorderLayout(5, 5)); - panel1.add(new JLabel(jEdit.getProperty("sql.options.maxRecs2Show.label")), BorderLayout.WEST); - panel1.add(maxRecsField = new JTextField("" + ResultSetPanel.getMaxRecordsToShow()), BorderLayout.CENTER); + JPanel panel2 = new JPanel(); + { + panel2.setLayout(new BorderLayout(5, 5)); + panel2.add(new JLabel(jEdit.getProperty("sql.options.maxRecs2Show.label")), BorderLayout.WEST); + panel2.add(maxRecsField = new JTextField("" + ResultSetPanel.getMaxRecordsToShow()), BorderLayout.CENTER); + } + panel1.add(panel2, BorderLayout.NORTH); + panel2 = new JPanel(); + { + panel2.setLayout(new BorderLayout(5, 5)); + panel2.add(new JLabel(jEdit.getProperty("sql.options.queryExectionPeriod.label")), BorderLayout.WEST); + panel2.add(queryExecPeriodField = new JTextField("" + ResultSetPanel.getQueryExecutionPeriod()), BorderLayout.CENTER); + } + panel1.add(panel2, BorderLayout.SOUTH); } panel.add(panel1); @@ -185,6 +198,13 @@ } catch (NumberFormatException ex) { } + + try + { + ResultSetPanel.setQueryExecutionPeriod(Integer.parseInt(queryExecPeriodField.getText())); + } catch (NumberFormatException ex) + { + } ResultSetPanel.setAutoResize(autoresizeResult.getSelectedObjects() != null); ResultSetPanel.setCloseWithBuffer(closeWithBuffer.getSelectedObjects() != null); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |