[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6406] trunk/sql12

[<ger...@us...>]

Revision: 6406
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6406&view=rev
Author:   gerdwagner
Date:     2011-09-17 16:44:12 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
The make editable function for SQL result tables now preserves the table's layout (ordering, scrolling position, ... )

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
    trunk/sql12/doc/src/main/resources/changes.txt

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java	2011-09-14 12:54:52 UTC (rev 6405)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java	2011-09-17 16:44:12 UTC (rev 6406)
@@ -32,8 +32,6 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -377,11 +375,15 @@
          {
             if (_allowEditing)
             {
+               TableState resultSortableTableState = getTableState(_resultSetOutput);
+
                _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator);
                _resultSetSp.setViewportView(_resultSetOutput.getComponent());
                _resultSetSp.setRowHeader(null);
                _rsds.resetCursor();
                _resultSetOutput.show(_rsds, null);
+
+               restoreTableState(resultSortableTableState, _resultSetOutput);
             }
             else
             {
@@ -396,11 +398,15 @@
 
             String readOnlyOutput = props.getReadOnlySQLResultsOutputClassName();
 
+            TableState resultSortableTableState = getTableState(_resultSetOutput);
+
             _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator);
             _resultSetSp.setViewportView(_resultSetOutput.getComponent());
             _resultSetSp.setRowHeader(null);
             _rsds.resetCursor();
             _resultSetOutput.show(_rsds, null);
+
+            restoreTableState(resultSortableTableState, _resultSetOutput);
          }
       }
       catch (DataSetException e)
@@ -409,8 +415,26 @@
       }
    }
 
+   private void restoreTableState(TableState resultSortableTableState, IDataSetViewer resultSetOutput)
+   {
+      if (null != resultSortableTableState)
+      {
+         resultSetOutput.applyResultSortableTableState(resultSortableTableState);
+      }
+   }
 
-	private void createGUI()
+   private TableState getTableState(IDataSetViewer resultSetOutput)
+   {
+      TableState resultSortableTableState = null;
+      if (null != resultSetOutput)
+      {
+         resultSortableTableState = resultSetOutput.getResultSortableTableState();
+      }
+      return resultSortableTableState;
+   }
+
+
+   private void createGUI()
 	{
 		//	final Resources rsrc = _session.getApplication().getResources();
 		setLayout(new BorderLayout());

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-09-14 12:54:52 UTC (rev 6405)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-09-17 16:44:12 UTC (rev 6406)
@@ -7,6 +7,8 @@
 
 Enhancements:
 
+The make editable function for SQL result tables now preserves the table's layout (ordering, scrolling position, ... ).
+
 New (prettier acorn) icons bundle for MacOS X (Thanks to Travis Hein for arranging the icon bundle and to the 
 original photograher - George Georgiades - for releasing the photo under the creative commons license.)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.