From: argius Date: Wed, 18 Dec 2013 13:23:02 +0000 (+0900) Subject: [#32628] add new method resetSortState into class ResultSetTable and WindowOutputProc... X-Git-Tag: v4.0.3~1^2 X-Git-Url: http://git.osdn.net/view?p=stew%2FStew4.git;a=commitdiff_plain;h=refs%2Fheads%2Ft32628 [#32628] add new method resetSortState into class ResultSetTable and WindowOutputProcessor call it in method clearResultSetTable --- diff --git a/src/net/argius/stew/ui/window/ResultSetTable.java b/src/net/argius/stew/ui/window/ResultSetTable.java index 3a2e2fb..854d3b9 100644 --- a/src/net/argius/stew/ui/window/ResultSetTable.java +++ b/src/net/argius/stew/ui/window/ResultSetTable.java @@ -7,7 +7,6 @@ import static java.awt.event.MouseEvent.MOUSE_PRESSED; import static javax.swing.KeyStroke.getKeyStroke; import static net.argius.stew.ui.window.AnyActionKey.*; import static net.argius.stew.ui.window.ResultSetTable.ActionKey.*; - import java.awt.*; import java.awt.event.*; import java.beans.*; @@ -15,12 +14,10 @@ import java.io.*; import java.sql.*; import java.util.*; import java.util.List; - import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; import javax.swing.text.*; - import net.argius.stew.*; import net.argius.stew.io.*; import net.argius.stew.text.*; @@ -893,6 +890,11 @@ final class ResultSetTable extends JTable implements AnyActionListener, TextSear // empty } + void resetSortState() { + lastSortedIndex = -1; + lastSortedIsReverse = false; + } + static final class TableHeaderTextSearch implements TextSearch { private ResultSetTable rstable; private JTableHeader tableHeader; diff --git a/src/net/argius/stew/ui/window/WindowOutputProcessor.java b/src/net/argius/stew/ui/window/WindowOutputProcessor.java index 6d24c51..cdacf23 100644 --- a/src/net/argius/stew/ui/window/WindowOutputProcessor.java +++ b/src/net/argius/stew/ui/window/WindowOutputProcessor.java @@ -5,17 +5,14 @@ import static net.argius.stew.Bootstrap.getPropertyAsInt; import static net.argius.stew.ui.window.AnyActionKey.*; import static net.argius.stew.ui.window.Utilities.getImageIcon; import static net.argius.stew.ui.window.Utilities.sleep; - import java.awt.*; import java.awt.event.*; import java.io.*; import java.sql.*; import java.util.*; import java.util.List; - import javax.swing.*; import javax.swing.table.*; - import net.argius.stew.*; import net.argius.stew.io.*; import net.argius.stew.ui.*; @@ -157,6 +154,7 @@ final class WindowOutputProcessor extends JFrame implements OutputProcessor, Any resultSetTable.setVisible(false); resultSetTable.getTableHeader().setVisible(false); ((DefaultTableModel)resultSetTable.getModel()).setRowCount(0); + resultSetTable.resetSortState(); } @SuppressWarnings("unused")