OSDN Git Service

Merge branch 't32628' into v4.0.3
authorargius <argius.net@gmail.com>
Wed, 18 Dec 2013 13:33:16 +0000 (22:33 +0900)
committerargius <argius.net@gmail.com>
Wed, 18 Dec 2013 13:33:16 +0000 (22:33 +0900)
Conflicts:
src/net/argius/stew/ui/window/WindowOutputProcessor.java

1  2 
src/net/argius/stew/ui/window/ResultSetTable.java
src/net/argius/stew/ui/window/WindowOutputProcessor.java

@@@ -154,13 -151,10 +154,14 @@@ final class WindowOutputProcessor exten
  
      @SuppressWarnings("unused")
      private void clearResultSetTable() {
 +        Container p = resultSetTable.getParent();
 +        if (p != null && p.getParent() instanceof JScrollPane) {
 +            ((JScrollPane)p.getParent()).setCorner(ScrollPaneConstants.UPPER_LEFT_CORNER, null);
 +        }
          resultSetTable.setVisible(false);
          resultSetTable.getTableHeader().setVisible(false);
-         resultSetTable.reset();
+         ((DefaultTableModel)resultSetTable.getModel()).setRowCount(0);
+         resultSetTable.resetSortState();
      }
  
      @SuppressWarnings("unused")