Author: rozagh
Date: 2012-03-27 16:11:07 -0700 (Tue, 27 Mar 2012)
New Revision: 28678
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
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/PopupMenuHelper.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
Log:
Bug fixed for the over-written menu item in the createEmptySpaceMenu method in
PopupMenuHelper. The preferredAction for AddNode, and all of the addAnnotation
TF's set to "NEW".
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-03-27 22:03:08 UTC (rev 28677)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-03-27 23:11:07 UTC (rev 28678)
@@ -147,17 +147,17 @@
registerService(bc,dingNetworkViewFactory,CyNetworkViewFactory.class,
dingNetworkViewFactoryServiceProps);
Properties addImageTaskFactoryProps = new Properties();
- addImageTaskFactoryProps.setProperty("preferredAction","Image");
+ addImageTaskFactoryProps.setProperty("preferredAction","NEW");
addImageTaskFactoryProps.setProperty("title","Add Image");
registerService(bc,addImageTaskFactory,NetworkViewLocationTaskFactory.class,addImageTaskFactoryProps);
Properties addShapeTaskFactoryProps = new Properties();
- addShapeTaskFactoryProps.setProperty("preferredAction","Shape");
+ addShapeTaskFactoryProps.setProperty("preferredAction","NEW");
addShapeTaskFactoryProps.setProperty("title","Add Shape");
registerService(bc,addShapeTaskFactory,NetworkViewLocationTaskFactory.class,addShapeTaskFactoryProps);
Properties addTextTaskFactoryProps = new Properties();
- addTextTaskFactoryProps.setProperty("preferredAction","Text");
+ addTextTaskFactoryProps.setProperty("preferredAction","NEW");
addTextTaskFactoryProps.setProperty("title","Add Text");
registerService(bc,addTextTaskFactory,NetworkViewLocationTaskFactory.class,addTextTaskFactoryProps);
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-03-27 22:03:08 UTC (rev 28677)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2012-03-27 23:11:07 UTC (rev 28678)
@@ -1103,7 +1103,6 @@
popup.createEdgeViewMenu(m_view.m_drawPersp,edgeView,e.getX(),e.getY(),null);
} else {
// Clicked on empty space...
- popup.createEmptySpaceMenu(e.getX(),
e.getY(),"NEW");
Point rawPt = e.getPoint();
double[] loc = new double[2];
loc[0] = rawPt.getX();
@@ -1111,7 +1110,7 @@
m_view.xformComponentToNodeCoords(loc);
Point xformPt = new Point();
xformPt.setLocation(loc[0],loc[1]);
-
popup.createNetworkViewLocationMenu(rawPt, xformPt, null);
+ popup.createEmptySpaceMenu(rawPt,
xformPt, "NEW");
}
}
}
@@ -1123,7 +1122,14 @@
if ( nview != null )
popup.createNodeViewMenu(m_view.m_drawPersp,nview,e.getX(),e.getY(),"OPEN");
else {
- popup.createEmptySpaceMenu(e.getX(),
e.getY(),"OPEN");
+ Point rawPt = e.getPoint();
+ double[] loc = new double[2];
+ loc[0] = rawPt.getX();
+ loc[1] = rawPt.getY();
+ m_view.xformComponentToNodeCoords(loc);
+ Point xformPt = new Point();
+ xformPt.setLocation(loc[0],loc[1]);
+ popup.createEmptySpaceMenu(rawPt, xformPt,
"OPEN");
}
}
}
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-03-27 22:03:08 UTC (rev 28677)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-03-27 23:11:07 UTC (rev 28678)
@@ -154,37 +154,25 @@
/**
* Creates a menu based on the NetworkView.
*/
- void createEmptySpaceMenu(int x, int y, String action) {
- // build a menu of actions if more than factory exists
+ void createEmptySpaceMenu(Point rawPt, Point xformPt, String action) {
+
+ final JPopupMenu menu = new JPopupMenu("Double Click Menu:
empty");
+ final JMenuTracker tracker = new JMenuTracker(menu);
+
Collection<NetworkViewTaskFactory> usableTFs =
getPreferredActions(m_view.emptySpaceTFs,action);
- if ( usableTFs.size() > 1 || (usableTFs.size() == 1 &&
action.equals("NEW"))) {
- final JPopupMenu menu = new JPopupMenu("Double Click
Menu: empty");
- final JMenuTracker tracker = new JMenuTracker(menu);
- for ( NetworkViewTaskFactory nvtf : usableTFs ) {
- TaskFactory provisioner =
factoryProvisioner.createFor(nvtf, m_view);
- createMenuItem(null, menu, provisioner, null,
tracker, m_view.emptySpaceTFs.get( nvtf ) );
- }
- menu.show(invoker, x, y);
- // execute the task directly if only one factory exists
- } else if ( usableTFs.size() == 1) {
- NetworkViewTaskFactory tf = usableTFs.iterator().next();
- m_view.manager.execute(tf.createTaskIterator(m_view));
+ for ( NetworkViewTaskFactory nvtf : usableTFs ) {
+ TaskFactory provisioner =
factoryProvisioner.createFor(nvtf, m_view);
+ createMenuItem(null, menu, provisioner, null, tracker,
m_view.emptySpaceTFs.get( nvtf ) );
}
+
+ Collection<NetworkViewLocationTaskFactory> usableTFs2 =
getPreferredActions(m_view.networkViewLocationTfs,action);
+ for ( NetworkViewLocationTaskFactory nvltf : usableTFs2 ) {
+ TaskFactory provisioner =
factoryProvisioner.createFor(nvltf, m_view, rawPt, xformPt);
+ createMenuItem(null, menu, provisioner, null, tracker,
m_view.networkViewLocationTfs.get( nvltf ) );
+ }
+
+ menu.show(invoker,(int)(rawPt.getX()), (int)(rawPt.getY()));
}
-
- /**
- * Creates a menu based on the NetworkView.
- */
- void createNetworkViewLocationMenu(Point rawPt, Point xformPt, String
action) {
- Collection<NetworkViewLocationTaskFactory> usableTFs =
getPreferredActions(m_view.networkViewLocationTfs,action);
- final JPopupMenu menu = new JPopupMenu("Double Click
Menu: empty");
- final JMenuTracker tracker = new JMenuTracker(menu);
- for ( NetworkViewLocationTaskFactory nvltf : usableTFs
) {
- TaskFactory provisioner =
factoryProvisioner.createFor(nvltf, m_view, rawPt, xformPt);
- createMenuItem(null, menu, provisioner, null,
tracker, m_view.networkViewLocationTfs.get( nvltf ) );
- }
- menu.show(invoker,(int)(rawPt.getX()),
(int)(rawPt.getY()));
- }
/**
* This method creates popup menu submenus and menu items based on the
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-03-27 22:03:08 UTC (rev 28677)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-03-27 23:11:07 UTC (rev 28678)
@@ -60,15 +60,15 @@
sifInterpreterTaskFactoryProps.setProperty("title","SIF
Interpreter");
registerService(bc,sifInterpreterTaskFactory,NetworkViewTaskFactory.class,
sifInterpreterTaskFactoryProps);
- Properties dropNetworkViewTaskFactoryProps = new Properties();
-
dropNetworkViewTaskFactoryProps.setProperty("preferredAction","Node");
- dropNetworkViewTaskFactoryProps.setProperty("title","Add Node");
-
registerService(bc,networkViewLocationTaskFactory,NetworkViewLocationTaskFactory.class,
dropNetworkViewTaskFactoryProps);
+ Properties networkViewLocationTaskFactoryProps = new
Properties();
+
networkViewLocationTaskFactoryProps.setProperty("preferredAction","NEW");
+ networkViewLocationTaskFactoryProps.setProperty("title","Add
Node");
+
registerService(bc,networkViewLocationTaskFactory,NetworkViewLocationTaskFactory.class,
networkViewLocationTaskFactoryProps);
- Properties dropNodeViewTaskFactoryProps = new Properties();
-
dropNodeViewTaskFactoryProps.setProperty("preferredAction","Network");
- dropNodeViewTaskFactoryProps.setProperty("title","Add Nested
Network");
-
registerService(bc,addNestedNetworkTaskFactory,NodeViewTaskFactory.class,
dropNodeViewTaskFactoryProps);
+ Properties nodeViewTaskFactoryProps = new Properties();
+ nodeViewTaskFactoryProps.setProperty("preferredAction","NEW");
+ nodeViewTaskFactoryProps.setProperty("title","Add Nested
Network");
+
registerService(bc,addNestedNetworkTaskFactory,NodeViewTaskFactory.class,
nodeViewTaskFactoryProps);
}
}
--
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.
