Author: mes
Date: 2011-06-21 15:38:41 -0700 (Tue, 21 Jun 2011)
New Revision: 25853
Modified:
core3/biopax-impl/trunk/pom.xml
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/DisplayBioPaxDetails.java
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/NetworkListenerImpl.java
Log:
updated to for event-api changes that rely on payload events instead of
microlisteners
Modified: core3/biopax-impl/trunk/pom.xml
===================================================================
--- core3/biopax-impl/trunk/pom.xml 2011-06-21 22:38:13 UTC (rev 25852)
+++ core3/biopax-impl/trunk/pom.xml 2011-06-21 22:38:41 UTC (rev 25853)
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha4</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/DisplayBioPaxDetails.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/DisplayBioPaxDetails.java
2011-06-21 22:38:13 UTC (rev 25852)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/DisplayBioPaxDetails.java
2011-06-21 22:38:41 UTC (rev 25853)
@@ -31,16 +31,14 @@
**/
package org.cytoscape.biopax.internal.action;
-import java.util.List;
import org.cytoscape.biopax.BioPaxContainer;
import org.cytoscape.biopax.MapBioPaxToCytoscape;
import org.cytoscape.biopax.internal.view.BioPaxDetailsPanel;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyRow;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.events.CyTableRowUpdateMicroListener;
+import org.cytoscape.model.events.RowsSetEvent;
+import org.cytoscape.model.events.RowsSetListener;
import org.cytoscape.view.model.CyNetworkView;
@@ -54,7 +52,7 @@
*
* @author Ethan Cerami
*/
-public class DisplayBioPaxDetails implements CyTableRowUpdateMicroListener {
+public class DisplayBioPaxDetails implements RowsSetListener {
private BioPaxDetailsPanel bpPanel;
private BioPaxContainer bpContainer;
private CyNetworkView view;
@@ -72,13 +70,10 @@
this.view = view;
this.mapBioPaxToCytoscape = mapBioPaxToCytoscape;
}
-
+
@Override
- public void handleRowCreations(CyTable table, List<CyRow> newRows) {
- }
+ public void handleEvent(RowsSetEvent e) {
- @Override
- public void handleRowSets(CyTable table, List<RowSet> rowSets) {
try {
CyNode selected = null;
CyNetwork network = view.getModel();
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/NetworkListenerImpl.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/NetworkListenerImpl.java
2011-06-21 22:38:13 UTC (rev 25852)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/action/NetworkListenerImpl.java
2011-06-21 22:38:41 UTC (rev 25853)
@@ -42,8 +42,8 @@
import org.cytoscape.biopax.util.BioPaxUtil;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableRowUpdateService;
-import org.cytoscape.model.events.CyTableRowUpdateMicroListener;
+import org.cytoscape.model.events.RowsSetEvent;
+import org.cytoscape.model.events.RowsSetListener;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
@@ -61,30 +61,25 @@
* @author Ethan Cerami / Benjamin Gross / Igor Rodchenkov.
*/
public class NetworkListenerImpl implements NetworkListener,
NetworkViewAddedListener,
- NetworkViewAboutToBeDestroyedListener, SetCurrentNetworkViewListener {
+ NetworkViewAboutToBeDestroyedListener, SetCurrentNetworkViewListener,
RowsSetListener {
private final BioPaxDetailsPanel bpPanel;
private final BioPaxContainer bpContainer;
private final MapBioPaxToCytoscape mapBioPaxToCytoscape;
private final CyNetworkViewManager viewManager;
- private final CyTableRowUpdateService rowUpdateService;
-
- private Map<CyNetworkView, CyTableRowUpdateMicroListener>
rowUpdateListeners;
/**
* Constructor.
*
* @param bpPanel BioPaxDetails Panel Object.
*/
- public NetworkListenerImpl(BioPaxDetailsPanel bpPanel, BioPaxContainer
bpContainer, MapBioPaxToCytoscapeFactory mapBioPaxToCytoscapeFactory,
CyNetworkViewManager viewManager, CyTableRowUpdateService rowUpdateService) {
+ public NetworkListenerImpl(BioPaxDetailsPanel bpPanel, BioPaxContainer
bpContainer, MapBioPaxToCytoscapeFactory mapBioPaxToCytoscapeFactory,
CyNetworkViewManager viewManager) {
this.bpPanel = bpPanel;
this.bpContainer = bpContainer;
this.mapBioPaxToCytoscape =
mapBioPaxToCytoscapeFactory.getInstance(null, null);
this.viewManager = viewManager;
- this.rowUpdateService = rowUpdateService;
- rowUpdateListeners = new HashMap<CyNetworkView,
CyTableRowUpdateMicroListener>();
}
/**
@@ -106,8 +101,6 @@
CyNetwork cyNetwork = view.getModel();
CyTable table = cyNetwork.getDefaultNodeTable();
DisplayBioPaxDetails rowUpdateListener = new
DisplayBioPaxDetails(view, bpPanel, bpContainer, mapBioPaxToCytoscape);
- rowUpdateListeners.put(view, rowUpdateListener);
- rowUpdateService.startTracking(rowUpdateListener, table);
bpPanel.resetText();
}
@@ -227,10 +220,6 @@
BioPaxUtil.removeNetworkModel(network.getSUID());
CyTable table = network.getDefaultNodeTable();
- CyTableRowUpdateMicroListener listener =
rowUpdateListeners.get(view);
- if (listener != null) {
- rowUpdateService.stopTracking(listener, table);
- }
if (!networkViewsRemain()) {
onZeroNetworkViewsRemain();
@@ -263,4 +252,10 @@
+ " a BioPAX file to proceed.");
}
+ @Override
+ public void handleEvent(RowsSetEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
}
--
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.
