Author: kono
Date: 2010-08-09 17:19:18 -0700 (Mon, 09 Aug 2010)
New Revision: 21273
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddDeleteHandler.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
Log:
Method name changed from getSource() to getModel() for consistency.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddDeleteHandler.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddDeleteHandler.java
2010-08-10 00:19:01 UTC (rev 21272)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AddDeleteHandler.java
2010-08-10 00:19:18 UTC (rev 21273)
@@ -92,7 +92,7 @@
return;
final View<CyEdge> ev = e.getEdgeView();
- view.addEdgeView(ev.getSource());
+ view.addEdgeView(ev.getModel());
view.updateView();
}
@@ -101,7 +101,7 @@
return;
final View<CyNode> nv = e.getNodeView();
- view.addNodeView(nv.getSource());
+ view.addNodeView(nv.getModel());
view.updateView();
}
/*
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-08-10 00:19:01 UTC (rev 21272)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-08-10 00:19:18 UTC (rev 21273)
@@ -358,7 +358,7 @@
Map<EdgeViewTaskFactory, Map> edgeViewTFs,
Map<NetworkViewTaskFactory, Map> emptySpaceTFs,
TunableInterceptor interceptor, TaskManager manager) {
- m_perspective = view.getSource();
+ m_perspective = view.getModel();
cyNetworkView = view;
rootLexicon = vpc;
this.dingLexicon = dingLexicon;
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2010-08-10 00:19:01 UTC (rev 21272)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2010-08-10 00:19:18 UTC (rev 21273)
@@ -93,7 +93,7 @@
// build a menu of actions if more than factory exists
if ( usableTFs.size() > 1) {
- String edgeLabel =
ev.getSource().attrs().get("interaction",String.class);
+ String edgeLabel =
ev.getModel().attrs().get("interaction",String.class);
JPopupMenu menu = new JPopupMenu(edgeLabel);
JMenuTracker tracker = new JMenuTracker(menu);
@@ -123,7 +123,7 @@
// build a menu of actions if more than factory exists
if ( usableTFs.size() > 1) {
- String nodeLabel =
nv.getSource().attrs().get("name",String.class);
+ String nodeLabel =
nv.getModel().attrs().get("name",String.class);
JPopupMenu menu = new JPopupMenu(nodeLabel);
JMenuTracker tracker = new JMenuTracker(menu);
--
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.
