Author: mes
Date: 2012-04-26 12:35:13 -0700 (Thu, 26 Apr 2012)
New Revision: 29017
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/CollapseGroupTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/ExpandGroupTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupNodesTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupTaskFactory.java
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
Log:
Added group task factories.
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/CollapseGroupTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/CollapseGroupTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/CollapseGroupTaskFactory.java
2012-04-26 19:35:13 UTC (rev 29017)
@@ -0,0 +1,11 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.task.NodeViewTaskFactory;
+
+/**
+ * This interface provides a task iterator collapsing selection of nodes from
a node view.
+ * @CyAPI.Api.Interface
+ */
+public interface CollapseGroupTaskFactory extends NodeViewTaskFactory {
+
+}
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/ExpandGroupTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/ExpandGroupTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/ExpandGroupTaskFactory.java
2012-04-26 19:35:13 UTC (rev 29017)
@@ -0,0 +1,11 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.task.NodeViewTaskFactory;
+
+/**
+ * This interface provides a task iterator expanding a group from a node view.
+ * @CyAPI.Api.Interface
+ */
+public interface ExpandGroupTaskFactory extends NodeViewTaskFactory {
+
+}
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupNodesTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupNodesTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupNodesTaskFactory.java
2012-04-26 19:35:13 UTC (rev 29017)
@@ -0,0 +1,11 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.task.NodeViewTaskFactory;
+
+/**
+ * This interface provides a task iterator ungrouping a selection of nodes
from a node view.
+ * @CyAPI.Api.Interface
+ */
+public interface UnGroupNodesTaskFactory extends NodeViewTaskFactory {
+
+}
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/UnGroupTaskFactory.java
2012-04-26 19:35:13 UTC (rev 29017)
@@ -0,0 +1,11 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.task.NetworkViewTaskFactory;
+
+/**
+ * This interface provides a task iterator ungrouping a group from a network
view.
+ * @CyAPI.Api.Interface
+ */
+public interface UnGroupTaskFactory extends NetworkViewTaskFactory {
+
+}
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 18:14:34 UTC (rev 29016)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-26 19:35:13 UTC (rev 29017)
@@ -47,12 +47,16 @@
import org.cytoscape.task.destroy.DeleteTableTaskFactory;
import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.edit.CollapseGroupTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.ExpandGroupTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.task.edit.MapTableToNetworkTablesTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
+import org.cytoscape.task.edit.UnGroupNodesTaskFactory;
+import org.cytoscape.task.edit.UnGroupTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -897,7 +901,7 @@
new GroupNodesTaskFactoryImpl(cyGroupManager,
cyGroupFactory);
Properties groupNodesTaskFactoryProps = new Properties();
groupNodesTaskFactoryProps.setProperty(PREFERRED_MENU,"Groups");
- groupNodesTaskFactoryProps.setProperty(TITLE,"Group Nodes");
+ groupNodesTaskFactoryProps.setProperty(TITLE,"Group Selected
Nodes");
groupNodesTaskFactoryProps.setProperty(TOOLTIP,"Group Selected
Nodes Together");
groupNodesTaskFactoryProps.setProperty("preferredAction",
"NEW");
groupNodesTaskFactoryProps.setProperty(COMMAND,
"group-selected-nodes");
@@ -909,12 +913,13 @@
new UnGroupNodesTaskFactoryImpl(cyGroupManager);
Properties unGroupNodesTaskFactoryProps = new Properties();
unGroupNodesTaskFactoryProps.setProperty(PREFERRED_MENU,"Groups");
- unGroupNodesTaskFactoryProps.setProperty(TITLE,"Ungroup Nodes");
- unGroupNodesTaskFactoryProps.setProperty(TOOLTIP,"Un group
Selected Nodes");
+ unGroupNodesTaskFactoryProps.setProperty(TITLE,"Ungroup
Selected Nodes");
+ unGroupNodesTaskFactoryProps.setProperty(TOOLTIP,"Ungroup
Selected Nodes");
unGroupNodesTaskFactoryProps.setProperty("preferredAction",
"NEW");
unGroupNodesTaskFactoryProps.setProperty(COMMAND,
"ungroup-selected-nodes");
groupNodesTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view");
registerService(bc,unGroupTaskFactory,NetworkViewTaskFactory.class,
unGroupNodesTaskFactoryProps);
+ registerService(bc,unGroupTaskFactory,UnGroupTaskFactory.class,
unGroupNodesTaskFactoryProps);
GroupNodeContextTaskFactoryImpl collapseGroupTaskFactory =
new GroupNodeContextTaskFactoryImpl(cyGroupManager,
true);
@@ -926,6 +931,7 @@
collapseGroupTaskFactoryProps.setProperty(COMMAND,
"collapse-grouped-nodes");
collapseGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace?
registerService(bc,collapseGroupTaskFactory,NodeViewTaskFactory.class,
collapseGroupTaskFactoryProps);
+
registerService(bc,collapseGroupTaskFactory,CollapseGroupTaskFactory.class,
collapseGroupTaskFactoryProps);
GroupNodeContextTaskFactoryImpl expandGroupTaskFactory =
new GroupNodeContextTaskFactoryImpl(cyGroupManager,
false);
@@ -937,6 +943,7 @@
expandGroupTaskFactoryProps.setProperty(COMMAND,
"expand-group");
expandGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace
registerService(bc,expandGroupTaskFactory,NodeViewTaskFactory.class,
expandGroupTaskFactoryProps);
+
registerService(bc,expandGroupTaskFactory,ExpandGroupTaskFactory.class,
expandGroupTaskFactoryProps);
UnGroupNodesTaskFactoryImpl unGroupNodesTaskFactory =
new UnGroupNodesTaskFactoryImpl(cyGroupManager);
@@ -948,6 +955,7 @@
unGroupTaskFactoryProps.setProperty(COMMAND, "ungroup");
unGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace
registerService(bc,unGroupNodesTaskFactory,NodeViewTaskFactory.class,
unGroupTaskFactoryProps);
+
registerService(bc,unGroupNodesTaskFactory,UnGroupNodesTaskFactory.class,
unGroupTaskFactoryProps);
MapTableToNetworkTablesTaskFactoryImpl
mapNetworkAttrTaskFactory = new
MapTableToNetworkTablesTaskFactoryImpl(cyNetworkManagerServiceRef,
cyApplicationManagerServiceRef,
cyRootNetworkFactoryServiceRef,tunableSetterServiceRef);
--
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.
