Author: clopes
Date: 2012-11-15 13:31:36 -0800 (Thu, 15 Nov 2012)
New Revision: 30790
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
Log:
Fixed UnsupportedOperationException caused by trying to call
MinimalNetwork.getRow when creating the node or edge context menu (now passing
the real CyNetwork implementation)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2012-11-15 16:38:50 UTC (rev 30789)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2012-11-15 21:31:36 UTC (rev 30790)
@@ -1135,11 +1135,11 @@
NodeView nview = m_view.getPickedNodeView(e.getPoint());
if (nview != null &&
!InnerCanvas.this.isPopupMenuDisabled()) {
-
popup.createNodeViewMenu(m_view.m_drawPersp,nview,e.getX(),e.getY(),null);
+ popup.createNodeViewMenu(m_view.getModel(),
nview, e.getX(), e.getY(), null);
} else {
EdgeView edgeView =
m_view.getPickedEdgeView(e.getPoint());
if (edgeView != null &&
!InnerCanvas.this.isPopupMenuDisabled()) {
-
popup.createEdgeViewMenu(m_view.m_drawPersp,edgeView,e.getX(),e.getY(),null);
+
popup.createEdgeViewMenu(m_view.getModel(), edgeView, e.getX(), e.getY(), null);
} else {
// Clicked on empty space...
Point rawPt = e.getPoint();
@@ -1161,7 +1161,7 @@
//System.out.println("MousePressed ---->
doubleLeftClick");
NodeView nview = m_view.getPickedNodeView(e.getPoint());
if ( nview != null &&
!InnerCanvas.this.isPopupMenuDisabled())
-
popup.createNodeViewMenu(m_view.m_drawPersp,nview,e.getX(),e.getY(),"OPEN");
+ popup.createNodeViewMenu(m_view.getModel(),
nview,e.getX(), e.getY(), "OPEN");
else {
Point rawPt = e.getPoint();
double[] loc = new double[2];
--
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.
