Author: pwang
Date: 2012-04-24 16:51:30 -0700 (Tue, 24 Apr 2012)
New Revision: 28976
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
Log:
Updated
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
===================================================================
--- core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-24 22:33:22 UTC (rev 28975)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-24 23:51:30 UTC (rev 28976)
@@ -83,6 +83,10 @@
import org.cytoscape.task.table.DeleteTableTaskFactory;
import org.cytoscape.task.table.RenameColumnTaskFactory;
import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.task.TableCellTaskFactory;
+import org.cytoscape.task.group.GroupNodesTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
/**
@@ -413,6 +417,12 @@
LoadAttributesURLTaskFactory get_LoadAttributesURLTaskFactory();
/**
+ * Returns an instance of {@link TaskFactory}.
+ * @return an instance of {@link TaskFactory}.
+ */
+ TaskFactory get_ProxySettingsTaskFactory();
+
+ /**
* Returns an instance of {@link
DeleteSelectedNodesAndEdgesTaskFactory}.
* @return an instance of {@link
DeleteSelectedNodesAndEdgesTaskFactory}.
*/
@@ -653,10 +663,10 @@
OpenSessionTaskFactory get_OpenSessionTaskFactory();
/**
- * Returns an instance of {@link saveSessionTaskFactory}.
- * @return an instance of {@link saveSessionTaskFactory}.
+ * Returns an instance of {@link TaskFactory}.
+ * @return an instance of {@link TaskFactory}.
*/
-// SaveSessionTaskFactory get_saveSessionTaskFactory();
+ TaskFactory get_saveSessionTaskFactory();
/**
@@ -686,6 +696,12 @@
RenameColumnTaskFactory get_RenameColumnTaskFactory();
/**
+ * Returns an instance of {@link TableCellTaskFactory}.
+ * @return an instance of {@link TableCellTaskFactory}.
+ */
+ TableCellTaskFactory get_CopyValueToEntireColumnTaskFactory();
+
+ /**
* Returns an instance of {@link DeleteTableTaskFactory}.
* @return an instance of {@link DeleteTableTaskFactory}.
*/
@@ -697,37 +713,37 @@
*/
ConnectSelectedNodesTaskFactory get_ConnectSelectedNodesTaskFactory();
-// /**
-// * Returns an instance of {@link GroupNodesTaskFactory}.
-// * @return an instance of {@link GroupNodesTaskFactory}.
-// */
-// GroupNodesTaskFactory get_GroupNodesTaskFactory();
-//
-// /**
-// * Returns an instance of {@link UnGroupTaskFactory}.
-// * @return an instance of {@link UnGroupTaskFactory}.
-// */
-// UnGroupTaskFactory get_UnGroupTaskFactory();
-//
-// /**
-// * Returns an instance of {@link CollapseGroupTaskFactory}.
-// * @return an instance of {@link CollapseGroupTaskFactory}.
-// */
-// CollapseGroupTaskFactory get_CollapseGroupTaskFactory();
-//
-// /**
-// * Returns an instance of {@link ExpandGroupTaskFactory}.
-// * @return an instance of {@link ExpandGroupTaskFactory}.
-// */
-// ExpandGroupTaskFactory get_ExpandGroupTaskFactory();
-//
-// /**
-// * Returns an instance of {@link UnGroupNodesTaskFactory}.
-// * @return an instance of {@link UnGroupNodesTaskFactory}.
-// */
-// UnGroupNodesTaskFactory get_UnGroupNodesTaskFactory();
+ /**
+ * Returns an instance of {@link GroupNodesTaskFactory}.
+ * @return an instance of {@link GroupNodesTaskFactory}.
+ */
+ GroupNodesTaskFactory get_GroupNodesTaskFactory();
/**
+ * Returns an instance of {@link UnGroupTaskFactory}.
+ * @return an instance of {@link UnGroupTaskFactory}.
+ */
+ NetworkViewTaskFactory get_UnGroupTaskFactory();
+
+ /**
+ * Returns an instance of {@link NodeViewTaskFactory}.
+ * @return an instance of {@link NodeViewTaskFactory}.
+ */
+ NodeViewTaskFactory get_CollapseGroupTaskFactory();
+
+ /**
+ * Returns an instance of {@link NodeViewTaskFactory}.
+ * @return an instance of {@link NodeViewTaskFactory}.
+ */
+ NodeViewTaskFactory get_ExpandGroupTaskFactory();
+
+ /**
+ * Returns an instance of {@link NodeViewTaskFactory}.
+ * @return an instance of {@link NodeViewTaskFactory}.
+ */
+ NodeViewTaskFactory get_UnGroupNodesTaskFactory();
+
+ /**
* Returns an instance of {@link MapNetworkAttrTaskFactory}.
* @return an instance of {@link MapNetworkAttrTaskFactory}.
*/
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-24 22:33:22 UTC (rev 28975)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-24 23:51:30 UTC (rev 28976)
@@ -51,6 +51,7 @@
import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.creation.CloneNetworkTaskFactory;
import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
@@ -64,6 +65,7 @@
import org.cytoscape.task.export.network.ExportNetworkViewTaskFactory;
import org.cytoscape.task.export.table.ExportCurrentTableTaskFactory;
import org.cytoscape.task.export.vizmap.ExportVizmapTaskFactory;
+import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -218,6 +220,13 @@
ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory =
getService(bc,ApplyVisualStyleTaskFactory.class);
MapNetworkAttrTaskFactory mapNetworkAttrTaskFactory =
getService(bc,MapNetworkAttrTaskFactory.class);
+
+ GroupNodesTaskFactory groupNodesTaskFactory =
getService(bc,GroupNodesTaskFactory.class);
+ NetworkViewTaskFactory unGroupTaskFactory=
getService(bc,NetworkViewTaskFactory.class);
+ NodeViewTaskFactory collapseGroupTaskFactory=
getService(bc,NodeViewTaskFactory.class);
+ NodeViewTaskFactory expandGroupTaskFactory=
getService(bc,NodeViewTaskFactory.class);
+ NodeViewTaskFactory unGroupNodesTaskFactory=
getService(bc,NodeViewTaskFactory.class);
+
// End of core-task services
@@ -276,7 +285,12 @@
connectSelectedNodesTaskFactory,
mapGlobal,
applyVisualStyleTaskFactory,
- mapNetworkAttrTaskFactory
+ mapNetworkAttrTaskFactory,
+ groupNodesTaskFactory,
+ unGroupTaskFactory,
+ collapseGroupTaskFactory,
+ expandGroupTaskFactory,
+ unGroupNodesTaskFactory
);
AppLoaderTaskFactory appLoaderTaskFactory = new
AppLoaderTaskFactory(cyAppAdapter);
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-24 22:33:22 UTC (rev 28975)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-24 23:51:30 UTC (rev 28976)
@@ -2,7 +2,6 @@
import java.util.Properties;
-
import org.cytoscape.app.AbstractCyApp;
import org.cytoscape.app.CyAppAdapter;
import org.cytoscape.application.CyApplicationManager;
@@ -42,6 +41,7 @@
import org.cytoscape.session.events.SessionAboutToBeSavedEvent;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.creation.CloneNetworkTaskFactory;
import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
@@ -54,6 +54,7 @@
import org.cytoscape.task.export.network.ExportNetworkViewTaskFactory;
import org.cytoscape.task.export.table.ExportCurrentTableTaskFactory;
import org.cytoscape.task.export.vizmap.ExportVizmapTaskFactory;
+import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -270,6 +271,14 @@
private ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory;
private MapNetworkAttrTaskFactory mapNetworkAttrTaskFactory;
+ private GroupNodesTaskFactory groupNodesTaskFactory;
+ private NetworkViewTaskFactory unGroupTaskFactory;
+ private NodeViewTaskFactory collapseGroupTaskFactory;
+ private NodeViewTaskFactory expandGroupTaskFactory;
+ private NodeViewTaskFactory unGroupNodesTaskFactory;
+
+ private LoadAttributesFileTaskFactory loadAttributesFileTaskFactory;
+ private LoadAttributesURLTaskFactory loadAttributesURLTaskFactory;
//
// Since this is implementation code, there shouldn't be a
@@ -374,18 +383,21 @@
final TableCellTaskFactory
copyValueToEntireColumnTaskFactory, //??
final DeleteTableTaskFactory
deleteTableTaskFactory,
final ExportVizmapTaskFactory
exportVizmapTaskFactory,
- //final SubnetworkBuilderUtil
subnetworkBuilderUtil,
- //final ImportTaskUtil importTaskUtil,
- //final BioGridPreprocessor bioGridPreprocessor,
final ConnectSelectedNodesTaskFactory
connectSelectedNodesTaskFactory,
final MapGlobalToLocalTableTaskFactory
mapGlobal,
final ApplyVisualStyleTaskFactory
applyVisualStyleTaskFactory,
- final MapNetworkAttrTaskFactory
mapNetworkAttrTaskFactory
+ final MapNetworkAttrTaskFactory
mapNetworkAttrTaskFactory,
+
+ final GroupNodesTaskFactory
groupNodesTaskFactory,
+ final NetworkViewTaskFactory unGroupTaskFactory,
+ final NodeViewTaskFactory
collapseGroupTaskFactory,
+ final NodeViewTaskFactory
expandGroupTaskFactory,
+ final NodeViewTaskFactory
unGroupNodesTaskFactory
)
- {
+ {
this.cyApplicationManager = cyApplicationManager;
this.cyEventHelper = cyEventHelper;
this.cyLayoutAlgorithmManager = cyLayoutAlgorithmManager;
@@ -479,6 +491,13 @@
this.mapGlobal = mapGlobal;
this.applyVisualStyleTaskFactory = applyVisualStyleTaskFactory;
this.mapNetworkAttrTaskFactory = mapNetworkAttrTaskFactory;
+
+ this.groupNodesTaskFactory = groupNodesTaskFactory;
+ this.unGroupNodesTaskFactory = unGroupNodesTaskFactory;
+ this.collapseGroupTaskFactory = collapseGroupTaskFactory;
+ this.expandGroupTaskFactory = expandGroupTaskFactory;
+ this.unGroupNodesTaskFactory = unGroupNodesTaskFactory;
+
}
//
@@ -528,9 +547,10 @@
@Override public LoadNetworkFileTaskFactory
get_LoadNetworkFileTaskFactory(){ return this.loadNetworkFileTaskFactory; }
@Override public LoadNetworkURLTaskFactory
get_LoadNetworkURLTaskFactory(){ return this.loadNetworkURLTaskFactory; }
@Override public LoadVizmapFileTaskFactory
get_LoadVizmapFileTaskFactory(){ return this.loadVizmapFileTaskFactory; }
- @Override public LoadAttributesFileTaskFactory
get_LoadAttributesFileTaskFactory(){ return null; }
- @Override public LoadAttributesURLTaskFactory
get_LoadAttributesURLTaskFactory(){ return null; }
- @Override public DeleteSelectedNodesAndEdgesTaskFactory
get_DeleteSelectedNodesAndEdgesTaskFactory(){ return null; }
+ @Override public LoadAttributesFileTaskFactory
get_LoadAttributesFileTaskFactory(){ return this.loadAttributesFileTaskFactory;
}
+ @Override public LoadAttributesURLTaskFactory
get_LoadAttributesURLTaskFactory(){ return this.loadAttributesURLTaskFactory; }
+ @Override public TaskFactory get_ProxySettingsTaskFactory(){return
this.proxySettingsTaskFactory;}
+ @Override public DeleteSelectedNodesAndEdgesTaskFactory
get_DeleteSelectedNodesAndEdgesTaskFactory(){ return
this.deleteSelectedNodesAndEdgesTaskFactory; }
@Override public SelectAllTaskFactory get_SelectAllTaskFactory(){
return this.selectAllTaskFactory; }
@Override public SelectAllEdgesTaskFactory
get_SelectAllEdgesTaskFactory(){ return this.selectAllEdgesTaskFactory; }
@Override public SelectAllNodesTaskFactory
get_SelectAllNodesTaskFactory(){ return this.selectAllNodesTaskFactory; }
@@ -570,20 +590,18 @@
@Override public ExportVizmapTaskFactory get_ExportVizmapTaskFactory(){
return this.exportVizmapTaskFactory; }
@Override public NewSessionTaskFactory get_NewSessionTaskFactory(){
return this.newSessionTaskFactory;}
@Override public OpenSessionTaskFactory get_OpenSessionTaskFactory(){
return this.openSessionTaskFactory;}
-// @Override public SaveSessionTaskFactory get_saveSessionTaskFactory();
+ @Override public TaskFactory get_saveSessionTaskFactory(){return
this.saveSessionTaskFactory;}
@Override public SaveSessionAsTaskFactory
get_SaveSessionAsTaskFactory(){ return this.saveSessionAsTaskFactory; }
@Override public ApplyPreferredLayoutTaskFactory
get_ApplyPreferredLayoutTaskFactory(){ return
this.applyPreferredLayoutTaskFactory; }
@Override public DeleteColumnTaskFactory get_DeleteColumnTaskFactory(){
return this.deleteColumnTaskFactory;}
@Override public RenameColumnTaskFactory get_RenameColumnTaskFactory(){
return this.renameColumnTaskFactory;}
+ @Override public TableCellTaskFactory
get_CopyValueToEntireColumnTaskFactory(){return
this.copyValueToEntireColumnTaskFactory;}
@Override public DeleteTableTaskFactory get_DeleteTableTaskFactory(){
return this.deleteTableTaskFactory;}
@Override public ConnectSelectedNodesTaskFactory
get_ConnectSelectedNodesTaskFactory(){ return
this.connectSelectedNodesTaskFactory; }
-
-// GroupNodesTaskFactory get_GroupNodesTaskFactory();
-// UnGroupTaskFactory get_UnGroupTaskFactory();
-// CollapseGroupTaskFactory get_CollapseGroupTaskFactory();
-// ExpandGroupTaskFactory get_ExpandGroupTaskFactory();
-// UnGroupNodesTaskFactory get_UnGroupNodesTaskFactory();
-
+ @Override public GroupNodesTaskFactory
get_GroupNodesTaskFactory(){return this.groupNodesTaskFactory;}
+ @Override public NetworkViewTaskFactory
get_UnGroupTaskFactory(){return this.unGroupTaskFactory;}
+ @Override public NodeViewTaskFactory
get_CollapseGroupTaskFactory(){return this.collapseGroupTaskFactory;}
+ @Override public NodeViewTaskFactory
get_ExpandGroupTaskFactory(){return this.expandGroupTaskFactory;}
+ @Override public NodeViewTaskFactory
get_UnGroupNodesTaskFactory(){return this.unGroupNodesTaskFactory;}
@Override public MapNetworkAttrTaskFactory
get_MapNetworkAttrTaskFactory(){ return this.mapNetworkAttrTaskFactory;}
-
}
Modified:
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
===================================================================
---
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-24 22:33:22 UTC (rev 28975)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-24 23:51:30 UTC (rev 28976)
@@ -30,6 +30,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.creation.CloneNetworkTaskFactory;
import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
@@ -43,6 +44,7 @@
import org.cytoscape.task.export.network.ExportNetworkViewTaskFactory;
import org.cytoscape.task.export.table.ExportCurrentTableTaskFactory;
import org.cytoscape.task.export.vizmap.ExportVizmapTaskFactory;
+import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -189,7 +191,12 @@
mock(ConnectSelectedNodesTaskFactory.class),
mock(MapGlobalToLocalTableTaskFactory.class),
mock(ApplyVisualStyleTaskFactory.class),
- mock(MapNetworkAttrTaskFactory.class)
+ mock(MapNetworkAttrTaskFactory.class),
+ mock(GroupNodesTaskFactory.class),
+ mock(NetworkViewTaskFactory.class),
+ mock(NodeViewTaskFactory.class),
+ mock(NodeViewTaskFactory.class),
+ mock(NodeViewTaskFactory.class)
);
}
}
--
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.
