Author: jm
Date: 2012-04-26 16:25:14 -0700 (Thu, 26 Apr 2012)
New Revision: 29023
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
Log:
Fixes #896: Added service property for NetworkPanel's context menu
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
===================================================================
---
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
2012-04-26 23:24:00 UTC (rev 29022)
+++
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
2012-04-26 23:25:14 UTC (rev 29023)
@@ -79,4 +79,10 @@
* Specify relative location of the action in the tool bar
*/
public static final String TOOL_BAR_GRAVITY = "toolBarGravity";
+
+ /**
+ * Action will be added to network panel's context menu if this
+ * flag is set to true
+ */
+ public static final String IN_NETWORK_PANEL_CONTEXT_MENU =
"inNetworkPanelContextMenu";
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-26 23:24:00 UTC (rev 29022)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-26 23:25:14 UTC (rev 29023)
@@ -663,6 +663,7 @@
destroyNetworkTaskFactoryProps.setProperty(ACCELERATOR,"cmd
shift w");
destroyNetworkTaskFactoryProps.setProperty(ENABLE_FOR,"network");
destroyNetworkTaskFactoryProps.setProperty(TITLE,"Destroy
Network");
+
destroyNetworkTaskFactoryProps.setProperty(IN_NETWORK_PANEL_CONTEXT_MENU,"true");
destroyNetworkTaskFactoryProps.setProperty(MENU_GRAVITY,"3.2");
destroyNetworkTaskFactoryProps.setProperty(COMMAND,"destroy-network");
destroyNetworkTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network");
@@ -675,6 +676,7 @@
destroyNetworkViewTaskFactoryProps.setProperty(ACCELERATOR,"cmd
w");
destroyNetworkViewTaskFactoryProps.setProperty(ENABLE_FOR,"networkAndView");
destroyNetworkViewTaskFactoryProps.setProperty(TITLE,"Destroy
View");
+
destroyNetworkViewTaskFactoryProps.setProperty(IN_NETWORK_PANEL_CONTEXT_MENU,"true");
destroyNetworkViewTaskFactoryProps.setProperty(MENU_GRAVITY,"3.1");
destroyNetworkViewTaskFactoryProps.setProperty(COMMAND,"destroy-view");
destroyNetworkViewTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network-view");
@@ -734,6 +736,7 @@
editNetworkTitleTaskFactoryProps.setProperty(PREFERRED_MENU,"Edit");
editNetworkTitleTaskFactoryProps.setProperty(MENU_GRAVITY,"5.5");
editNetworkTitleTaskFactoryProps.setProperty(TITLE,"Rename
Network...");
+
editNetworkTitleTaskFactoryProps.setProperty(IN_NETWORK_PANEL_CONTEXT_MENU,"true");
editNetworkTitleTaskFactoryProps.setProperty(COMMAND,"rename");
editNetworkTitleTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network");
registerService(bc,editNetworkTitleTaskFactory,NetworkTaskFactory.class,
editNetworkTitleTaskFactoryProps);
@@ -746,6 +749,7 @@
createNetworkViewTaskFactoryProps.setProperty(PREFERRED_MENU,"Edit");
createNetworkViewTaskFactoryProps.setProperty(MENU_GRAVITY,"3.0");
createNetworkViewTaskFactoryProps.setProperty(TITLE,"Create
View");
+
createNetworkViewTaskFactoryProps.setProperty(IN_NETWORK_PANEL_CONTEXT_MENU,"true");
createNetworkViewTaskFactoryProps.setProperty(COMMAND,"create-view");
createNetworkViewTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network");
registerService(bc,createNetworkViewTaskFactory,NetworkTaskFactory.class,
createNetworkViewTaskFactoryProps);
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-04-26 23:24:00 UTC (rev 29022)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-04-26 23:25:14 UTC (rev 29023)
@@ -132,6 +132,8 @@
*
*/
public class CyActivator extends AbstractCyActivator {
+ private static final String CONTEXT_MENU_FILTER = "(" +
ServiceProperties.IN_NETWORK_PANEL_CONTEXT_MENU + "=true)";
+
/**
* Creates a new CyActivator object.
*/
@@ -390,15 +392,15 @@
registerServiceListener(bc, networkViewManager,
"addPresentationFactory",
"removePresentationFactory",
RenderingEngineFactory.class);
registerServiceListener(bc, networkPanel,
"addNetworkViewTaskFactory",
- "removeNetworkViewTaskFactory",
NetworkViewTaskFactory.class, "(scope=limited)");
+ "removeNetworkViewTaskFactory",
NetworkViewTaskFactory.class, CONTEXT_MENU_FILTER);
registerServiceListener(bc, networkPanel,
"addNetworkTaskFactory",
- "removeNetworkTaskFactory",
NetworkTaskFactory.class, "(scope=limited)");
+ "removeNetworkTaskFactory",
NetworkTaskFactory.class, CONTEXT_MENU_FILTER);
registerServiceListener(bc, networkPanel,
"addNetworkViewCollectionTaskFactory",
"removeNetworkViewCollectionTaskFactory",
- NetworkViewCollectionTaskFactory.class,
"(scope=limited)");
+ NetworkViewCollectionTaskFactory.class,
CONTEXT_MENU_FILTER);
registerServiceListener(bc, networkPanel,
"addNetworkCollectionTaskFactory",
"removeNetworkCollectionTaskFactory",
- NetworkCollectionTaskFactory.class,
"(scope=limited)");
+ NetworkCollectionTaskFactory.class,
CONTEXT_MENU_FILTER);
registerServiceListener(bc, configDirPropertyWriter,
"addCyProperty", "removeCyProperty",
CyProperty.class);
registerServiceListener(bc, layoutMenuPopulator, "addLayout",
"removeLayout",
--
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.
