Author: mes
Date: 2012-04-26 12:36:17 -0700 (Thu, 26 Apr 2012)
New Revision: 29018
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 app adapter with new group task factories and removed task factories we
didn't want exposed.
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-26 19:35:13 UTC (rev 29017)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-26 19:36:17 UTC (rev 29018)
@@ -79,12 +79,16 @@
import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
+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.work.TaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
@@ -417,11 +421,6 @@
*/
LoadTableURLTaskFactory get_LoadTableURLTaskFactory();
- /**
- * Returns an instance of {@link TaskFactory}.
- * @return an instance of {@link TaskFactory}.
- */
- TaskFactory get_ProxySettingsTaskFactory();
/**
* Returns an instance of {@link
DeleteSelectedNodesAndEdgesTaskFactory}.
@@ -591,31 +590,8 @@
*/
DestroyNetworkViewTaskFactory get_DestroyNetworkViewTaskFactory();
- /**
- * Returns an instance of {@link NetworkViewTaskFactory}.
- * @return an instance of {@link NetworkViewTaskFactory}.
- */
- NetworkViewTaskFactory get_ZoomInTaskFactory();
/**
- * Returns an instance of {@link NetworkViewTaskFactory}.
- * @return an instance of {@link NetworkViewTaskFactory}.
- */
- NetworkViewTaskFactory get_ZoomOutTaskFactory();
-
- /**
- * Returns an instance of {@link NetworkViewTaskFactory}.
- * @return an instance of {@link NetworkViewTaskFactory}.
- */
- NetworkViewTaskFactory get_FitSelectedTaskFactory();
-
- /**
- * Returns an instance of {@link NetworkViewTaskFactory}.
- * @return an instance of {@link NetworkViewTaskFactory}.
- */
- NetworkViewTaskFactory get_fitContentTaskFactory();
-
- /**
* Returns an instance of {@link EditNetworkTitleTaskFactory}.
* @return an instance of {@link EditNetworkTitleTaskFactory}.
*/
@@ -669,12 +645,6 @@
*/
OpenSessionTaskFactory get_OpenSessionTaskFactory();
- /**
- * Returns an instance of {@link TaskFactory}.
- * @return an instance of {@link TaskFactory}.
- */
- TaskFactory get_saveSessionTaskFactory();
-
/**
* Returns an instance of {@link SaveSessionAsTaskFactory}.
@@ -701,12 +671,6 @@
* @return an instance of {@link RenameColumnTaskFactory}.
*/
RenameColumnTaskFactory get_RenameColumnTaskFactory();
-
- /**
- * Returns an instance of {@link TableCellTaskFactory}.
- * @return an instance of {@link TableCellTaskFactory}.
- */
- TableCellTaskFactory get_CopyValueToEntireColumnTaskFactory();
/**
* Returns an instance of {@link DeleteTableTaskFactory}.
@@ -730,25 +694,25 @@
* Returns an instance of {@link UnGroupTaskFactory}.
* @return an instance of {@link UnGroupTaskFactory}.
*/
- NetworkViewTaskFactory get_UnGroupTaskFactory();
+ UnGroupTaskFactory get_UnGroupTaskFactory();
/**
- * Returns an instance of {@link NodeViewTaskFactory}.
- * @return an instance of {@link NodeViewTaskFactory}.
+ * Returns an instance of {@link CollapseGroupTaskFactory}.
+ * @return an instance of {@link CollapseGroupTaskFactory}.
*/
- NodeViewTaskFactory get_CollapseGroupTaskFactory();
+ CollapseGroupTaskFactory get_CollapseGroupTaskFactory();
/**
- * Returns an instance of {@link NodeViewTaskFactory}.
- * @return an instance of {@link NodeViewTaskFactory}.
+ * Returns an instance of {@link ExpandGroupTaskFactory}.
+ * @return an instance of {@link ExpandGroupTaskFactory}.
*/
- NodeViewTaskFactory get_ExpandGroupTaskFactory();
+ ExpandGroupTaskFactory get_ExpandGroupTaskFactory();
/**
- * Returns an instance of {@link NodeViewTaskFactory}.
- * @return an instance of {@link NodeViewTaskFactory}.
+ * Returns an instance of {@link UnGroupNodesTaskFactory}.
+ * @return an instance of {@link UnGroupNodesTaskFactory}.
*/
- NodeViewTaskFactory get_UnGroupNodesTaskFactory();
+ UnGroupNodesTaskFactory get_UnGroupNodesTaskFactory();
/**
* Returns an instance of {@link MapTableToNetworkTablesTaskFactory}.
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-26 19:35:13 UTC (rev 29017)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-26 19:36:17 UTC (rev 29018)
@@ -64,12 +64,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;
@@ -194,16 +198,10 @@
NewNetworkSelectedNodesOnlyTaskFactory
newNetworkSelectedNodesOnlyTaskFactory =
getService(bc,NewNetworkSelectedNodesOnlyTaskFactory.class);
DestroyNetworkTaskFactory destroyNetworkTaskFactory =
getService(bc,DestroyNetworkTaskFactory.class);
DestroyNetworkViewTaskFactory destroyNetworkViewTaskFactory =
getService(bc,DestroyNetworkViewTaskFactory.class);
- NetworkViewTaskFactory zoomInTaskFactory =
getService(bc,NetworkViewTaskFactory.class, "(title=Zoom In)");
- NetworkViewTaskFactory zoomOutTaskFactory =
getService(bc,NetworkViewTaskFactory.class, "(title=Zoom Out)");
- NetworkViewTaskFactory fitSelectedTaskFactory =
getService(bc,NetworkViewTaskFactory.class,"(title=Fit Selected)");
- NetworkViewTaskFactory fitContentTaskFactory =
getService(bc,NetworkViewTaskFactory.class,"(title=Fit Content)");
NewSessionTaskFactory newSessionTaskFactory =
getService(bc,NewSessionTaskFactory.class);
OpenSessionTaskFactory openSessionTaskFactory =
getService(bc,OpenSessionTaskFactory.class);
- TaskFactory saveSessionTaskFactory =
getService(bc,TaskFactory.class, "(command=save-session)");
- SaveSessionAsTaskFactory saveSessionAsTaskFactory =
getService(bc,SaveSessionAsTaskFactory.class, "(command=save-session-as)");
- TaskFactory proxySettingsTaskFactory =
getService(bc,TaskFactory.class, "(title=Proxy Settings...)");
+ SaveSessionAsTaskFactory saveSessionAsTaskFactory =
getService(bc,SaveSessionAsTaskFactory.class);
EditNetworkTitleTaskFactory editNetworkTitleTaskFactory =
getService(bc,EditNetworkTitleTaskFactory.class);
CreateNetworkViewTaskFactory createNetworkViewTaskFactory =
getService(bc,CreateNetworkViewTaskFactory.class);
ExportNetworkImageTaskFactory exportNetworkImageTaskFactory =
getService(bc,ExportNetworkImageTaskFactory.class);
@@ -213,7 +211,6 @@
ApplyPreferredLayoutTaskFactory
applyPreferredLayoutTaskFactory =
getService(bc,ApplyPreferredLayoutTaskFactory.class);
DeleteColumnTaskFactory deleteColumnTaskFactory =
getService(bc,DeleteColumnTaskFactory.class);
RenameColumnTaskFactory renameColumnTaskFactory =
getService(bc,RenameColumnTaskFactory.class);
- TableCellTaskFactory copyValueToEntireColumnTaskFactory =
getService(bc,TableCellTaskFactory.class,"(title=Copy to entire column)");
DeleteTableTaskFactory deleteTableTaskFactory =
getService(bc,DeleteTableTaskFactory.class);
ExportVizmapTaskFactory exportVizmapTaskFactory =
getService(bc,ExportVizmapTaskFactory.class);
@@ -222,11 +219,11 @@
ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory =
getService(bc,ApplyVisualStyleTaskFactory.class);
MapTableToNetworkTablesTaskFactory mapNetworkAttrTaskFactory =
getService(bc,MapTableToNetworkTablesTaskFactory.class);
- GroupNodesTaskFactory groupNodesTaskFactory =
getService(bc,GroupNodesTaskFactory.class,"(title=Group Nodes)");
- NetworkViewTaskFactory unGroupTaskFactory=
getService(bc,NetworkViewTaskFactory.class,"(title=Ungroup Nodes)");
- NodeViewTaskFactory collapseGroupTaskFactory=
getService(bc,NodeViewTaskFactory.class,"(title=Collapse Group)");
- NodeViewTaskFactory expandGroupTaskFactory=
getService(bc,NodeViewTaskFactory.class,"(title=Expand Group)");
- NodeViewTaskFactory unGroupNodesTaskFactory=
getService(bc,NodeViewTaskFactory.class,"(title=Ungroup Nodes)");
+ GroupNodesTaskFactory groupNodesTaskFactory =
getService(bc,GroupNodesTaskFactory.class);
+ UnGroupTaskFactory unGroupTaskFactory=
getService(bc,UnGroupTaskFactory.class);
+ CollapseGroupTaskFactory collapseGroupTaskFactory=
getService(bc,CollapseGroupTaskFactory.class);
+ ExpandGroupTaskFactory expandGroupTaskFactory=
getService(bc,ExpandGroupTaskFactory.class);
+ UnGroupNodesTaskFactory unGroupNodesTaskFactory=
getService(bc,UnGroupNodesTaskFactory.class);
// End of core-task services
@@ -263,15 +260,9 @@
newNetworkSelectedNodesOnlyTaskFactory,
destroyNetworkTaskFactory,
destroyNetworkViewTaskFactory,
- zoomInTaskFactory,
- zoomOutTaskFactory,
- fitSelectedTaskFactory,
- fitContentTaskFactory,
newSessionTaskFactory,
openSessionTaskFactory,
- saveSessionTaskFactory,
saveSessionAsTaskFactory,
- proxySettingsTaskFactory,
editNetworkTitleTaskFactory,
createNetworkViewTaskFactory,
exportNetworkImageTaskFactory,
@@ -281,7 +272,6 @@
applyPreferredLayoutTaskFactory,
deleteColumnTaskFactory,
renameColumnTaskFactory,
- copyValueToEntireColumnTaskFactory,
deleteTableTaskFactory,
exportVizmapTaskFactory,
connectSelectedNodesTaskFactory,
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-26 19:35:13 UTC (rev 29017)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-26 19:36:17 UTC (rev 29018)
@@ -39,9 +39,6 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CySessionManager;
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.create.CloneNetworkTaskFactory;
import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
@@ -53,12 +50,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;
@@ -116,9 +117,9 @@
import org.cytoscape.work.util.BoundedDouble;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.task.TableCellTaskFactory;
+
/**
* An implementation of CyAppAdapter
*/
@@ -181,7 +182,6 @@
private VisualLexicon abstractVisualLexicon;
private SimpleCyProperty basicCyProperty;
private BookmarksUtil bookmarksUtil;
- private NetworkTaskFactory networkTaskFactory;
private NewEmptyNetworkViewFactory newEmptyNetworkViewFactory;
private Task task;
private BoundedDouble boundedDouble;
@@ -243,16 +243,10 @@
private NewNetworkSelectedNodesOnlyTaskFactory
newNetworkSelectedNodesOnlyTaskFactory;
private DestroyNetworkTaskFactory destroyNetworkTaskFactory;
private DestroyNetworkViewTaskFactory destroyNetworkViewTaskFactory;
- private NetworkViewTaskFactory zoomInTaskFactory; //???
- private NetworkViewTaskFactory zoomOutTaskFactory; //???
- private NetworkViewTaskFactory fitSelectedTaskFactory; //???
- private NetworkViewTaskFactory fitContentTaskFactory; //???
private NewSessionTaskFactory newSessionTaskFactory;
private OpenSessionTaskFactory openSessionTaskFactory;
- private TaskFactory saveSessionTaskFactory; //??
private SaveSessionAsTaskFactory saveSessionAsTaskFactory;
- private TaskFactory proxySettingsTaskFactory; //??
private EditNetworkTitleTaskFactory editNetworkTitleTaskFactory;
private CreateNetworkViewTaskFactory createNetworkViewTaskFactory;
private ExportNetworkImageTaskFactory exportNetworkImageTaskFactory;
@@ -262,7 +256,6 @@
private ApplyPreferredLayoutTaskFactory applyPreferredLayoutTaskFactory;
private DeleteColumnTaskFactory deleteColumnTaskFactory;
private RenameColumnTaskFactory renameColumnTaskFactory;
- private TableCellTaskFactory copyValueToEntireColumnTaskFactory; //??
private DeleteTableTaskFactory deleteTableTaskFactory;
private ExportVizmapTaskFactory exportVizmapTaskFactory;
@@ -272,10 +265,10 @@
private MapTableToNetworkTablesTaskFactory mapNetworkAttrTaskFactory;
private GroupNodesTaskFactory groupNodesTaskFactory;
- private NetworkViewTaskFactory unGroupTaskFactory;
- private NodeViewTaskFactory collapseGroupTaskFactory;
- private NodeViewTaskFactory expandGroupTaskFactory;
- private NodeViewTaskFactory unGroupNodesTaskFactory;
+ private UnGroupTaskFactory unGroupTaskFactory;
+ private CollapseGroupTaskFactory collapseGroupTaskFactory;
+ private ExpandGroupTaskFactory expandGroupTaskFactory;
+ private UnGroupNodesTaskFactory unGroupNodesTaskFactory;
private LoadTableFileTaskFactory loadAttributesFileTaskFactory;
private LoadTableURLTaskFactory loadAttributesURLTaskFactory;
@@ -362,16 +355,9 @@
final NewNetworkSelectedNodesOnlyTaskFactory
newNetworkSelectedNodesOnlyTaskFactory,
final DestroyNetworkTaskFactory
destroyNetworkTaskFactory,
final DestroyNetworkViewTaskFactory
destroyNetworkViewTaskFactory,
- final NetworkViewTaskFactory zoomInTaskFactory,
//???
- final NetworkViewTaskFactory
zoomOutTaskFactory, //???
- final NetworkViewTaskFactory
fitSelectedTaskFactory, //???
- final NetworkViewTaskFactory
fitContentTaskFactory, //???
-
final NewSessionTaskFactory
newSessionTaskFactory,
final OpenSessionTaskFactory
openSessionTaskFactory,
- final TaskFactory saveSessionTaskFactory, //??
final SaveSessionAsTaskFactory
saveSessionAsTaskFactory,
- final TaskFactory proxySettingsTaskFactory, //??
final EditNetworkTitleTaskFactory
editNetworkTitleTaskFactory,
final CreateNetworkViewTaskFactory
createNetworkViewTaskFactory,
final ExportNetworkImageTaskFactory
exportNetworkImageTaskFactory,
@@ -381,7 +367,6 @@
final ApplyPreferredLayoutTaskFactory
applyPreferredLayoutTaskFactory,
final DeleteColumnTaskFactory
deleteColumnTaskFactory,
final RenameColumnTaskFactory
renameColumnTaskFactory,
- final TableCellTaskFactory
copyValueToEntireColumnTaskFactory, //??
final DeleteTableTaskFactory
deleteTableTaskFactory,
final ExportVizmapTaskFactory
exportVizmapTaskFactory,
@@ -393,10 +378,10 @@
final MapTableToNetworkTablesTaskFactory
mapNetworkAttrTaskFactory,
final GroupNodesTaskFactory
groupNodesTaskFactory,
- final NetworkViewTaskFactory unGroupTaskFactory,
- final NodeViewTaskFactory
collapseGroupTaskFactory,
- final NodeViewTaskFactory
expandGroupTaskFactory,
- final NodeViewTaskFactory
unGroupNodesTaskFactory
+ final UnGroupTaskFactory unGroupTaskFactory,
+ final CollapseGroupTaskFactory
collapseGroupTaskFactory,
+ final ExpandGroupTaskFactory
expandGroupTaskFactory,
+ final UnGroupNodesTaskFactory
unGroupNodesTaskFactory
)
{
this.cyApplicationManager = cyApplicationManager;
@@ -468,15 +453,9 @@
this.newNetworkSelectedNodesOnlyTaskFactory =
newNetworkSelectedNodesOnlyTaskFactory;
this.destroyNetworkTaskFactory = destroyNetworkTaskFactory;
this.destroyNetworkViewTaskFactory =
destroyNetworkViewTaskFactory;
- this.zoomInTaskFactory = zoomInTaskFactory;
- this.zoomOutTaskFactory = zoomOutTaskFactory;
- this.fitSelectedTaskFactory = fitSelectedTaskFactory;
- this.fitContentTaskFactory = fitContentTaskFactory;
this.newSessionTaskFactory = newSessionTaskFactory;
this.openSessionTaskFactory = openSessionTaskFactory;
- this.saveSessionTaskFactory = saveSessionTaskFactory;
this.saveSessionAsTaskFactory = saveSessionAsTaskFactory;
- this.proxySettingsTaskFactory = proxySettingsTaskFactory;
this.editNetworkTitleTaskFactory = editNetworkTitleTaskFactory;
this.createNetworkViewTaskFactory =
createNetworkViewTaskFactory;
this.exportNetworkImageTaskFactory =
exportNetworkImageTaskFactory;
@@ -486,7 +465,6 @@
this.applyPreferredLayoutTaskFactory =
applyPreferredLayoutTaskFactory;
this.deleteColumnTaskFactory = deleteColumnTaskFactory;
this.renameColumnTaskFactory = renameColumnTaskFactory;
- this.copyValueToEntireColumnTaskFactory =
copyValueToEntireColumnTaskFactory;
this.deleteTableTaskFactory = deleteTableTaskFactory;
this.exportVizmapTaskFactory = exportVizmapTaskFactory;
this.connectSelectedNodesTaskFactory =
connectSelectedNodesTaskFactory;
@@ -551,7 +529,6 @@
@Override public LoadVizmapFileTaskFactory
get_LoadVizmapFileTaskFactory(){ return this.loadVizmapFileTaskFactory; }
@Override public LoadTableFileTaskFactory
get_LoadTableFileTaskFactory(){ return this.loadAttributesFileTaskFactory; }
@Override public LoadTableURLTaskFactory get_LoadTableURLTaskFactory(){
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; }
@@ -580,10 +557,6 @@
@Override public CloneNetworkTaskFactory get_CloneNetworkTaskFactory(){
return this.cloneNetworkTaskFactory; }
@Override public DestroyNetworkTaskFactory
get_DestroyNetworkTaskFactory(){ return this.destroyNetworkTaskFactory; }
@Override public DestroyNetworkViewTaskFactory
get_DestroyNetworkViewTaskFactory(){ return this.destroyNetworkViewTaskFactory;
}
- @Override public NetworkViewTaskFactory get_ZoomInTaskFactory(){ return
this.zoomInTaskFactory; }
- @Override public NetworkViewTaskFactory get_ZoomOutTaskFactory(){
return this.zoomOutTaskFactory; }
- @Override public NetworkViewTaskFactory get_FitSelectedTaskFactory(){
return this.fitSelectedTaskFactory; }
- @Override public NetworkViewTaskFactory get_fitContentTaskFactory(){
return this.fitContentTaskFactory; }
@Override public EditNetworkTitleTaskFactory
get_EditNetworkTitleTaskFactory(){ return this.editNetworkTitleTaskFactory; }
@Override public CreateNetworkViewTaskFactory
get_CreateNetworkViewTaskFactory(){ return this.createNetworkViewTaskFactory;
}
@Override public ExportNetworkImageTaskFactory
get_ExportNetworkImageTaskFactory(){ return
this.exportNetworkImageTaskFactory;}
@@ -593,18 +566,16 @@
@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 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; }
@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 UnGroupTaskFactory get_UnGroupTaskFactory(){return
this.unGroupTaskFactory;}
+ @Override public CollapseGroupTaskFactory
get_CollapseGroupTaskFactory(){return this.collapseGroupTaskFactory;}
+ @Override public ExpandGroupTaskFactory
get_ExpandGroupTaskFactory(){return this.expandGroupTaskFactory;}
+ @Override public UnGroupNodesTaskFactory
get_UnGroupNodesTaskFactory(){return this.unGroupNodesTaskFactory;}
@Override public MapTableToNetworkTablesTaskFactory
get_MapTableToNetworkTablesTaskFactory(){ 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-26 19:35:13 UTC (rev 29017)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-26 19:36:17 UTC (rev 29018)
@@ -29,9 +29,6 @@
import org.cytoscape.property.CyProperty;
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.create.CloneNetworkTaskFactory;
import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
@@ -43,12 +40,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;
@@ -169,15 +170,9 @@
mock(NewNetworkSelectedNodesOnlyTaskFactory.class),
mock(DestroyNetworkTaskFactory.class),
mock(DestroyNetworkViewTaskFactory.class),
- mock(NetworkViewTaskFactory.class),
- mock(NetworkViewTaskFactory.class),
- mock(NetworkViewTaskFactory.class),
- mock(NetworkViewTaskFactory.class),
mock(NewSessionTaskFactory.class),
mock(OpenSessionTaskFactory.class),
- mock(TaskFactory.class),
mock(SaveSessionAsTaskFactory.class),
- mock(TaskFactory.class),
mock(EditNetworkTitleTaskFactory.class),
mock(CreateNetworkViewTaskFactory.class),
mock(ExportNetworkImageTaskFactory.class),
@@ -187,7 +182,6 @@
mock(ApplyPreferredLayoutTaskFactory.class),
mock(DeleteColumnTaskFactory.class),
mock(RenameColumnTaskFactory.class),
- mock(TableCellTaskFactory.class),
mock(DeleteTableTaskFactory.class),
mock(ExportVizmapTaskFactory.class),
mock(ConnectSelectedNodesTaskFactory.class),
@@ -195,10 +189,10 @@
mock(ApplyVisualStyleTaskFactory.class),
mock(MapTableToNetworkTablesTaskFactory.class),
mock(GroupNodesTaskFactory.class),
- mock(NetworkViewTaskFactory.class),
- mock(NodeViewTaskFactory.class),
- mock(NodeViewTaskFactory.class),
- mock(NodeViewTaskFactory.class)
+ mock(UnGroupTaskFactory.class),
+ mock(CollapseGroupTaskFactory.class),
+ mock(ExpandGroupTaskFactory.class),
+ mock(UnGroupNodesTaskFactory.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.
