|
From: <ger...@us...> - 2012-11-12 21:57:47
|
Revision: 6713
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6713&view=rev
Author: gerdwagner
Date: 2012-11-12 21:57:39 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Result table search --> More
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
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/FindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.*;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.SimpleDataSet;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -276,7 +277,7 @@
{
try
{
- OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
+ SimpleDataSet ods = new SimpleDataSet(allRows, columnDisplayDefinitions);
DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
dsv.init(null, new DefaultDataModelImplementationDetails(_session));
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,43 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
-import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
-
-import java.util.List;
-
-public class OverviewDataSet implements IDataSet
-{
- private int _curIx = -1;
- private ColumnDisplayDefinition[] _columnDisplayDefinitions;
- private List<Object[]> _allRows;
-
-
- public OverviewDataSet(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
- {
- _allRows = allRows;
- _columnDisplayDefinitions = columnDisplayDefinitions;
- }
-
- public int getColumnCount() throws DataSetException
- {
- return _columnDisplayDefinitions.length;
- }
-
- public DataSetDefinition getDataSetDefinition() throws DataSetException
- {
- return new DataSetDefinition(_columnDisplayDefinitions);
- }
-
- public boolean next(IMessageHandler msgHandler) throws DataSetException
- {
- return ++_curIx < _allRows.size();
- }
-
- public Object get(int columnIndex) throws DataSetException
- {
- return _allRows.get(_curIx)[columnIndex];
- }
-}
\ No newline at end of file
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -241,7 +241,7 @@
public net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.FindService createFindService()
{
- return new DefaultFindService(_table);
+ return new DefaultFindService(_table, getColumnDefinitions(), _table.getTypedModel());
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -30,14 +30,12 @@
public final class MyTableModel extends AbstractTableModel
{
- private static final long serialVersionUID = 5511368149198548935L;
+ private List<Object[]> _data = new ArrayList<Object[]>();
+ private ColumnDisplayDefinition[] _colDefs = new ColumnDisplayDefinition[0];
+ private IDataSetTableControls _creator = null;
- private List<Object[]> _data = new ArrayList<Object[]>();
- private ColumnDisplayDefinition[] _colDefs = new ColumnDisplayDefinition[0];
- private IDataSetTableControls _creator = null;
-
- MyTableModel(IDataSetTableControls creator)
+ MyTableModel(IDataSetTableControls creator)
{
super();
_creator = creator;
@@ -214,4 +212,9 @@
fireTableDataChanged();
}
+
+ public Object[] getRowAt(Integer rowIx)
+ {
+ return _data.get(rowIx);
+ }
}
Copied: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java (from rev 6710, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java)
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -0,0 +1,43 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+
+import java.util.List;
+
+public class SimpleDataSet implements IDataSet
+{
+ private int _curIx = -1;
+ private ColumnDisplayDefinition[] _columnDisplayDefinitions;
+ private List<Object[]> _allRows;
+
+
+ public SimpleDataSet(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
+ {
+ _allRows = allRows;
+ _columnDisplayDefinitions = columnDisplayDefinitions;
+ }
+
+ public int getColumnCount() throws DataSetException
+ {
+ return _columnDisplayDefinitions.length;
+ }
+
+ public DataSetDefinition getDataSetDefinition() throws DataSetException
+ {
+ return new DataSetDefinition(_columnDisplayDefinitions);
+ }
+
+ public boolean next(IMessageHandler msgHandler) throws DataSetException
+ {
+ return ++_curIx < _allRows.size();
+ }
+
+ public Object get(int columnIndex) throws DataSetException
+ {
+ return _allRows.get(_curIx)[columnIndex];
+ }
+}
\ No newline at end of file
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -20,7 +20,7 @@
JButton btnUnhighlightResult;
JButton btnHideFindPanel;
JButton btnHighlightFindResult;
- JButton btnShowFoundRowsInTable;
+ JButton btnShowRowsFoundInTable;
public DataSetFindPanel()
{
@@ -72,10 +72,10 @@
add(btnUnhighlightResult, gbc);
gbc = new GridBagConstraints(7,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
- btnShowFoundRowsInTable = new JButton(rsrc.getIcon(LibraryResources.IImageNames.MARKED_TO_NEW_TABLE));
- btnShowFoundRowsInTable.setToolTipText(s_stringMgr.getString("DataSetFindPanel.showFoundRowsInTable"));
- btnShowFoundRowsInTable.setBorder(BorderFactory.createEtchedBorder());
- add(btnShowFoundRowsInTable, gbc);
+ btnShowRowsFoundInTable = new JButton(rsrc.getIcon(LibraryResources.IImageNames.MARKED_TO_NEW_TABLE));
+ btnShowRowsFoundInTable.setToolTipText(s_stringMgr.getString("DataSetFindPanel.showFoundRowsInTable"));
+ btnShowRowsFoundInTable.setBorder(BorderFactory.createEtchedBorder());
+ add(btnShowRowsFoundInTable, gbc);
gbc = new GridBagConstraints(8,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
btnHideFindPanel = new JButton(rsrc.getIcon(LibraryResources.IImageNames.HIDE));
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,11 +1,14 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.util.*;
import org.apache.commons.lang.StringUtils;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.List;
public class DataSetFindPanelController
{
@@ -71,9 +74,18 @@
}
});
+ _dataSetFindPanel.btnShowRowsFoundInTable.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onShowRowsFoundInTable();
+ }
+ });
+
_dataSetFindPanel.btnHideFindPanel.addActionListener(new ActionListener()
{
@Override
@@ -85,7 +97,50 @@
}
+ private void onShowRowsFoundInTable()
+ {
+ Window parent = SwingUtilities.windowForComponent(_dataSetFindPanel);
+ JDialog dlg = new JDialog(parent, s_stringMgr.getString("DataSetFindPanel.searchResult"));
+ dlg.getContentPane().add(new JScrollPane(createSimpleTable().getComponent()));
+
+ dlg.setLocation(_dataSetViewerTablePanel.getComponent().getLocationOnScreen());
+ dlg.setSize(_findService.getVisibleSize());
+ dlg.setVisible(true);
+ }
+
+
+ private DataSetViewerTablePanel createSimpleTable()
+ {
+ try
+ {
+ List<Object[]> allRows = _findService.getRowsForIndexes(_trace.getRowsFound());
+ ColumnDisplayDefinition[] columnDisplayDefinitions = _findService.getColumnDisplayDefinitions();
+
+ SimpleDataSet ods = new SimpleDataSet(allRows, columnDisplayDefinitions);
+
+ DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
+
+ IDataModelImplementationDetails dataModelImplementationDetails = new IDataModelImplementationDetails()
+ {
+ @Override
+ public String getStatementSeparator()
+ {
+ return ";";
+ }
+ };
+
+ dsv.init(null, dataModelImplementationDetails);
+ dsv.show(ods);
+ return dsv;
+ }
+ catch (DataSetException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
public void wasHidden()
{
onUnhighlightResult();
@@ -107,13 +162,19 @@
{
_findService = _dataSetViewerTablePanel.createFindService();
- _findService.setFindServiceRenderCallBack(new FindServiceRenderCallBack()
+ _findService.setFindServiceCallBack(new FindServiceCallBack()
{
@Override
public FindMarkColor getBackgroundColor(int viewRow, int viewColumn)
{
return onGetBackgroundColor(viewRow, viewColumn);
}
+
+ @Override
+ public void tableCellStructureChanged()
+ {
+ onUnhighlightResult();
+ }
});
_tableTraverser.setFindService(_findService);
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-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,15 +1,31 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.MyTableModel;
+import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
+import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
+import net.sourceforge.squirrel_sql.fw.gui.SortingListener;
+
import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.TableColumnModelEvent;
+import javax.swing.event.TableColumnModelListener;
import java.awt.*;
+import java.util.*;
+import java.util.List;
public class DefaultFindService implements FindService
{
private JTable _table;
+ private ColumnDisplayDefinition[] _columnDefinitions;
+ private MyTableModel _myTableModel;
- public DefaultFindService(JTable table)
+ public DefaultFindService(JTable table, ColumnDisplayDefinition[] columnDefinitions, MyTableModel myTableModel)
{
_table = table;
+ _columnDefinitions = columnDefinitions;
+ _myTableModel = myTableModel;
}
@Override
@@ -60,12 +76,68 @@
}
@Override
- public void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack)
+ public ColumnDisplayDefinition[] getColumnDisplayDefinitions()
{
+ return _columnDefinitions;
+ }
+ @Override
+ public List<Object[]> getRowsForIndexes(ArrayList<Integer> rowIndexes)
+ {
+ ArrayList<Object[]> ret = new ArrayList<Object[]>();
+
+ for (Integer row : rowIndexes)
+ {
+ ret.add(_myTableModel.getRowAt(row));
+ }
+ return ret;
+ }
+
+ @Override
+ public Dimension getVisibleSize()
+ {
+ return _table.getVisibleRect().getSize();
+ }
+
+ @Override
+ public void setFindServiceCallBack(final FindServiceCallBack findServiceCallBack)
+ {
for (int i = 0; i < _table.getColumnModel().getColumnCount(); i++)
{
- _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceRenderCallBack));
+ _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
}
+
+ if (_table.getModel() instanceof SortableTableModel)
+ {
+ ((SortableTableModel)_table.getModel()).addSortingListener(new SortingListener()
+ {
+ @Override
+ public void sortingDone(int modelColumnIx, ColumnOrder columnOrder)
+ {
+ findServiceCallBack.tableCellStructureChanged();
+ }
+ });
+ }
+
+ _table.getColumnModel().addColumnModelListener(new TableColumnModelListener()
+ {
+ @Override
+ public void columnAdded(TableColumnModelEvent e){}
+
+ @Override
+ public void columnRemoved(TableColumnModelEvent e) {}
+
+ @Override
+ public void columnMoved(TableColumnModelEvent e)
+ {
+ findServiceCallBack.tableCellStructureChanged();
+ }
+
+ @Override
+ public void columnMarginChanged(ChangeEvent e) {}
+
+ @Override
+ public void columnSelectionChanged(ListSelectionEvent e) {}
+ });
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,5 +1,11 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
public interface FindService
{
int getRowCount();
@@ -10,9 +16,15 @@
void scrollToVisible(int viewRow, int viewCol);
- void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack);
+ void setFindServiceCallBack(FindServiceCallBack findServiceCallBack);
void repaintCell(int viewRow, int viewCol);
void repaintAll();
+
+ ColumnDisplayDefinition[] getColumnDisplayDefinitions();
+
+ List<Object[]> getRowsForIndexes(ArrayList<Integer> rowsFound);
+
+ Dimension getVisibleSize();
}
Copied: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java (from rev 6712, trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java)
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -0,0 +1,8 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+public interface FindServiceCallBack
+{
+ FindMarkColor getBackgroundColor(int viewRow, int viewColumn);
+
+ void tableCellStructureChanged();
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -8,22 +8,22 @@
public class FindServiceCellRendererDecorator implements TableCellRenderer
{
private TableCellRenderer _delegate;
- private FindServiceRenderCallBack _findServiceRenderCallBack;
+ private FindServiceCallBack _findServiceCallBack;
private Point _pointBuffer = new Point();
private HashMap<Point, Color> _originalColorsByCell = new HashMap<Point, Color>();
- public FindServiceCellRendererDecorator(TableCellRenderer delegate, FindServiceRenderCallBack findServiceRenderCallBack)
+ public FindServiceCellRendererDecorator(TableCellRenderer delegate, FindServiceCallBack findServiceCallBack)
{
_delegate = delegate;
- _findServiceRenderCallBack = findServiceRenderCallBack;
+ _findServiceCallBack = findServiceCallBack;
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
{
- FindMarkColor findMarkColor = _findServiceRenderCallBack.getBackgroundColor(row, column);
+ FindMarkColor findMarkColor = _findServiceCallBack.getBackgroundColor(row, column);
Component tableCellRendererComponent = _delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
Deleted: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,6 +0,0 @@
-package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
-
-public interface FindServiceRenderCallBack
-{
- FindMarkColor getBackgroundColor(int viewRow, int viewColumn);
-}
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-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,6 +1,8 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
public class FindTrace
@@ -43,4 +45,18 @@
_current = null;
_trace.clear();
}
+
+ public ArrayList<Integer> getRowsFound()
+ {
+ ArrayList<Integer> ret = new ArrayList();
+
+ for (Point point : _trace)
+ {
+ ret.add(point.x);
+ }
+
+ Collections.sort(ret);
+
+ return ret;
+ }
}
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties 2012-11-12 21:57:39 UTC (rev 6713)
@@ -16,3 +16,5 @@
DataSetFindPanel.unmarkFindResult=Unhighlight find result and return find cursor to begin
DataSetFindPanel.showFoundRowsInTable=Show marked rows in own table window
DataSetFindPanel.hideFind=Hide search panel
+
+DataSetFindPanel.searchResult=Marked rows in table search
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
