Author: mes
Date: 2011-06-21 15:40:25 -0700 (Tue, 21 Jun 2011)
New Revision: 25859
Modified:
core3/table-browser-impl/trunk/pom.xml
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
updated to for event-api changes that rely on payload events instead of
microlisteners
Modified: core3/table-browser-impl/trunk/pom.xml
===================================================================
--- core3/table-browser-impl/trunk/pom.xml 2011-06-21 22:40:11 UTC (rev
25858)
+++ core3/table-browser-impl/trunk/pom.xml 2011-06-21 22:40:25 UTC (rev
25859)
@@ -84,12 +84,12 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha4</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-06-21 22:40:11 UTC (rev 25858)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-06-21 22:40:25 UTC (rev 25859)
@@ -14,7 +14,6 @@
import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelEvent.*;
import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.equations.Equation;
@@ -22,39 +21,38 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableRowUpdateService;
import org.cytoscape.model.events.ColumnCreatedEvent;
import org.cytoscape.model.events.ColumnCreatedListener;
import org.cytoscape.model.events.ColumnDeletedEvent;
import org.cytoscape.model.events.ColumnDeletedListener;
import org.cytoscape.model.events.ColumnNameChangedEvent;
import org.cytoscape.model.events.ColumnNameChangedListener;
-import org.cytoscape.model.events.CyTableRowUpdateMicroListener;
+import org.cytoscape.model.events.RowSetRecord;
+import org.cytoscape.model.events.RowsCreatedEvent;
+import org.cytoscape.model.events.RowsCreatedListener;
+import org.cytoscape.model.events.RowsSetEvent;
+import org.cytoscape.model.events.RowsSetListener;
public final class BrowserTableModel extends AbstractTableModel
- implements ColumnCreatedListener, ColumnDeletedListener,
ColumnNameChangedListener, CyTableRowUpdateMicroListener
+ implements ColumnCreatedListener, ColumnDeletedListener,
ColumnNameChangedListener, RowsSetListener, RowsCreatedListener
{
+ private static final long serialVersionUID = -517521404005631245L;
private static final int EOF = -1;
private static final int MAX_INITIALLY_VSIBLE_ATTRS = 10;
private final JTable table;
private final CyTable attrs;
private final EquationCompiler compiler;
- private final CyTableRowUpdateService tableRowUpdateService;
private boolean tableHasBooleanSelected;
private List<AttrNameAndVisibility> attrNamesAndVisibilities;
- public BrowserTableModel(final JTable table, final CyTable attrs, final
EquationCompiler compiler,
- final CyTableRowUpdateService
tableRowUpdateService)
+ public BrowserTableModel(final JTable table, final CyTable attrs, final
EquationCompiler compiler)
{
this.table = table;
this.attrs = attrs;
this.compiler = compiler;
- this.tableRowUpdateService = tableRowUpdateService;
final CyColumn selectedColumn =
attrs.getColumn(CyNetwork.SELECTED);
- this.tableHasBooleanSelected =
- selectedColumn != null && selectedColumn.getType() ==
Boolean.class;
- tableRowUpdateService.startTracking(this, attrs);
+ this.tableHasBooleanSelected = selectedColumn != null &&
selectedColumn.getType() == Boolean.class;
initAttrNamesAndVisibilities();
}
@@ -89,7 +87,6 @@
public List<String> getVisibleAttributeNames() {
final List<String> visibleAttrNames = new ArrayList<String>();
- final String primaryKey = attrs.getPrimaryKey().getName();
for (final AttrNameAndVisibility nameAndVisibility :
attrNamesAndVisibilities) {
if (nameAndVisibility.isVisible())// &&
!nameAndVisibility.getName().equals(primaryKey))
visibleAttrNames.add(nameAndVisibility.getName());
@@ -292,17 +289,15 @@
}
@Override
- public void handleRowCreations(final CyTable table, final List<CyRow>
newRows) {
+ public void handleEvent(RowsCreatedEvent e) {
fireTableDataChanged();
}
@Override
- public void handleRowSets(final CyTable table, final List<RowSet>
rowSets) {
- // The following is an optimisation hack to prevent excessive
calls to
- // fireTableDataChanged() in the case of multiple selection
events:
+ public void handleEvent(RowsSetEvent e) {
if (tableHasBooleanSelected) {
boolean foundANonSelectedColumnName = false;
- for (final RowSet rowSet : rowSets) {
+ for (final RowSetRecord rowSet :
e.getPayloadCollection()) {
if
(!rowSet.getColumn().equals(CyNetwork.SELECTED)) {
foundANonSelectedColumnName = true;
break;
@@ -315,9 +310,8 @@
}
}
- for (final RowSet rowSet : rowSets)
- handleRowValueUpdate(rowSet.getRow(),
rowSet.getColumn(), rowSet.getValue(),
- rowSet.getRawValue());
+ for (final RowSetRecord rowSet : e.getPayloadCollection())
+ handleRowValueUpdate(rowSet.getRow(),
rowSet.getColumn(), rowSet.getValue(), rowSet.getRawValue());
}
private void handleRowValueUpdate(final CyRow row, final String
columnName, final Object newValue,
@@ -852,10 +846,6 @@
public boolean isCellEditable(final int rowIndex, final int
columnIndex) {
return table.convertColumnIndexToModel(columnIndex) != 0;
}
-
- public void cleanup() {
- tableRowUpdateService.stopTracking(this, attrs);
- }
}
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-06-21 22:40:11 UTC (rev 25858)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-06-21 22:40:25 UTC (rev 25859)
@@ -16,9 +16,6 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableRowSorter;
@@ -32,7 +29,6 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTableMetadata;
-import org.cytoscape.model.CyTableRowUpdateService;
import org.cytoscape.model.events.TableAboutToBeDeletedEvent;
import org.cytoscape.model.events.TableAboutToBeDeletedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -53,7 +49,6 @@
private final CyServiceRegistrar serviceRegistrar;
private final EquationCompiler compiler;
private final BrowserTable browserTable;
- private final CyTableRowUpdateService tableRowUpdateService;
private final AttributeBrowserToolBar attributeBrowserToolBar;
private final TableChooser tableChooser;
private BrowserTableModel browserTableModel;
@@ -66,7 +61,6 @@
TableBrowser(final CyTableManager tableManager, final
CyServiceRegistrar serviceRegistrar,
final EquationCompiler compiler, final OpenBrowser
openBrowser,
final CyNetworkManager networkManager,
- final CyTableRowUpdateService tableRowUpdateService,
final TableTaskFactory deleteTableTaskFactoryService,
final GUITaskManager guiTaskManagerServiceRef,
final PopupMenuHelper popupMenuHelper,
@@ -82,7 +76,6 @@
this.applicationManager = applicationManager;
this.browserTable = new BrowserTable(openBrowser, compiler,
popupMenuHelper);
- this.tableRowUpdateService = tableRowUpdateService;
this.attributeBrowserToolBar = new
AttributeBrowserToolBar(serviceRegistrar, compiler,
this.deleteTableTaskFactoryService,
this.guiTaskManagerServiceRef);
this.setLayout(new BorderLayout());
@@ -128,13 +121,11 @@
return;
if (browserTableModel != null) {
- browserTableModel.cleanup();
serviceRegistrar.unregisterAllServices(browserTableModel);
}
currentTable = table;
- browserTableModel = new BrowserTableModel(browserTable, table,
compiler,
-
tableRowUpdateService);
+ browserTableModel = new BrowserTableModel(browserTable, table,
compiler);
serviceRegistrar.registerAllServices(browserTableModel, new
Properties());
browserTable.setUpdateComparators(false);
browserTable.setModel(browserTableModel);
Modified:
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:40:11 UTC (rev 25858)
+++
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:40:25 UTC (rev 25859)
@@ -6,25 +6,18 @@
default-lazy-init="false">
<!-- imports -->
- <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
- <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
+ <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+ <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
<osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EquationCompiler" />
<osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
- <osgi:reference id="cyTableRowUpdateServiceRef"
interface="org.cytoscape.model.CyTableRowUpdateService" />
- <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
- <osgi:reference id="deleteTableTaskFactoryService"
interface="org.cytoscape.task.TableTaskFactory" />
- <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
- <osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.session.CyApplicationManager" />
+ <osgi:reference id="deleteTableTaskFactoryService"
interface="org.cytoscape.task.TableTaskFactory" />
+ <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
+ <osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.session.CyApplicationManager" />
<!-- listeners -->
- <osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser">
- <osgi:interfaces>
-
<value>org.cytoscape.application.swing.CytoPanelComponent</value>
-
<value>org.cytoscape.model.events.TableAboutToBeDeletedListener</value>
-
<value>org.cytoscape.session.events.SetCurrentNetworkListener</value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser" auto-export="interfaces"/>
<osgi:set id="tableColumnTaskFactorySet"
interface="org.cytoscape.task.TableColumnTaskFactory"
cardinality="0..N">
Modified:
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:40:11 UTC (rev 25858)
+++
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:40:25 UTC (rev 25859)
@@ -31,7 +31,6 @@
<constructor-arg ref="compilerServiceRef" />
<constructor-arg ref="openBrowserServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyTableRowUpdateServiceRef" />
<constructor-arg ref="deleteTableTaskFactoryService" />
<constructor-arg ref="guiTaskManagerServiceRef" />
<constructor-arg ref="popupMenuHelper" />
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
