[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6714] trunk/sql12/fw/src/main/java/net/ sourceforge/squirrel_sql/fw/datasetviewer/tablefind

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

Revision: 6714
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6714&view=rev
Author:   gerdwagner
Date:     2012-11-14 21:48:33 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Result table search --> More

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java	2012-11-12 21:57:39 UTC (rev 6713)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java	2012-11-14 21:48:33 UTC (rev 6714)
@@ -2,6 +2,7 @@
 
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.MyTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.RowNumberTableColumn;
 import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
 import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
 import net.sourceforge.squirrel_sql.fw.gui.SortingListener;
@@ -104,7 +105,10 @@
    {
       for (int i = 0; i < _table.getColumnModel().getColumnCount(); i++)
       {
-         _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
+         if (RowNumberTableColumn.ROW_NUMBER_MODEL_INDEX !=  _table.getColumnModel().getColumn(i).getModelIndex())
+         {
+            _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
+         }
       }
 
       if (_table.getModel() instanceof SortableTableModel)

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java	2012-11-12 21:57:39 UTC (rev 6713)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java	2012-11-14 21:48:33 UTC (rev 6714)
@@ -48,13 +48,16 @@
 
    public ArrayList<Integer> getRowsFound()
    {
-      ArrayList<Integer> ret = new ArrayList();
+      HashSet<Integer> uniqueRows = new HashSet<Integer>();
 
+
       for (Point point : _trace)
       {
-         ret.add(point.x);
+         uniqueRows.add(point.x);
       }
 
+      ArrayList<Integer> ret = new ArrayList(uniqueRows);
+
       Collections.sort(ret);
 
       return ret;

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