Author: paperwing
Date: 2012-05-03 15:01:39 -0700 (Thu, 03 May 2012)
New Revision: 29097
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
Log:
Minor update to accommodate recent Cytoscape refactoring of app-api into
swing-app-api
Modified: csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
===================================================================
--- csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-05-03 21:15:42 UTC (rev 29096)
+++ csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-05-03 22:01:39 UTC (rev 29097)
@@ -107,7 +107,7 @@
<!-- dependencies needed to implement this code -->
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>app-api</artifactId>
+ <artifactId>swing-app-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>app-api</artifactId>
+ <artifactId>swing-app-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-05-03 21:15:42 UTC (rev 29096)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-05-03 22:01:39 UTC (rev 29097)
@@ -7,6 +7,7 @@
import org.cytoscape.app.internal.net.WebQuerier;
import org.cytoscape.app.internal.net.server.LocalHttpServer;
import org.cytoscape.app.internal.net.server.LocalHttpServer.Response;
+import org.cytoscape.app.swing.CySwingAppAdapter;
import org.cytoscape.application.CyVersion;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.application.CyApplicationConfiguration;
@@ -14,6 +15,9 @@
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.group.CyGroupFactory;
+import org.cytoscape.group.CyGroupManager;
+import org.cytoscape.group.data.CyGroupAggregationManager;
import org.cytoscape.io.read.CyTableReaderManager;
import org.cytoscape.io.read.CyPropertyReaderManager;
import org.cytoscape.model.CyNetworkManager;
@@ -36,6 +40,7 @@
import org.cytoscape.io.write.CyPropertyWriterManager;
import org.cytoscape.io.write.CySessionWriterManager;
import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CyTableWriterManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -44,7 +49,6 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -127,6 +131,9 @@
CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
CyEventHelper cyEventHelperRef =
getService(bc,CyEventHelper.class);
+ CyGroupAggregationManager cyGroupAggregationManagerRef =
getService(bc,CyGroupAggregationManager.class);
+ CyGroupFactory cyGroupFactoryRef =
getService(bc,CyGroupFactory.class);
+ CyGroupManager cyGroupManagerRef =
getService(bc,CyGroupManager.class);
CyLayoutAlgorithmManager cyLayoutAlgorithmManagerRef =
getService(bc,CyLayoutAlgorithmManager.class);
CyNetworkFactory cyNetworkFactoryRef =
getService(bc,CyNetworkFactory.class);
CyNetworkManager cyNetworkManagerRef =
getService(bc,CyNetworkManager.class);
@@ -146,9 +153,9 @@
CyTableFactory cyTableFactoryRef =
getService(bc,CyTableFactory.class);
CyTableManager cyTableManagerRef =
getService(bc,CyTableManager.class);
CyTableReaderManager cyTableReaderManagerRef =
getService(bc,CyTableReaderManager.class);
+ CyTableWriterManager cyTableWriterManagerRef =
getService(bc,CyTableWriterManager.class);
PanelTaskManager panelTaskManagerRef =
getService(bc,PanelTaskManager.class);
DialogTaskManager dialogTaskManagerRef =
getService(bc,DialogTaskManager.class);
- SubmenuTaskManager submenuTaskManagerRef =
getService(bc,SubmenuTaskManager.class);
PresentationWriterManager presentationWriterManagerRef =
getService(bc,PresentationWriterManager.class);
RenderingEngineManager renderingEngineManagerRef =
getService(bc,RenderingEngineManager.class);
TaskManager taskManagerRef = getService(bc,TaskManager.class);
@@ -159,8 +166,6 @@
CyProperty<Bookmarks> bookmarkServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=bookmarks)");
BookmarksUtil bookmarksUtilServiceRef =
getService(bc,BookmarksUtil.class);
CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
- StreamUtil streamUtilServiceRef =
getService(bc,StreamUtil.class);
- FileUtil fileUtilServiceRef = getService(bc,FileUtil.class);
VisualMappingFunctionFactory vmfFactoryC =
getService(bc,VisualMappingFunctionFactory.class, "(mapping.type=continuous)");
VisualMappingFunctionFactory vmfFactoryD =
getService(bc,VisualMappingFunctionFactory.class, "(mapping.type=discrete)");
@@ -229,71 +234,111 @@
ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory =
getService(bc,ApplyVisualStyleTaskFactory.class);
MapTableToNetworkTablesTaskFactory mapNetworkAttrTaskFactory =
getService(bc,MapTableToNetworkTablesTaskFactory.class);
- 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);
+ 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
+ StreamUtil streamUtilServiceRef = getService(bc, StreamUtil.class);
+ FileUtil fileUtilServiceRef = getService(bc, FileUtil.class);
- CyAppAdapterImpl cyAppAdapter = new
CyAppAdapterImpl(cyApplicationManagerRef,cyEventHelperRef,cyLayoutAlgorithmManagerRef,cyNetworkFactoryRef,cyNetworkManagerRef,cyNetworkViewFactoryRef,cyNetworkViewManagerRef,cyNetworkViewReaderManagerRef,cyNetworkViewWriterManagerRef,cyPropertyRef,cyPropertyReaderManagerRef,cyPropertyWriterManagerRef,cyRootNetworkFactoryRef,cyServiceRegistrarRef,cySessionManagerRef,cySessionReaderManagerRef,cySessionWriterManagerRef,cySwingApplicationRef,cyTableFactoryRef,cyTableManagerRef,cyTableReaderManagerRef,cytoscapeVersionService,
dialogTaskManagerRef,panelTaskManagerRef,submenuTaskManagerRef,presentationWriterManagerRef,renderingEngineManagerRef,taskManagerRef,undoSupportRef,
vmfFactoryC, vmfFactoryD, vmfFactoryP,
visualMappingManagerRef,visualStyleFactoryRef, dataSourceManager,
- loadVizmapFileTaskFactory,
- loadNetworkFileTaskFactory,
- loadNetworkURLTaskFactory,
- deleteSelectedNodesAndEdgesTaskFactory,
- selectAllTaskFactory,
- selectAllEdgesTaskFactory,
- selectAllNodesTaskFactory,
- selectAdjacentEdgesTaskFactory,
- selectConnectedNodesTaskFactory,
- selectFirstNeighborsTaskFactory,
- selectFirstNeighborsTaskFactoryInEdge,
- selectFirstNeighborsTaskFactoryOutEdge,
- deselectAllTaskFactory,
- deselectAllEdgesTaskFactory,
- deselectAllNodesTaskFactory,
- invertSelectedEdgesTaskFactory,
- invertSelectedNodesTaskFactory,
- selectFromFileListTaskFactory,
- selectFirstNeighborsNodeViewTaskFactory,
- hideSelectedTaskFactory,
- hideSelectedNodesTaskFactory,
- hideSelectedEdgesTaskFactory,
- unHideAllTaskFactory,
- unHideAllNodesTaskFactory,
- unHideAllEdgesTaskFactory,
- newEmptyNetworkTaskFactory,
- cloneNetworkTaskFactory,
- newNetworkSelectedNodesEdgesTaskFactory,
- newNetworkSelectedNodesOnlyTaskFactory,
- destroyNetworkTaskFactory,
- destroyNetworkViewTaskFactory,
- newSessionTaskFactory,
- openSessionTaskFactory,
- saveSessionAsTaskFactory,
- editNetworkTitleTaskFactory,
- createNetworkViewTaskFactory,
- exportNetworkImageTaskFactory,
- exportNetworkViewTaskFactory,
- exportSelectedTableTaskFactory,
- exportTableTaskFactory,
- applyPreferredLayoutTaskFactory,
- deleteColumnTaskFactory,
- renameColumnTaskFactory,
- deleteTableTaskFactory,
- exportVizmapTaskFactory,
- connectSelectedNodesTaskFactory,
- mapGlobal,
- applyVisualStyleTaskFactory,
- mapNetworkAttrTaskFactory,
- groupNodesTaskFactory,
- unGroupTaskFactory,
- collapseGroupTaskFactory,
- expandGroupTaskFactory,
- unGroupNodesTaskFactory
- );
+ CySwingAppAdapter cyAppAdapter = new
CyAppAdapterImpl(cyApplicationManagerRef,
+ cyEventHelperRef,
+ cyGroupAggregationManagerRef,
+ cyGroupFactoryRef,
+ cyGroupManagerRef,
+ cyLayoutAlgorithmManagerRef,
+ cyNetworkFactoryRef,
+ cyNetworkManagerRef,
+ cyNetworkViewFactoryRef,
+ cyNetworkViewManagerRef,
+ cyNetworkViewReaderManagerRef,
+ cyNetworkViewWriterManagerRef,
+ cyPropertyRef,
+ cyPropertyReaderManagerRef,
+ cyPropertyWriterManagerRef,
+ cyRootNetworkFactoryRef,
+ cyServiceRegistrarRef,
+ cySessionManagerRef,
+ cySessionReaderManagerRef,
+ cySessionWriterManagerRef,
+ cySwingApplicationRef,
+ cyTableFactoryRef,
+ cyTableManagerRef,
+ cyTableReaderManagerRef,
+ cyTableWriterManagerRef,
+ cytoscapeVersionService,
+ dialogTaskManagerRef,
+ panelTaskManagerRef,
+ presentationWriterManagerRef,
+ renderingEngineManagerRef,
+ taskManagerRef,
+ undoSupportRef,
+ vmfFactoryC,
+ vmfFactoryD,
+ vmfFactoryP,
+ visualMappingManagerRef,
+ visualStyleFactoryRef,
+ dataSourceManager,
+ // from core-task-api
+ loadVizmapFileTaskFactory,
+ loadNetworkFileTaskFactory,
+ loadNetworkURLTaskFactory,
+ deleteSelectedNodesAndEdgesTaskFactory,
+ selectAllTaskFactory,
+ selectAllEdgesTaskFactory,
+ selectAllNodesTaskFactory,
+ selectAdjacentEdgesTaskFactory,
+ selectConnectedNodesTaskFactory,
+ selectFirstNeighborsTaskFactory,
+ selectFirstNeighborsTaskFactoryInEdge,
+ selectFirstNeighborsTaskFactoryOutEdge,
+ deselectAllTaskFactory,
+ deselectAllEdgesTaskFactory,
+ deselectAllNodesTaskFactory,
+ invertSelectedEdgesTaskFactory,
+ invertSelectedNodesTaskFactory,
+ selectFromFileListTaskFactory,
+ selectFirstNeighborsNodeViewTaskFactory,
+ hideSelectedTaskFactory,
+ hideSelectedNodesTaskFactory,
+ hideSelectedEdgesTaskFactory,
+ unHideAllTaskFactory,
+ unHideAllNodesTaskFactory,
+ unHideAllEdgesTaskFactory,
+ newEmptyNetworkTaskFactory,
+ cloneNetworkTaskFactory,
+ newNetworkSelectedNodesEdgesTaskFactory,
+ newNetworkSelectedNodesOnlyTaskFactory,
+ destroyNetworkTaskFactory,
+ destroyNetworkViewTaskFactory,
+ newSessionTaskFactory,
+ openSessionTaskFactory,
+ saveSessionAsTaskFactory,
+ editNetworkTitleTaskFactory,
+ createNetworkViewTaskFactory,
+ exportNetworkImageTaskFactory,
+ exportNetworkViewTaskFactory,
+ exportSelectedTableTaskFactory,
+ exportTableTaskFactory,
+ applyPreferredLayoutTaskFactory,
+ deleteColumnTaskFactory,
+ renameColumnTaskFactory,
+ deleteTableTaskFactory,
+ exportVizmapTaskFactory,
+ connectSelectedNodesTaskFactory,
+ mapGlobal,
+ applyVisualStyleTaskFactory,
+ mapNetworkAttrTaskFactory,
+ groupNodesTaskFactory,
+ unGroupTaskFactory,
+ collapseGroupTaskFactory,
+ expandGroupTaskFactory,
+ unGroupNodesTaskFactory
+ );
registerService(bc,cyAppAdapter,CyAppAdapter.class, new
Properties());
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-05-03 21:15:42 UTC (rev 29096)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-05-03 22:01:39 UTC (rev 29097)
@@ -4,6 +4,7 @@
import java.util.Properties;
import org.cytoscape.app.AbstractCyApp;
import org.cytoscape.app.CyAppAdapter;
+import org.cytoscape.app.swing.CySwingAppAdapter;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.CyVersion;
import org.cytoscape.application.swing.CyAction;
@@ -12,6 +13,9 @@
import org.cytoscape.io.datasource.DataSourceManager;
import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.group.CyGroupFactory;
+import org.cytoscape.group.CyGroupManager;
+import org.cytoscape.group.data.CyGroupAggregationManager;
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -27,6 +31,7 @@
import org.cytoscape.io.write.CyPropertyWriterManager;
import org.cytoscape.io.write.CySessionWriterManager;
import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.io.write.CyTableWriterManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableFactory;
@@ -112,7 +117,6 @@
import org.cytoscape.work.swing.AbstractGUITunableHandler;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.work.util.BoundedDouble;
import org.cytoscape.task.NetworkViewTaskFactory;
@@ -123,7 +127,7 @@
/**
* An implementation of CyAppAdapter
*/
-public class CyAppAdapterImpl implements CyAppAdapter {
+public class CyAppAdapterImpl implements CySwingAppAdapter {
//
// Since there are a lot of fields, keep them
@@ -135,6 +139,9 @@
//
private final CyApplicationManager cyApplicationManager;
private final CyEventHelper cyEventHelper;
+ private final CyGroupAggregationManager cyGroupAggregationManager;
+ private final CyGroupFactory cyGroupFactory;
+ private final CyGroupManager cyGroupManager;
private final CyLayoutAlgorithmManager cyLayoutAlgorithmManager;
private final CyNetworkFactory cyNetworkFactory;
private final CyNetworkManager cyNetworkManager;
@@ -155,10 +162,9 @@
private final CyTableFactory cyTableFactory;
private final CyTableManager cyTableManager;
private final CyTableReaderManager cyTableReaderManager;
-// private final CyTableWriterManager cyTableWriterManager;
+ private final CyTableWriterManager cyTableWriterManager;
private final DialogTaskManager dialogTaskManager;
private final PanelTaskManager panelTaskManager;
- private final SubmenuTaskManager submenuTaskManager;
private final PresentationWriterManager presentationWriterManager;
private final RenderingEngineManager renderingEngineManager;
private final TaskManager taskManager;
@@ -280,6 +286,9 @@
//
CyAppAdapterImpl( final CyApplicationManager cyApplicationManager,
final CyEventHelper cyEventHelper,
+ final CyGroupAggregationManager
cyGroupAggregationManager,
+ final CyGroupFactory cyGroupFactory,
+ final CyGroupManager cyGroupManager,
final CyLayoutAlgorithmManager
cyLayoutAlgorithmManager,
final CyNetworkFactory cyNetworkFactory,
final CyNetworkManager cyNetworkManager,
@@ -299,11 +308,10 @@
final CyTableFactory cyTableFactory,
final CyTableManager cyTableManager,
final CyTableReaderManager cyTableReaderManager,
+ final CyTableWriterManager cyTableWriterManager,
final CyVersion cyVersion,
-// final CyTableWriterManager cyTableWriterManager,
final DialogTaskManager dialogTaskManager,
final PanelTaskManager panelTaskManager,
- final SubmenuTaskManager submenuTaskManager,
final PresentationWriterManager
presentationWriterManager,
final RenderingEngineManager
renderingEngineManager,
final TaskManager taskManager,
@@ -386,6 +394,9 @@
{
this.cyApplicationManager = cyApplicationManager;
this.cyEventHelper = cyEventHelper;
+ this.cyGroupAggregationManager = cyGroupAggregationManager;
+ this.cyGroupFactory = cyGroupFactory;
+ this.cyGroupManager = cyGroupManager;
this.cyLayoutAlgorithmManager = cyLayoutAlgorithmManager;
this.cyNetworkFactory = cyNetworkFactory;
this.cyNetworkManager = cyNetworkManager;
@@ -405,11 +416,10 @@
this.cyTableFactory = cyTableFactory;
this.cyTableManager = cyTableManager;
this.cyTableReaderManager = cyTableReaderManager;
+ this.cyTableWriterManager = cyTableWriterManager;
this.cyVersion = cyVersion;
-// this.cyTableWriterManager = cyTableWriterManager;
this.dialogTaskManager = dialogTaskManager;
this.panelTaskManager = panelTaskManager;
- this.submenuTaskManager = submenuTaskManager;
this.presentationWriterManager = presentationWriterManager;
this.renderingEngineManager = renderingEngineManager;
this.taskManager = taskManager;
@@ -485,6 +495,9 @@
//
public CyApplicationManager getCyApplicationManager() { return
cyApplicationManager; }
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
+ @Override public CyGroupAggregationManager
getCyGroupAggregationManager() { return cyGroupAggregationManager; }
+ @Override public CyGroupFactory getCyGroupFactory() { return
cyGroupFactory; }
+ @Override public CyGroupManager getCyGroupManager() { return
cyGroupManager; }
public CyLayoutAlgorithmManager getCyLayoutAlgorithmManager() { return
cyLayoutAlgorithmManager; }
public CyNetworkFactory getCyNetworkFactory() { return
cyNetworkFactory; }
public CyNetworkManager getCyNetworkManager() { return
cyNetworkManager; }
@@ -504,11 +517,10 @@
public CyTableFactory getCyTableFactory() { return cyTableFactory; }
public CyTableManager getCyTableManager() { return cyTableManager; }
public CyTableReaderManager getCyTableReaderManager() { return
cyTableReaderManager; }
+ public CyTableWriterManager getCyTableWriterManager() { return
cyTableWriterManager; }
public CyVersion getCyVersion() { return cyVersion; }
-// public CyTableWriterManager getCyTableWriterManager() { return
cyTableWriterManager; }
public DialogTaskManager getDialogTaskManager() { return
dialogTaskManager; }
public PanelTaskManager getPanelTaskManager() { return
panelTaskManager; }
- public SubmenuTaskManager getSubmenuTaskManager() { return
submenuTaskManager; }
public PresentationWriterManager getPresentationWriterManager() {
return presentationWriterManager; }
public RenderingEngineManager getRenderingEngineManager() { return
renderingEngineManager; }
public TaskManager getTaskManager() { return taskManager; }
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-05-03 21:15:42 UTC (rev 29096)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-05-03 22:01:39 UTC (rev 29097)
@@ -19,11 +19,15 @@
import org.cytoscape.io.write.CyPropertyWriterManager;
import org.cytoscape.io.write.CySessionWriterManager;
import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.io.write.CyTableWriterManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
+import org.cytoscape.group.CyGroupFactory;
+import org.cytoscape.group.CyGroupManager;
+import org.cytoscape.group.data.CyGroupAggregationManager;
//import org.cytoscape.app.CyAppAdapterTest;
import org.cytoscape.app.CyAppAdapter;
import org.cytoscape.property.CyProperty;
@@ -92,7 +96,6 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.junit.Before;
@@ -103,6 +106,9 @@
CyAppAdapter adapter = new CyAppAdapterImpl(
mock(CyApplicationManager.class),
mock(CyEventHelper.class),
+ mock(CyGroupAggregationManager.class),
+ mock(CyGroupFactory.class),
+ mock(CyGroupManager.class),
mock(CyLayoutAlgorithmManager.class),
mock(CyNetworkFactory.class),
mock(CyNetworkManager.class),
@@ -122,11 +128,10 @@
mock(CyTableFactory.class),
mock(CyTableManager.class),
mock(CyTableReaderManager.class),
+ mock(CyTableWriterManager.class),
mock(CyVersion.class),
-// mock(CyTableWriterManager.class),
mock(DialogTaskManager.class),
mock(PanelTaskManager.class),
- mock(SubmenuTaskManager.class),
mock(PresentationWriterManager.class),
mock(RenderingEngineManager.class),
mock(TaskManager.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.
