Author: mes
Date: 2012-04-17 13:09:17 -0700 (Tue, 17 Apr 2012)
New Revision: 28855
Removed:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableEdgeViewTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableNodeViewTaskFactory.java
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
Log:
fixes #881 removed unused TunableNodeView and TunableEdgeView task factories
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableEdgeViewTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableEdgeViewTaskFactory.java
2012-04-17 19:43:25 UTC (rev 28854)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableEdgeViewTaskFactory.java
2012-04-17 20:09:17 UTC (rev 28855)
@@ -1,9 +0,0 @@
-package org.cytoscape.task;
-
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.View;
-
-public interface TunableEdgeViewTaskFactory<T> extends EdgeViewTaskFactory {
- T createTunableContext(View<CyEdge> edgeView, CyNetworkView
networkView);
-}
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableNodeViewTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableNodeViewTaskFactory.java
2012-04-17 19:43:25 UTC (rev 28854)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/TunableNodeViewTaskFactory.java
2012-04-17 20:09:17 UTC (rev 28855)
@@ -1,9 +0,0 @@
-package org.cytoscape.task;
-
-import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.View;
-
-public interface TunableNodeViewTaskFactory<T> extends NodeViewTaskFactory {
- T createTunableContext(View<CyNode> nodeView, CyNetworkView
networkView);
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-04-17 19:43:25 UTC (rev 28854)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-04-17 20:09:17 UTC (rev 28855)
@@ -52,7 +52,6 @@
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
-import org.cytoscape.task.TunableEdgeViewTaskFactory;
import org.cytoscape.util.swing.GravityTracker;
import org.cytoscape.util.swing.JMenuTracker;
import org.cytoscape.view.model.CyNetworkView;
@@ -104,9 +103,6 @@
for ( EdgeViewTaskFactory evtf : usableTFs ) {
Object context = null;
- if (evtf instanceof
TunableEdgeViewTaskFactory<?>) {
- context =
((TunableEdgeViewTaskFactory) evtf).createTunableContext(ev, m_view);
- }
TaskFactory provisioner =
factoryProvisioner.createFor(evtf, ev, m_view);
createMenuItem(ev, menu, provisioner,
context, tracker, m_view.edgeViewTFs.get(evtf) );
}
@@ -139,9 +135,6 @@
for ( NodeViewTaskFactory nvtf : usableTFs ) {
Object context = null;
- if (nvtf instanceof
TunableEdgeViewTaskFactory<?>) {
- context =
((TunableEdgeViewTaskFactory) nvtf).createTunableContext(nv, m_view);
- }
TaskFactory provisioner =
factoryProvisioner.createFor(nvtf, nv, m_view);
createMenuItem(nv, menu, provisioner,
context, tracker, m_view.nodeViewTFs.get( nvtf ));
}
--
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.
