[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6285] trunk/sql12/plugins/graph/src/main

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

Revision: 6285
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6285&view=rev
Author:   gerdwagner
Date:     2011-06-03 16:53:55 +0000 (Fri, 03 Jun 2011)

Log Message:
-----------
Query Builder clean up

Modified Paths:
--------------
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/OrderType.java
    trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/OrderType.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/OrderType.java	2011-06-01 21:14:38 UTC (rev 6284)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/OrderType.java	2011-06-03 16:53:55 UTC (rev 6285)
@@ -97,7 +97,18 @@
          }
          else
          {
-            return c1.getName().compareTo(c2.getName());
+            if(c1.getQueryData().isSorted() && false == c2.getQueryData().isSorted())
+            {
+               return -1;
+            }
+            else if(false == c1.getQueryData().isSorted() && c2.getQueryData().isSorted())
+            {
+               return 1;
+            }
+            else
+            {
+               return c1.getName().compareTo(c2.getName());
+            }
          }
       }
    }

Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties	2011-06-01 21:14:38 UTC (rev 6284)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties	2011-06-03 16:53:55 UTC (rev 6285)
@@ -45,7 +45,7 @@
 graph.removeFoldingPoint=remove folding point
 graph.orderyName=order by name
 graph.orderPksConstr=order PKs/constraints on top
-graph.orderFilteredSelected=order filtered/selected on top
+graph.orderFilteredSelected=order filtered/selected/ordered on top
 
 graph.close=close
 graph.addTableRefByNoHit=add table referenced by (no hit on FK)
@@ -97,7 +97,7 @@
 graph.allTablesDbOrderRequested=For all tables: DB order
 graph.allTablesByNameOrderRequested=For all tables: Order by name
 graph.allTablesPkConstOrderRequested=For all tables: Order PKs/constraints on top
-graph.allTablesFilteredSelectedOrderRequested=For all tables: Order filtered/selected on top
+graph.allTablesFilteredSelectedOrderRequested=For all tables: Order filtered/selected/ordered on top
 
 graph.showQualifiedTableNames=Show qualified table names
 
@@ -212,7 +212,7 @@
 QueryBuilderController.Order=Order by
 
 Sorting.notSorted=Not sorted
-Sorting.notSortedTT=Column won't appear in ORDER BY clause
+Sorting.notSortedTT=Click to select an ORDER BY direction for thios column
 Sorting.sortedAsc=Order ascending
 Sorting.sortedAscTT=Column will appear as ASC in ORDER BY clause
 Sorting.sortedDesc=Order descending


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