Author: mes
Date: 2011-06-21 15:38:13 -0700 (Tue, 21 Jun 2011)
New Revision: 25852
Modified:
core3/filter-impl/trunk/pom.xml
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/plugin/QuickFindPlugIn.java
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/filter-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/filter-impl/trunk/pom.xml
===================================================================
--- core3/filter-impl/trunk/pom.xml 2011-06-21 22:37:57 UTC (rev 25851)
+++ core3/filter-impl/trunk/pom.xml 2011-06-21 22:38:13 UTC (rev 25852)
@@ -24,26 +24,12 @@
<dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>model-api</artifactId>
- <version>3.0.0-alpha3</version>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
@@ -59,13 +45,13 @@
<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>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha4</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -87,7 +73,7 @@
<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>
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-06-21 22:37:57 UTC (rev 25851)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-06-21 22:38:13 UTC (rev 25852)
@@ -76,7 +76,6 @@
import org.cytoscape.filter.internal.filters.TopologyFilter;
import org.cytoscape.filter.internal.filters.util.FilterUtil;
import org.cytoscape.filter.internal.filters.util.SelectUtil;
-import org.cytoscape.filter.internal.filters.util.VisualPropertyUtil;
import org.cytoscape.filter.internal.filters.util.WidestStringComboBoxModel;
import
org.cytoscape.filter.internal.filters.util.WidestStringComboBoxPopupMenuListener;
import org.cytoscape.filter.internal.filters.util.WidestStringProvider;
@@ -84,20 +83,17 @@
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyRow;
-import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.CyTableRowUpdateService;
import org.cytoscape.model.CyTableUtil;
-import org.cytoscape.model.events.CyTableRowUpdateMicroListener;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.model.events.NetworkAddedEvent;
import org.cytoscape.model.events.NetworkAddedListener;
-import org.cytoscape.model.events.RowsFinishedChangingEvent;
-import org.cytoscape.model.events.RowsFinishedChangingListener;
+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;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SessionLoadedEvent;
@@ -106,17 +102,19 @@
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.util.swing.DropDownMenuButton;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.RenderingEngine;
-import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
public class FilterMainPanel extends JPanel implements ActionListener,
ItemListener, SetCurrentNetworkViewListener,
NetworkAddedListener,
- NetworkAboutToBeDestroyedListener, SessionLoadedListener,
- CyTableRowUpdateMicroListener, RowsFinishedChangingListener {
+ NetworkAboutToBeDestroyedListener, SessionLoadedListener,
RowsSetListener,
+ RowsCreatedListener {
- // String constants used for seperator entries in the attribute combobox
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6554492076361739485L;
+ // String constants used for separator entries in the attribute combobox
private static final String filtersSeperator = "-- Filters --";
private static final String attributesSeperator = "-- Attributes --";
@@ -149,23 +147,20 @@
private final CyApplicationManager applicationManager;
private final FilterPlugin filterPlugin;
- private final CyTableRowUpdateService rowUpdateService;
private final CyNetworkManager networkManager;
private final CyServiceRegistrar serviceRegistrar;
public FilterMainPanel(CyApplicationManager applicationManager,
FilterPlugin filterPlugin,
- CyTableRowUpdateService rowUpdateService,
CyNetworkManager networkManager,
+ CyNetworkManager networkManager,
final CyServiceRegistrar serviceRegistrar) {
this.applicationManager = applicationManager;
this.filterPlugin = filterPlugin;
- this.rowUpdateService = rowUpdateService;
this.networkManager = networkManager;
this.serviceRegistrar = serviceRegistrar;
final Dictionary emptyProps = new Hashtable();
- serviceRegistrar.registerService(this,
RowsFinishedChangingListener.class, emptyProps);
//Initialize the option menu with menuItems
setupOptionMenu();
@@ -209,23 +204,14 @@
}
@Override
- public void handleEvent(RowsFinishedChangingEvent e){
+ public void handleEvent(RowsSetEvent e) {
// Handle selection events
if (this.applicationManager.getCurrentNetworkView() == null){
return;
}
- updateFeedbackTableModel();
- }
-
- @Override
- public void handleRowCreations(CyTable table, List<CyRow> newRows) {
- handleAttributesChanged();
- }
-
- @Override
- public void handleRowSets(CyTable table, List<RowSet> rowSets) {
+
boolean isSelection = true;
- for (RowSet change : rowSets) {
+ for (RowSetRecord change : e.getPayloadCollection()) {
if (!change.getColumn().equals(CyNetwork.SELECTED)) {
isSelection = false;
break;
@@ -234,6 +220,13 @@
if (isSelection) {
return;
}
+ handleAttributesChanged();
+
+ updateFeedbackTableModel();
+ }
+
+ @Override
+ public void handleEvent(RowsCreatedEvent e) {
handleAttributesChanged();
}
@@ -292,10 +285,7 @@
enableForNetwork();
updateFeedbackTableModel();
-
- rowUpdateService.stopTracking(this,
network.getDefaultNetworkTable());
- rowUpdateService.stopTracking(this,
network.getDefaultNodeTable());
- rowUpdateService.stopTracking(this,
network.getDefaultEdgeTable());
+
}
@Override
@@ -307,10 +297,6 @@
enableForNetwork();
updateFeedbackTableModel();
-
- rowUpdateService.startTracking(this,
network.getDefaultNetworkTable());
- rowUpdateService.startTracking(this,
network.getDefaultNodeTable());
- rowUpdateService.startTracking(this,
network.getDefaultEdgeTable());
}
public void updateFeedbackTableModel(){
@@ -1299,6 +1285,11 @@
}
class AttributeFilterRenderer extends JLabel implements
ListCellRenderer {
+ /**
+ *
+ */
+ private static final long serialVersionUID =
-9137647911856857211L;
+
public AttributeFilterRenderer() {
setOpaque(true);
}
@@ -1330,6 +1321,11 @@
}// AttributeRenderer
class FilterRenderer extends JLabel implements ListCellRenderer {
+ /**
+ *
+ */
+ private static final long serialVersionUID =
-2396393425644165756L;
+
public FilterRenderer() {
setOpaque(true);
}
@@ -1357,7 +1353,12 @@
}// FilterRenderer
class FilterSelectWidestStringComboBoxModel extends
WidestStringComboBoxModel {
- public FilterSelectWidestStringComboBoxModel() {
+ /**
+ *
+ */
+ private static final long serialVersionUID =
-1311538859326314189L;
+
+ public FilterSelectWidestStringComboBoxModel() {
super();
}
@@ -1376,7 +1377,12 @@
}
class AttributeSelectWidestStringComboBoxModel extends
WidestStringComboBoxModel {
- public AttributeSelectWidestStringComboBoxModel() {
+ /**
+ *
+ */
+ private static final long serialVersionUID =
-7287008568486671513L;
+
+ public AttributeSelectWidestStringComboBoxModel() {
super();
}
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/plugin/QuickFindPlugIn.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/plugin/QuickFindPlugIn.java
2011-06-21 22:37:57 UTC (rev 25851)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/plugin/QuickFindPlugIn.java
2011-06-21 22:38:13 UTC (rev 25852)
@@ -64,18 +64,18 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedEdgeEvent;
-import org.cytoscape.model.events.AddedEdgeListener;
-import org.cytoscape.model.events.AddedNodeEvent;
-import org.cytoscape.model.events.AddedNodeListener;
+import org.cytoscape.model.events.AddedEdgesEvent;
+import org.cytoscape.model.events.AddedEdgesListener;
+import org.cytoscape.model.events.AddedNodesEvent;
+import org.cytoscape.model.events.AddedNodesListener;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.model.events.NetworkAddedEvent;
import org.cytoscape.model.events.NetworkAddedListener;
-import org.cytoscape.model.events.RemovedEdgeEvent;
-import org.cytoscape.model.events.RemovedEdgeListener;
-import org.cytoscape.model.events.RemovedNodeEvent;
-import org.cytoscape.model.events.RemovedNodeListener;
+import org.cytoscape.model.events.RemovedEdgesEvent;
+import org.cytoscape.model.events.RemovedEdgesListener;
+import org.cytoscape.model.events.RemovedNodesEvent;
+import org.cytoscape.model.events.RemovedNodesListener;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
@@ -97,9 +97,9 @@
*
* @author Ethan Cerami.
*/
-public class QuickFindPlugIn implements QuickFindListener, AddedEdgeListener,
-
AddedNodeListener, RemovedEdgeListener,
-
RemovedNodeListener, NetworkAddedListener,
+public class QuickFindPlugIn implements QuickFindListener, AddedEdgesListener,
+
AddedNodesListener, RemovedEdgesListener,
+
RemovedNodesListener, NetworkAddedListener,
NetworkAboutToBeDestroyedListener,
NetworkViewAddedListener,
NetworkViewAboutToBeDestroyedListener,
@@ -475,22 +475,22 @@
}
@Override
- public void handleEvent(RemovedNodeEvent e) {
+ public void handleEvent(RemovedNodesEvent e) {
handleNetworkModified(e.getSource());
}
@Override
- public void handleEvent(RemovedEdgeEvent e) {
+ public void handleEvent(RemovedEdgesEvent e) {
handleNetworkModified(e.getSource());
}
@Override
- public void handleEvent(AddedNodeEvent e) {
+ public void handleEvent(AddedNodesEvent e) {
handleNetworkModified(e.getSource());
}
@Override
- public void handleEvent(AddedEdgeEvent e) {
+ public void handleEvent(AddedEdgesEvent e) {
handleNetworkModified(e.getSource());
}
Modified:
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:37:57 UTC (rev 25851)
+++
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:38:13 UTC (rev 25852)
@@ -17,22 +17,12 @@
<osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
- <osgi:reference id="cyTableRowUpdateServiceRef"
- interface="org.cytoscape.model.CyTableRowUpdateService"
/>
-
<osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
<osgi:service id="filterCytoPanelComponentService"
ref="filterCytoPanelComponent"
interface="org.cytoscape.application.swing.CytoPanelComponent"/>
- <osgi:service id="filterPanelService" ref="filterMainPanel">
- <osgi:interfaces>
-
<value>org.cytoscape.session.events.SetCurrentNetworkViewListener</value>
-
<value>org.cytoscape.session.events.SessionLoadedListener</value>
-
<value>org.cytoscape.model.events.NetworkAddedListener</value>
-
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:service id="filterPanelService" ref="filterMainPanel"
auto-export="interfaces"/>
<osgi:service id="filterPanelSelectedListenerService"
ref="filterPanelSelectedListener"
interface="org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener"/>
@@ -40,17 +30,6 @@
<osgi:service id="filterActionService" ref="filterAction"
interface="org.cytoscape.application.swing.CyAction" />
- <osgi:service id="quickFindPluginService" ref="quickFindPlugin">
- <osgi:interfaces>
-
<value>org.cytoscape.session.events.SetCurrentNetworkViewListener</value>
-
<value>org.cytoscape.model.events.AddedEdgeListener</value>
-
<value>org.cytoscape.model.events.AddedNodeListener</value>
-
<value>org.cytoscape.model.events.RemovedEdgeListener</value>
-
<value>org.cytoscape.model.events.RemovedNodeListener</value>
-
<value>org.cytoscape.model.events.NetworkAddedListener</value>
-
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
-
<value>org.cytoscape.view.model.events.NetworkViewAddedListener</value>
-
<value>org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener</value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:service id="quickFindPluginService" ref="quickFindPlugin"
auto-export="interfaces"/>
+
</beans>
Modified:
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:37:57 UTC (rev 25851)
+++
core3/filter-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:38:13 UTC (rev 25852)
@@ -25,7 +25,6 @@
class="org.cytoscape.filter.internal.filters.view.FilterMainPanel">
<constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="filterPlugin" />
- <constructor-arg ref="cyTableRowUpdateServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cyServiceRegistrarServiceRef" />
</bean>
--
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.
