Author: mes
Date: 2012-03-15 12:22:01 -0700 (Thu, 15 Mar 2012)
New Revision: 28553
Modified:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
Log:
changed syntax of commands to be simpler
Modified:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
===================================================================
---
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-03-15 18:36:38 UTC (rev 28552)
+++
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-03-15 19:22:01 UTC (rev 28553)
@@ -5,6 +5,8 @@
import java.util.Map;
import java.util.HashMap;
import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -24,6 +26,8 @@
private final Map<String, Map<String,Executor>> commandExecutorMap =
new
HashMap<String,Map<String,Executor>>();
+ private final String commandRegex ="^(\\S+)\\s+(\\S+)(\\s+.+)?$";
+ private final Pattern commandPattern = Pattern.compile(commandRegex);
private final CommandTunableInterceptorImpl interceptor;
private final CyApplicationManager appMgr;
@@ -113,32 +117,32 @@
double count = 1.0;
// begin iterating over the lines
- for ( String line : commandLines ) {
- boolean finished = false;
-
- tm.setStatusMessage("Executing command: '" + line +
"'");
- logger.info("Executing command: '" + line + "'");
- // match the namespace
- for ( String namespace : commandExecutorMap.keySet() ) {
- if ( finished ) return;
+ for ( String fullLine : commandLines ) {
+ String line = fullLine.trim();
- String commLine = peel( line, namespace + " " );
- if ( commLine != null ) {
- Map<String,Executor> commandMap =
commandExecutorMap.get(namespace);
- if ( commandMap != null ) {
+ // ignore comments
+ if ( line.startsWith("#"))
+ continue;
- // now match and execute the
command
- for ( String command :
commandMap.keySet() ) {
- String args = peel(
commLine, command );
- if ( args != null ) {
-
commandMap.get(command).execute(args);
- finished = true;
- break;
- }
- }
- }
- }
- }
+ Matcher m = commandPattern.matcher(line);
+ if ( !m.matches() )
+ throw new RuntimeException("command line (" +
line + ") does not match pattern: namespace command [args ...]");
+ String all = m.group(0);
+ String namespace = m.group(1);
+ String command = m.group(2);
+ String args = m.group(3);
+
+ Map<String,Executor> commandMap =
commandExecutorMap.get(namespace);
+
+ if ( commandMap == null )
+ throw new RuntimeException("Failed to find
command namespace: '" + namespace +"'");
+
+ Executor ex = commandMap.get(command);
+
+ if ( ex == null )
+ throw new RuntimeException("Failed to find
command: '" + command +"' (from namespace: " + namespace + ")");
+ ex.execute(args);
+
tm.setProgress(count/size);
count += 1.0;
}
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-03-15 18:36:38 UTC (rev 28552)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-03-15 19:22:01 UTC (rev 28553)
@@ -320,7 +320,7 @@
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("title","Delete
Selected Nodes and Edges...");
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("menuGravity","5.0");
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("accelerator","DELETE");
-
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("command","delete
selected nodes and edges");
+
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("command","delete-selected-nodes-and-edges");
deleteSelectedNodesAndEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,deleteSelectedNodesAndEdgesTaskFactory,TaskFactory.class,
deleteSelectedNodesAndEdgesTaskFactoryProps);
@@ -331,7 +331,7 @@
selectAllTaskFactoryProps.setProperty("enableFor","network");
selectAllTaskFactoryProps.setProperty("title","Select all nodes
and edges");
selectAllTaskFactoryProps.setProperty("menuGravity","5.0");
- selectAllTaskFactoryProps.setProperty("command","select all
nodes and edges");
+
selectAllTaskFactoryProps.setProperty("command","select-all-nodes-and-edges");
selectAllTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectAllTaskFactory,NetworkTaskFactory.class,
selectAllTaskFactoryProps);
@@ -341,7 +341,7 @@
selectAllEdgesTaskFactoryProps.setProperty("enableFor","network");
selectAllEdgesTaskFactoryProps.setProperty("title","Select all
edges");
selectAllEdgesTaskFactoryProps.setProperty("menuGravity","4.0");
- selectAllEdgesTaskFactoryProps.setProperty("command","select
all edges");
+
selectAllEdgesTaskFactoryProps.setProperty("command","select-all-edges");
selectAllEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectAllEdgesTaskFactory,NetworkTaskFactory.class,
selectAllEdgesTaskFactoryProps);
@@ -351,7 +351,7 @@
selectAllNodesTaskFactoryProps.setProperty("menuGravity","4.0");
selectAllNodesTaskFactoryProps.setProperty("accelerator","cmd
a");
selectAllNodesTaskFactoryProps.setProperty("title","Select all
nodes");
- selectAllNodesTaskFactoryProps.setProperty("command","select
all nodes");
+
selectAllNodesTaskFactoryProps.setProperty("command","select-all-nodes");
selectAllNodesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectAllNodesTaskFactory,NetworkTaskFactory.class,
selectAllNodesTaskFactoryProps);
@@ -361,7 +361,7 @@
selectAdjacentEdgesTaskFactoryProps.setProperty("menuGravity","6.0");
selectAdjacentEdgesTaskFactoryProps.setProperty("accelerator","alt e");
selectAdjacentEdgesTaskFactoryProps.setProperty("title","Select
adjacent edges");
-
selectAdjacentEdgesTaskFactoryProps.setProperty("command","select adjacent
edges");
+
selectAdjacentEdgesTaskFactoryProps.setProperty("command","select-adjacent-edges");
selectAdjacentEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectAdjacentEdgesTaskFactory,NetworkTaskFactory.class,
selectAdjacentEdgesTaskFactoryProps);
@@ -371,7 +371,7 @@
selectConnectedNodesTaskFactoryProps.setProperty("menuGravity","7.0");
selectConnectedNodesTaskFactoryProps.setProperty("accelerator","cmd 7");
selectConnectedNodesTaskFactoryProps.setProperty("title","Nodes
connected by selected edges");
-
selectConnectedNodesTaskFactoryProps.setProperty("command","select nodes
connected by selected edges");
+
selectConnectedNodesTaskFactoryProps.setProperty("command","select-nodes-connected-by-selected-edges");
selectConnectedNodesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectConnectedNodesTaskFactory,NetworkTaskFactory.class,
selectConnectedNodesTaskFactoryProps);
@@ -385,7 +385,7 @@
selectFirstNeighborsTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/select_firstneighbors.png").toString());
selectFirstNeighborsTaskFactoryProps.setProperty("inToolBar","true");
selectFirstNeighborsTaskFactoryProps.setProperty("tooltip","First Neighbors of
Selected Nodes (Undirected)");
-
selectFirstNeighborsTaskFactoryProps.setProperty("command","select first
neighbors of selected nodes undirected");
+
selectFirstNeighborsTaskFactoryProps.setProperty("command","select-first-neighbors-of-selected-nodes-undirected");
selectFirstNeighborsTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectFirstNeighborsTaskFactory,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryProps);
Properties selectFirstNeighborsTaskFactoryInEdgeProps = new
Properties();
@@ -394,7 +394,7 @@
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("menuGravity","6.1");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("title","Directed:
Incoming");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("tooltip","First
Neighbors of Selected Nodes (Directed: Incoming)");
-
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("command","select first
neighbors of selected nodes incoming");
+
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("command","select-first-neighbors-of-selected-nodes-incoming");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("commandNamespace","network");
registerService(bc,selectFirstNeighborsTaskFactoryInEdge,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryInEdgeProps);
Properties selectFirstNeighborsTaskFactoryOutEdgeProps = new
Properties();
@@ -403,7 +403,7 @@
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("menuGravity","6.2");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("title","Directed:
Outgoing");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("tooltip","First
Neighbors of Selected Nodes (Directed: Outgoing)");
-
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("command","select first
neighbors of selected nodes outgoing");
+
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("command","select-first-neighbors-of-selected-nodes-outgoing");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("commandNamespace","network");
registerService(bc,selectFirstNeighborsTaskFactoryOutEdge,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryOutEdgeProps);
@@ -414,7 +414,7 @@
deselectAllTaskFactoryProps.setProperty("menuGravity","5.1");
deselectAllTaskFactoryProps.setProperty("accelerator","cmd
shift alt a");
deselectAllTaskFactoryProps.setProperty("title","Deselect all
nodes and edges");
- deselectAllTaskFactoryProps.setProperty("command","deselect
all");
+
deselectAllTaskFactoryProps.setProperty("command","deselect-all");
deselectAllTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,deselectAllTaskFactory,NetworkTaskFactory.class,
deselectAllTaskFactoryProps);
@@ -424,7 +424,7 @@
deselectAllEdgesTaskFactoryProps.setProperty("menuGravity","5.0");
deselectAllEdgesTaskFactoryProps.setProperty("accelerator","alt
shift a");
deselectAllEdgesTaskFactoryProps.setProperty("title","Deselect
all edges");
-
deselectAllEdgesTaskFactoryProps.setProperty("command","deselect all edges");
+
deselectAllEdgesTaskFactoryProps.setProperty("command","deselect-all-edges");
deselectAllEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,deselectAllEdgesTaskFactory,NetworkTaskFactory.class,
deselectAllEdgesTaskFactoryProps);
@@ -434,7 +434,7 @@
deselectAllNodesTaskFactoryProps.setProperty("menuGravity","5.0");
deselectAllNodesTaskFactoryProps.setProperty("accelerator","cmd
shift a");
deselectAllNodesTaskFactoryProps.setProperty("title","Deselect
all nodes");
-
deselectAllNodesTaskFactoryProps.setProperty("command","deselect all nodes");
+
deselectAllNodesTaskFactoryProps.setProperty("command","deselect-all-nodes");
deselectAllNodesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,deselectAllNodesTaskFactory,NetworkTaskFactory.class,
deselectAllNodesTaskFactoryProps);
@@ -444,7 +444,7 @@
invertSelectedEdgesTaskFactoryProps.setProperty("menuGravity","1.0");
invertSelectedEdgesTaskFactoryProps.setProperty("accelerator","alt i");
invertSelectedEdgesTaskFactoryProps.setProperty("title","Invert
edge selection");
-
invertSelectedEdgesTaskFactoryProps.setProperty("command","invert selected
edges");
+
invertSelectedEdgesTaskFactoryProps.setProperty("command","invert-selected-edges");
invertSelectedEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,invertSelectedEdgesTaskFactory,NetworkTaskFactory.class,
invertSelectedEdgesTaskFactoryProps);
@@ -458,7 +458,7 @@
invertSelectedNodesTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/invert_selection.png").toString());
invertSelectedNodesTaskFactoryProps.setProperty("inToolBar","true");
invertSelectedNodesTaskFactoryProps.setProperty("tooltip","Invert Node
Selection");
-
invertSelectedNodesTaskFactoryProps.setProperty("command","invert selected
nodes");
+
invertSelectedNodesTaskFactoryProps.setProperty("command","invert-selected-nodes");
invertSelectedNodesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,invertSelectedNodesTaskFactory,NetworkTaskFactory.class,
invertSelectedNodesTaskFactoryProps);
@@ -468,7 +468,7 @@
selectFromFileListTaskFactoryProps.setProperty("menuGravity","8.0");
selectFromFileListTaskFactoryProps.setProperty("accelerator","cmd i");
selectFromFileListTaskFactoryProps.setProperty("title","From ID
List file...");
-
selectFromFileListTaskFactoryProps.setProperty("command","select nodes for id
list");
+
selectFromFileListTaskFactoryProps.setProperty("command","select-nodes-for-id-list");
selectFromFileListTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,selectFromFileListTaskFactory,NetworkTaskFactory.class,
selectFromFileListTaskFactoryProps);
@@ -485,7 +485,7 @@
hideSelectedTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/hide_selected.png").toString());
hideSelectedTaskFactoryProps.setProperty("inToolBar","true");
hideSelectedTaskFactoryProps.setProperty("tooltip","Hide
Selected Nodes and Edges");
- hideSelectedTaskFactoryProps.setProperty("command","hide
selected nodes and edges");
+
hideSelectedTaskFactoryProps.setProperty("command","hide-selected-nodes-and-edges");
hideSelectedTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,hideSelectedTaskFactory,NetworkViewTaskFactory.class,
hideSelectedTaskFactoryProps);
@@ -494,7 +494,7 @@
hideSelectedNodesTaskFactoryProps.setProperty("preferredMenu","Select.Nodes");
hideSelectedNodesTaskFactoryProps.setProperty("menuGravity","2.0");
hideSelectedNodesTaskFactoryProps.setProperty("title","Hide
selected nodes");
- hideSelectedNodesTaskFactoryProps.setProperty("command","hide
selected nodes");
+
hideSelectedNodesTaskFactoryProps.setProperty("command","hide-selected-nodes");
hideSelectedNodesTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,hideSelectedNodesTaskFactory,NetworkViewTaskFactory.class,
hideSelectedNodesTaskFactoryProps);
@@ -503,7 +503,7 @@
hideSelectedEdgesTaskFactoryProps.setProperty("preferredMenu","Select.Edges");
hideSelectedEdgesTaskFactoryProps.setProperty("menuGravity","2.0");
hideSelectedEdgesTaskFactoryProps.setProperty("title","Hide
selected edges");
- hideSelectedEdgesTaskFactoryProps.setProperty("command","hide
selected edges");
+
hideSelectedEdgesTaskFactoryProps.setProperty("command","hide-selected-edges");
hideSelectedEdgesTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,hideSelectedEdgesTaskFactory,NetworkViewTaskFactory.class,
hideSelectedEdgesTaskFactoryProps);
@@ -513,7 +513,7 @@
unHideAllTaskFactoryProps.setProperty("menuGravity","3.0");
unHideAllTaskFactoryProps.setProperty("toolBarGravity","9.6");
unHideAllTaskFactoryProps.setProperty("title","Show all nodes
and edges");
- unHideAllTaskFactoryProps.setProperty("command","show all nodes
and edges");
+
unHideAllTaskFactoryProps.setProperty("command","show-all-nodes-and-edges");
unHideAllTaskFactoryProps.setProperty("commandNamespace","network-view");
unHideAllTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/unhide_all.png").toString());
unHideAllTaskFactoryProps.setProperty("inToolBar","true");
@@ -525,7 +525,7 @@
unHideAllNodesTaskFactoryProps.setProperty("preferredMenu","Select.Nodes");
unHideAllNodesTaskFactoryProps.setProperty("menuGravity","3.0");
unHideAllNodesTaskFactoryProps.setProperty("title","Show all
nodes");
- unHideAllNodesTaskFactoryProps.setProperty("command","show all
nodes");
+
unHideAllNodesTaskFactoryProps.setProperty("command","show-all-nodes");
unHideAllNodesTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,unHideAllNodesTaskFactory,NetworkViewTaskFactory.class,
unHideAllNodesTaskFactoryProps);
@@ -534,7 +534,7 @@
unHideAllEdgesTaskFactoryProps.setProperty("preferredMenu","Select.Edges");
unHideAllEdgesTaskFactoryProps.setProperty("menuGravity","3.0");
unHideAllEdgesTaskFactoryProps.setProperty("title","Show all
edges");
- unHideAllEdgesTaskFactoryProps.setProperty("command","show all
edges");
+
unHideAllEdgesTaskFactoryProps.setProperty("command","show-all-edges");
unHideAllEdgesTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,unHideAllEdgesTaskFactory,NetworkViewTaskFactory.class,
unHideAllEdgesTaskFactoryProps);
@@ -542,7 +542,7 @@
newEmptyNetworkTaskFactoryProps.setProperty("preferredMenu","File.New.Network");
newEmptyNetworkTaskFactoryProps.setProperty("menuGravity","4.0");
newEmptyNetworkTaskFactoryProps.setProperty("title","Empty
Network");
- newEmptyNetworkTaskFactoryProps.setProperty("command","new
empty network");
+
newEmptyNetworkTaskFactoryProps.setProperty("command","new-empty-network");
newEmptyNetworkTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,newEmptyNetworkTaskFactory,TaskFactory.class,
newEmptyNetworkTaskFactoryProps);
registerService(bc,newEmptyNetworkTaskFactory,NewEmptyNetworkViewFactory.class,
newEmptyNetworkTaskFactoryProps);
@@ -553,7 +553,7 @@
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("menuGravity","2.0");
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("accelerator","cmd
shift n");
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("title","From selected
nodes, selected edges");
-
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("command","new network
from selected nodes and selected edges");
+
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("command","new-network-from-selected-nodes-and-selected-edges");
newNetworkSelectedNodesEdgesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,newNetworkSelectedNodesEdgesTaskFactory,NetworkTaskFactory.class,
newNetworkSelectedNodesEdgesTaskFactoryProps);
@@ -567,7 +567,7 @@
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("inToolBar","true");
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("menuGravity","1.0");
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("tooltip","New Network
From Selection");
-
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("command","new network
selected nodes and all edges");
+
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("command","new-network-selected-nodes-and-all-edges");
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,newNetworkSelectedNodesOnlyTaskFactory,NetworkTaskFactory.class,
newNetworkSelectedNodesOnlyTaskFactoryProps);
@@ -576,7 +576,7 @@
cloneNetworkTaskFactoryProps.setProperty("preferredMenu","File.New.Network");
cloneNetworkTaskFactoryProps.setProperty("menuGravity","3.0");
cloneNetworkTaskFactoryProps.setProperty("title","Clone Current
Network");
- cloneNetworkTaskFactoryProps.setProperty("command","clone
current network");
+
cloneNetworkTaskFactoryProps.setProperty("command","clone-current-network");
cloneNetworkTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,cloneNetworkTaskFactory,NetworkTaskFactory.class,
cloneNetworkTaskFactoryProps);
@@ -587,7 +587,7 @@
destroyNetworkTaskFactoryProps.setProperty("title","Destroy
Network");
destroyNetworkTaskFactoryProps.setProperty("scope","limited");
destroyNetworkTaskFactoryProps.setProperty("menuGravity","3.2");
- destroyNetworkTaskFactoryProps.setProperty("command","destroy
network");
+
destroyNetworkTaskFactoryProps.setProperty("command","destroy-network");
destroyNetworkTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,destroyNetworkTaskFactory,NetworkCollectionTaskFactory.class,
destroyNetworkTaskFactoryProps);
@@ -598,7 +598,7 @@
destroyNetworkViewTaskFactoryProps.setProperty("title","Destroy
View");
destroyNetworkViewTaskFactoryProps.setProperty("scope","limited");
destroyNetworkViewTaskFactoryProps.setProperty("menuGravity","3.1");
-
destroyNetworkViewTaskFactoryProps.setProperty("command","destroy view");
+
destroyNetworkViewTaskFactoryProps.setProperty("command","destroy-view");
destroyNetworkViewTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,destroyNetworkViewTaskFactory,NetworkViewCollectionTaskFactory.class,
destroyNetworkViewTaskFactoryProps);
@@ -610,7 +610,7 @@
zoomInTaskFactoryProps.setProperty("tooltip","Zoom In");
zoomInTaskFactoryProps.setProperty("toolBarGravity","5.1");
zoomInTaskFactoryProps.setProperty("inToolBar","true");
- zoomInTaskFactoryProps.setProperty("command","zoom in");
+ zoomInTaskFactoryProps.setProperty("command","zoom-in");
zoomInTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,zoomInTaskFactory,NetworkViewTaskFactory.class,
zoomInTaskFactoryProps);
@@ -622,7 +622,7 @@
zoomOutTaskFactoryProps.setProperty("tooltip","Zoom Out");
zoomOutTaskFactoryProps.setProperty("toolBarGravity","5.2");
zoomOutTaskFactoryProps.setProperty("inToolBar","true");
- zoomOutTaskFactoryProps.setProperty("command","zoom out");
+ zoomOutTaskFactoryProps.setProperty("command","zoom-out");
zoomOutTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,zoomOutTaskFactory,NetworkViewTaskFactory.class,
zoomOutTaskFactoryProps);
@@ -634,7 +634,7 @@
fitSelectedTaskFactoryProps.setProperty("tooltip","Zoom
selected region");
fitSelectedTaskFactoryProps.setProperty("toolBarGravity","5.4");
fitSelectedTaskFactoryProps.setProperty("inToolBar","true");
- fitSelectedTaskFactoryProps.setProperty("command","fit
selected");
+
fitSelectedTaskFactoryProps.setProperty("command","fit-selected");
fitSelectedTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,fitSelectedTaskFactory,NetworkViewTaskFactory.class,
fitSelectedTaskFactoryProps);
@@ -646,7 +646,7 @@
fitContentTaskFactoryProps.setProperty("tooltip","Zoom out to
display all of current Network");
fitContentTaskFactoryProps.setProperty("toolBarGravity","5.3");
fitContentTaskFactoryProps.setProperty("inToolBar","true");
- fitContentTaskFactoryProps.setProperty("command","fit content");
+ fitContentTaskFactoryProps.setProperty("command","fit-content");
fitContentTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,fitContentTaskFactory,NetworkViewTaskFactory.class,
fitContentTaskFactoryProps);
@@ -667,7 +667,7 @@
createNetworkViewTaskFactoryProps.setProperty("scope","limited");
createNetworkViewTaskFactoryProps.setProperty("menuGravity","3.0");
createNetworkViewTaskFactoryProps.setProperty("title","Create
View");
- createNetworkViewTaskFactoryProps.setProperty("command","create
view");
+
createNetworkViewTaskFactoryProps.setProperty("command","create-view");
createNetworkViewTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,createNetworkViewTaskFactory,NetworkTaskFactory.class,
createNetworkViewTaskFactoryProps);
@@ -679,7 +679,7 @@
exportNetworkImageTaskFactoryProps.setProperty("toolBarGravity","3.7");
exportNetworkImageTaskFactoryProps.setProperty("inToolBar","true");
exportNetworkImageTaskFactoryProps.setProperty("tooltip","Export Network Image
to File");
-
exportNetworkImageTaskFactoryProps.setProperty("command","export network
image");
+
exportNetworkImageTaskFactoryProps.setProperty("command","export-network-image");
exportNetworkImageTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,exportNetworkImageTaskFactory,NetworkViewTaskFactory.class,
exportNetworkImageTaskFactoryProps);
@@ -692,7 +692,7 @@
exportNetworkViewTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/net_file_export.png").toString());
exportNetworkViewTaskFactoryProps.setProperty("inToolBar","true");
exportNetworkViewTaskFactoryProps.setProperty("tooltip","Export
Network to File");
- exportNetworkViewTaskFactoryProps.setProperty("command","export
network");
+
exportNetworkViewTaskFactoryProps.setProperty("command","export-network");
exportNetworkViewTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,exportNetworkViewTaskFactory,NetworkViewTaskFactory.class,
exportNetworkViewTaskFactoryProps);
@@ -705,7 +705,7 @@
exportCurrentTableTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/table_file_export.png").toString());
exportCurrentTableTaskFactoryProps.setProperty("inToolBar","true");
exportCurrentTableTaskFactoryProps.setProperty("tooltip","Export Table to
File");
-
exportCurrentTableTaskFactoryProps.setProperty("command","export table");
+
exportCurrentTableTaskFactoryProps.setProperty("command","export-table");
exportCurrentTableTaskFactoryProps.setProperty("commandNamespace","table");
registerService(bc,exportCurrentTableTaskFactory,TableTaskFactory.class,
exportCurrentTableTaskFactoryProps);
@@ -714,7 +714,7 @@
exportVizmapTaskFactoryProps.setProperty("preferredMenu","File.Export.Vizmap");
exportVizmapTaskFactoryProps.setProperty("menuGravity","1.1");
exportVizmapTaskFactoryProps.setProperty("title","File...");
- exportVizmapTaskFactoryProps.setProperty("command","export
vizmap");
+
exportVizmapTaskFactoryProps.setProperty("command","export-vizmap");
exportVizmapTaskFactoryProps.setProperty("commandNamespace","vizmap");
registerService(bc,exportVizmapTaskFactory,TaskFactory.class,
exportVizmapTaskFactoryProps);
@@ -722,7 +722,7 @@
newSessionTaskFactoryProps.setProperty("preferredMenu","File.New");
newSessionTaskFactoryProps.setProperty("menuGravity","1.1");
newSessionTaskFactoryProps.setProperty("title","Session");
- newSessionTaskFactoryProps.setProperty("command","new session");
+ newSessionTaskFactoryProps.setProperty("command","new-session");
newSessionTaskFactoryProps.setProperty("commandNamespace","cytoscape");
registerService(bc,newSessionTaskFactory,TaskFactory.class,
newSessionTaskFactoryProps);
@@ -736,7 +736,7 @@
openSessionTaskFactoryProps.setProperty("inToolBar","true");
openSessionTaskFactoryProps.setProperty("menuGravity","1.0");
openSessionTaskFactoryProps.setProperty("tooltip","Open
Session");
- openSessionTaskFactoryProps.setProperty("command","open
session");
+
openSessionTaskFactoryProps.setProperty("command","open-session");
openSessionTaskFactoryProps.setProperty("commandNamespace","cytoscape");
registerService(bc,openSessionTaskFactory,TaskFactory.class,
openSessionTaskFactoryProps);
@@ -750,7 +750,7 @@
saveSessionTaskFactoryProps.setProperty("menuGravity","3.0");
saveSessionTaskFactoryProps.setProperty("tooltip","Save
Session");
saveSessionTaskFactoryProps.setProperty("task.id","saveSession"); // TODO: Find
a better way of making anonymous TaskFactories available to other bundles
- saveSessionTaskFactoryProps.setProperty("command","save
session"); // TODO: Find a better way of making anonymous TaskFactories
available to other bundles
+
saveSessionTaskFactoryProps.setProperty("command","save-session"); // TODO:
Find a better way of making anonymous TaskFactories available to other bundles
saveSessionTaskFactoryProps.setProperty("commandNamespace","cytoscape"); //
TODO: Find a better way of making anonymous TaskFactories available to other
bundles
registerService(bc,saveSessionTaskFactory,TaskFactory.class,
saveSessionTaskFactoryProps);
@@ -759,7 +759,7 @@
saveSessionAsTaskFactoryProps.setProperty("accelerator","cmd
shift s");
saveSessionAsTaskFactoryProps.setProperty("menuGravity","3.1");
saveSessionAsTaskFactoryProps.setProperty("title","Save As");
- saveSessionAsTaskFactoryProps.setProperty("command","save
session as");
+
saveSessionAsTaskFactoryProps.setProperty("command","save-session-as");
saveSessionAsTaskFactoryProps.setProperty("commandNamespace","cytoscape");
registerService(bc,saveSessionAsTaskFactory,TaskFactory.class,
saveSessionAsTaskFactoryProps);
@@ -773,19 +773,19 @@
applyPreferredLayoutTaskFactoryProps.setProperty("inToolBar","true");
applyPreferredLayoutTaskFactoryProps.setProperty("menuGravity","5.0");
applyPreferredLayoutTaskFactoryProps.setProperty("tooltip","Apply Preferred
Layout");
-
applyPreferredLayoutTaskFactoryProps.setProperty("command","apply preferred
layout");
+
applyPreferredLayoutTaskFactoryProps.setProperty("command","apply-preferred-layout");
applyPreferredLayoutTaskFactoryProps.setProperty("commandNamespace","network-view");
registerService(bc,applyPreferredLayoutTaskFactory,NetworkViewTaskFactory.class,
applyPreferredLayoutTaskFactoryProps);
Properties deleteColumnTaskFactoryProps = new Properties();
deleteColumnTaskFactoryProps.setProperty("title","Delete
column");
- deleteColumnTaskFactoryProps.setProperty("command","delete
column");
+
deleteColumnTaskFactoryProps.setProperty("command","delete-column");
deleteColumnTaskFactoryProps.setProperty("commandNamespace","table");
registerService(bc,deleteColumnTaskFactory,TableColumnTaskFactory.class,
deleteColumnTaskFactoryProps);
Properties renameColumnTaskFactoryProps = new Properties();
renameColumnTaskFactoryProps.setProperty("title","Rename
column");
- renameColumnTaskFactoryProps.setProperty("command","rename
column");
+
renameColumnTaskFactoryProps.setProperty("command","rename-column");
renameColumnTaskFactoryProps.setProperty("commandNamespace","table");
registerService(bc,renameColumnTaskFactory,TableColumnTaskFactory.class,
renameColumnTaskFactoryProps);
@@ -801,7 +801,7 @@
connectSelectedNodesTaskFactoryProps.setProperty("enableFor","network");
connectSelectedNodesTaskFactoryProps.setProperty("toolBarGravity","2.5");
connectSelectedNodesTaskFactoryProps.setProperty("title","Connect Selected
Nodes");
-
connectSelectedNodesTaskFactoryProps.setProperty("command","connect selected
nodes");
+
connectSelectedNodesTaskFactoryProps.setProperty("command","connect-selected-nodes");
connectSelectedNodesTaskFactoryProps.setProperty("commandNamespace","network");
registerService(bc,connectSelectedNodesTaskFactory,TaskFactory.class,
connectSelectedNodesTaskFactoryProps);
@@ -814,7 +814,7 @@
groupNodesTaskFactoryProps.setProperty("title","Group Nodes");
groupNodesTaskFactoryProps.setProperty("tooltip","Group
Selected Nodes Together");
groupNodesTaskFactoryProps.setProperty("preferredAction",
"NEW");
- groupNodesTaskFactoryProps.setProperty("command", "group
selected nodes");
+ groupNodesTaskFactoryProps.setProperty("command",
"group-selected-nodes");
groupNodesTaskFactoryProps.setProperty("commandNamespace",
"network-view");
registerService(bc,groupNodesTaskFactory,NetworkViewTaskFactory.class,
groupNodesTaskFactoryProps);
@@ -822,7 +822,7 @@
collapseGroupTaskFactoryProps.setProperty("title","Collapse
Group");
collapseGroupTaskFactoryProps.setProperty("tooltip","Collapse
Grouped Nodes");
collapseGroupTaskFactoryProps.setProperty("preferredAction",
"NEW");
- collapseGroupTaskFactoryProps.setProperty("command", "collapse
grouped nodes");
+ collapseGroupTaskFactoryProps.setProperty("command",
"collapse-grouped-nodes");
collapseGroupTaskFactoryProps.setProperty("commandNamespace",
"network-view"); // TODO right namespace?
registerService(bc,collapseGroupTaskFactory,NodeViewTaskFactory.class,
collapseGroupTaskFactoryProps);
@@ -830,7 +830,7 @@
expandGroupTaskFactoryProps.setProperty("title","Expand Group");
expandGroupTaskFactoryProps.setProperty("tooltip","Expand
Group");
expandGroupTaskFactoryProps.setProperty("preferredAction",
"NEW");
- expandGroupTaskFactoryProps.setProperty("command", "expand
group");
+ expandGroupTaskFactoryProps.setProperty("command",
"expand-group");
expandGroupTaskFactoryProps.setProperty("commandNamespace",
"network-view"); // TODO right namespace
registerService(bc,expandGroupTaskFactory,NodeViewTaskFactory.class,
expandGroupTaskFactoryProps);
--
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.
