Author: mes
Date: 2011-01-28 15:14:38 -0800 (Fri, 28 Jan 2011)
New Revision: 23820
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
Log:
updated plugin adapter to include a bunch more fields
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
===================================================================
---
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-01-28 23:14:28 UTC (rev 23819)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-01-28 23:14:38 UTC (rev 23820)
@@ -3,25 +3,39 @@
import org.cytoscape.plugin.CyPluginAdapter;
-//
-// Keep these alphabetical by class name
-//
-import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
-//import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.TaskManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+//import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import java.util.Properties;
+
/**
* An implementation of CyPluginAdapter
*/
@@ -29,93 +43,139 @@
//
// Since there are a lot of fields, keep them
- // in alphabetical order to maintain some order.
+ // in alphabetical order to maintain sanity.
// Always make the field name same as the class
// name, but with a lower case first letter.
//
- private final CyTableFactory cyTableFactory;
+ // NOTE that grep and sort are very useful!
+ //
+ private final CyApplicationManager cyApplicationManager;
private final CyEventHelper cyEventHelper;
-// private final CyLayouts cyLayouts;
+ private final CyLayouts cyLayouts;
private final CyNetworkFactory cyNetworkFactory;
private final CyNetworkManager cyNetworkManager;
private final CyNetworkViewFactory cyNetworkViewFactory;
+ private final CyNetworkViewManager cyNetworkViewManager;
+ private final CyNetworkViewReaderManager cyNetworkViewReaderManager;
+ private final CyNetworkViewWriterManager cyNetworkViewWriterManager;
+ private final CyProperty<Properties> cyProperty;
+ private final CyPropertyReaderManager cyPropertyReaderManager;
+ private final CyPropertyWriterManager cyPropertyWriterManager;
private final CyRootNetworkFactory cyRootNetworkFactory;
+ private final CyServiceRegistrar cyServiceRegistrar;
private final CySessionManager cySessionManager;
+ private final CySessionReaderManager cySessionReaderManager;
+ private final CySessionWriterManager cySessionWriterManager;
private final CySwingApplication cySwingApplication;
- private final RenderingEngineFactory presentationFactory;
+ private final CyTableFactory cyTableFactory;
+ private final CyTableManager cyTableManager;
+ private final CyTableReaderManager cyTableReaderManager;
+// private final CyTableWriterManager cyTableWriterManager;
+ private final GUITaskManager guiTaskManager;
+ private final PresentationWriterManager presentationWriterManager;
+ private final RenderingEngineManager renderingEngineManager;
private final TaskManager taskManager;
+ private final UndoSupport undoSupport;
private final VisualMappingManager visualMappingManager;
- private final CyNetworkViewManager networkViewManager;
- private final CyApplicationManager applicationManager;
+ private final VisualStyleFactory visualStyleFactory;
//
// Since this is implementation code, there shouldn't be a
// a problem adding new arguments as needed. Therefore, to
// maintain sanity, keep the arguments in alphabetical order.
//
- CyPluginAdapterImpl(
- CyTableFactory cyTableFactory,
- CyEventHelper cyEventHelper,
-// CyLayouts cyLayouts,
- CyNetworkFactory cyNetworkFactory,
- CyNetworkManager cyNetworkManager,
- CyNetworkViewFactory cyNetworkViewFactory,
- CyRootNetworkFactory cyRootNetworkFactory,
- CySessionManager cySessionManager,
- CySwingApplication cySwingApplication,
- RenderingEngineFactory presentationFactory,
- TaskManager taskManager,
- VisualMappingManager visualMappingManager,
- CyNetworkViewManager networkViewManager,
- CyApplicationManager applicationManager
+ CyPluginAdapterImpl( final CyApplicationManager cyApplicationManager,
+ final CyEventHelper cyEventHelper,
+ final CyLayouts cyLayouts,
+ final CyNetworkFactory cyNetworkFactory,
+ final CyNetworkManager cyNetworkManager,
+ final CyNetworkViewFactory cyNetworkViewFactory,
+ final CyNetworkViewManager cyNetworkViewManager,
+ final CyNetworkViewReaderManager
cyNetworkViewReaderManager,
+ final CyNetworkViewWriterManager
cyNetworkViewWriterManager,
+ final CyProperty<Properties> cyProperty,
+ final CyPropertyReaderManager
cyPropertyReaderManager,
+ final CyPropertyWriterManager
cyPropertyWriterManager,
+ final CyRootNetworkFactory cyRootNetworkFactory,
+ final CyServiceRegistrar cyServiceRegistrar,
+ final CySessionManager cySessionManager,
+ final CySessionReaderManager
cySessionReaderManager,
+ final CySessionWriterManager
cySessionWriterManager,
+ final CySwingApplication cySwingApplication,
+ final CyTableFactory cyTableFactory,
+ final CyTableManager cyTableManager,
+ final CyTableReaderManager cyTableReaderManager,
+// final CyTableWriterManager cyTableWriterManager,
+ final GUITaskManager guiTaskManager,
+ final PresentationWriterManager
presentationWriterManager,
+ final RenderingEngineManager
renderingEngineManager,
+ final TaskManager taskManager,
+ final UndoSupport undoSupport,
+ final VisualMappingManager visualMappingManager,
+ final VisualStyleFactory visualStyleFactory
)
{
- this.cyTableFactory = cyTableFactory;
+ this.cyApplicationManager = cyApplicationManager;
this.cyEventHelper = cyEventHelper;
-// this.cyLayouts = cyLayouts;
+ this.cyLayouts = cyLayouts;
this.cyNetworkFactory = cyNetworkFactory;
this.cyNetworkManager = cyNetworkManager;
this.cyNetworkViewFactory = cyNetworkViewFactory;
+ this.cyNetworkViewManager = cyNetworkViewManager;
+ this.cyNetworkViewReaderManager = cyNetworkViewReaderManager;
+ this.cyNetworkViewWriterManager = cyNetworkViewWriterManager;
+ this.cyProperty = cyProperty;
+ this.cyPropertyReaderManager = cyPropertyReaderManager;
+ this.cyPropertyWriterManager = cyPropertyWriterManager;
this.cyRootNetworkFactory = cyRootNetworkFactory;
+ this.cyServiceRegistrar = cyServiceRegistrar;
this.cySessionManager = cySessionManager;
+ this.cySessionReaderManager = cySessionReaderManager;
+ this.cySessionWriterManager = cySessionWriterManager;
this.cySwingApplication = cySwingApplication;
- this.presentationFactory = presentationFactory;
+ this.cyTableFactory = cyTableFactory;
+ this.cyTableManager = cyTableManager;
+ this.cyTableReaderManager = cyTableReaderManager;
+// this.cyTableWriterManager = cyTableWriterManager;
+ this.guiTaskManager = guiTaskManager;
+ this.presentationWriterManager = presentationWriterManager;
+ this.renderingEngineManager = renderingEngineManager;
this.taskManager = taskManager;
+ this.undoSupport = undoSupport;
this.visualMappingManager = visualMappingManager;
- this.networkViewManager = networkViewManager;
- this.applicationManager = applicationManager;
+ this.visualStyleFactory = visualStyleFactory;
}
-
//
// May as well keep the methods alphabetical too!
//
-
- public CyTableFactory getCyTableFactory() { return cyTableFactory; }
-
+ public CyApplicationManager getCyApplicationManager() { return
cyApplicationManager; }
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
-
-// public CyLayouts getCyLayouts() { return cyLayouts; }
-
+ public CyLayouts getCyLayouts() { return cyLayouts; }
public CyNetworkFactory getCyNetworkFactory() { return
cyNetworkFactory; }
-
public CyNetworkManager getCyNetworkManager() { return
cyNetworkManager; }
-
public CyNetworkViewFactory getCyNetworkViewFactory() { return
cyNetworkViewFactory; }
-
+ public CyNetworkViewManager getCyNetworkViewManager() { return
cyNetworkViewManager; }
+ public CyNetworkViewReaderManager getCyNetworkViewReaderManager() {
return cyNetworkViewReaderManager; }
+ public CyNetworkViewWriterManager getCyNetworkViewWriterManager() {
return cyNetworkViewWriterManager; }
+ public CyProperty<Properties> getCoreProperties() { return cyProperty; }
+ public CyPropertyReaderManager getCyPropertyReaderManager() { return
cyPropertyReaderManager; }
+ public CyPropertyWriterManager getCyPropertyWriterManager() { return
cyPropertyWriterManager; }
public CyRootNetworkFactory getCyRootNetworkFactory() { return
cyRootNetworkFactory; }
-
+ public CyServiceRegistrar getCyServiceRegistrar() { return
cyServiceRegistrar; }
public CySessionManager getCySessionManager() { return
cySessionManager; }
-
- public RenderingEngineFactory getPresentationFactory() { return
presentationFactory; }
-
+ public CySessionReaderManager getCySessionReaderManager() { return
cySessionReaderManager; }
+ public CySessionWriterManager getCySessionWriterManager() { return
cySessionWriterManager; }
+ public CySwingApplication getCySwingApplication() { return
cySwingApplication; }
+ public CyTableFactory getCyTableFactory() { return cyTableFactory; }
+ public CyTableManager getCyTableManager() { return cyTableManager; }
+ public CyTableReaderManager getCyTableReaderManager() { return
cyTableReaderManager; }
+// public CyTableWriterManager getCyTableWriterManager() { return
cyTableWriterManager; }
+ public GUITaskManager getGUITaskManager() { return guiTaskManager; }
+ public PresentationWriterManager getPresentationWriterManager() {
return presentationWriterManager; }
+ public RenderingEngineManager getRenderingEngineManager() { return
renderingEngineManager; }
public TaskManager getTaskManager() { return taskManager; }
-
+ public UndoSupport getUndoSupport() { return undoSupport; }
public VisualMappingManager getVisualMappingManager() { return
visualMappingManager; }
-
- public CyNetworkViewManager getCyNetworkViewManager() { return
networkViewManager; }
-
- public CyApplicationManager getCyApplicationManager() { return
applicationManager; }
-
- public CySwingApplication getCySwingApplication() { return
cySwingApplication; }
+ public VisualStyleFactory getVisualStyleFactory() { return
visualStyleFactory; }
}
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-28 23:14:28 UTC (rev 23819)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-28 23:14:38 UTC (rev 23820)
@@ -11,64 +11,136 @@
make service reference names the class name with a lower case
first letter and with "Ref" as a suffix.
-->
-
- <osgi:reference id="cyDataTableFactoryRef"
- interface="org.cytoscape.model.CyTableFactory">
+ <osgi:reference id="cyApplicationManagerRef"
+ interface="org.cytoscape.session.CyApplicationManager">
</osgi:reference>
- <osgi:reference id="cyEventHelperRef"
+ <osgi:reference id="cyEventHelperRef"
interface="org.cytoscape.event.CyEventHelper">
</osgi:reference>
-<!--
- <osgi:reference id="cyLayoutsRef"
+
+ <osgi:reference id="cyLayoutsRef"
interface="org.cytoscape.view.layout.CyLayouts">
</osgi:reference>
--->
- <osgi:reference id="cyNetworkFactoryRef"
- interface="org.cytoscape.model.CyNetworkFactory">
+
+ <osgi:reference id="cyNetworkFactoryRef"
+ interface="org.cytoscape.model.CyNetworkFactory">
</osgi:reference>
-
- <osgi:reference id="cyNetworkManagerRef"
+
+ <osgi:reference id="cyNetworkManagerRef"
interface="org.cytoscape.model.CyNetworkManager">
</osgi:reference>
-
- <osgi:reference id="cyNetworkViewManagerRef"
+
+ <osgi:reference id="cyNetworkViewFactoryRef"
+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkViewManagerRef"
interface="org.cytoscape.view.model.CyNetworkViewManager">
</osgi:reference>
-
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.session.CyApplicationManager">
+
+ <osgi:reference id="cyNetworkViewReaderManagerRef"
+ interface="org.cytoscape.io.read.CyNetworkViewReaderManager">
</osgi:reference>
- <osgi:reference id="cyNetworkViewFactoryRef"
- interface="org.cytoscape.view.model.CyNetworkViewFactory">
+ <osgi:reference id="cyNetworkViewWriterManagerRef"
+ interface="org.cytoscape.io.write.CyNetworkViewWriterManager">
</osgi:reference>
- <osgi:reference id="cyRootNetworkFactoryRef"
+ <osgi:reference id="cyPropertyRef"
+ interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=coreSettings)">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyReaderManagerRef"
+ interface="org.cytoscape.io.read.CyPropertyReaderManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyWriterManagerRef"
+ interface="org.cytoscape.io.write.CyPropertyWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyRootNetworkFactoryRef"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
</osgi:reference>
- <osgi:reference id="cySessionManagerRef"
+ <osgi:reference id="cyServiceRegistrarRef"
+ interface="org.cytoscape.service.util.CyServiceRegistrar">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionManagerRef"
interface="org.cytoscape.session.CySessionManager">
</osgi:reference>
- <osgi:reference id="cySwingApplicationRef"
+ <osgi:reference id="cySessionReaderManagerRef"
+ interface="org.cytoscape.io.read.CySessionReaderManager">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionWriterManagerRef"
+ interface="org.cytoscape.io.write.CySessionWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="cySwingApplicationRef"
interface="org.cytoscape.application.swing.CySwingApplication">
</osgi:reference>
- <osgi:reference id="presentationFactoryRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineFactory">
+ <osgi:reference id="cyTableFactoryRef"
+ interface="org.cytoscape.model.CyTableFactory">
</osgi:reference>
- <osgi:reference id="taskManagerRef"
- interface="org.cytoscape.work.TaskManager">
+ <osgi:reference id="cyTableManagerRef"
+ interface="org.cytoscape.model.CyTableManager">
</osgi:reference>
- <osgi:reference id="visualMappingManagerRef"
+ <osgi:reference id="cyTableReaderManagerRef"
+ interface="org.cytoscape.io.read.CyTableReaderManager">
+ </osgi:reference>
+
+<!--
+ <osgi:reference id="cyTableWriterManagerRef"
+ interface="org.cytoscape.io.write.CyTableWriterManager">
+ </osgi:reference>
+ -->
+
+ <osgi:reference id="guiTaskManagerRef"
+ interface="org.cytoscape.work.swing.GUITaskManager">
+ </osgi:reference>
+
+ <osgi:reference id="presentationWriterManagerRef"
+ interface="org.cytoscape.io.write.PresentationWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="renderingEngineManagerRef"
+
interface="org.cytoscape.view.presentation.RenderingEngineManager">
+ </osgi:reference>
+
+ <osgi:reference id="taskManagerRef"
+ interface="org.cytoscape.work.TaskManager">
+ </osgi:reference>
+
+ <osgi:reference id="undoSupportRef"
+ interface="org.cytoscape.work.undo.UndoSupport">
+ </osgi:reference>
+
+ <osgi:reference id="visualMappingManagerRef"
interface="org.cytoscape.view.vizmap.VisualMappingManager">
</osgi:reference>
+ <osgi:reference id="visualStyleFactoryRef"
+ interface="org.cytoscape.view.vizmap.VisualStyleFactory">
+ </osgi:reference>
+ <osgi:reference id="cytoscapeVersionService"
+ interface="org.cytoscape.application.swing.CytoscapeVersion" />
+
+ <osgi:reference id="bookmarkServiceRef"
+ interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=bookmarks)" />
+
+ <osgi:reference id="bookmarksUtilServiceRef"
+ interface="org.cytoscape.property.bookmark.BookmarksUtil" />
+
+
<osgi:service id="pluginLoaderTaskFactoryService"
ref="pluginLoaderTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
@@ -81,22 +153,4 @@
<osgi:service id="pluginManagerActionService" ref="pluginManagerAction"
interface="org.cytoscape.application.swing.CyAction" />
- <osgi:reference id="cytoscapeDesktopService"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="cytoscapeVersionService"
- interface="org.cytoscape.application.swing.CytoscapeVersion" />
-
- <osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=bookmarks)" />
- <osgi:reference id="bookmarksUtilServiceRef"
- interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-
- <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager">
- </osgi:reference>
-
- <osgi:reference id="cytoscapePropertiesServiceRef"
- interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=coreSettings)" />
-
</beans>
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-28 23:14:28 UTC (rev 23819)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-28 23:14:38 UTC (rev 23820)
@@ -19,22 +19,37 @@
<!-- constructor args are in alphabetical order! -->
<bean id="cyPluginAdapter"
class="org.cytoscape.plugin.internal.CyPluginAdapterImpl">
- <constructor-arg ref="cyDataTableFactoryRef" />
+ <constructor-arg ref="cyApplicationManagerRef" />
<constructor-arg ref="cyEventHelperRef" />
- <!--
<constructor-arg ref="cyLayoutsRef" />
- -->
<constructor-arg ref="cyNetworkFactoryRef" />
<constructor-arg ref="cyNetworkManagerRef" />
<constructor-arg ref="cyNetworkViewFactoryRef" />
+ <constructor-arg ref="cyNetworkViewManagerRef" />
+ <constructor-arg ref="cyNetworkViewReaderManagerRef" />
+ <constructor-arg ref="cyNetworkViewWriterManagerRef" />
+ <constructor-arg ref="cyPropertyRef" />
+ <constructor-arg ref="cyPropertyReaderManagerRef" />
+ <constructor-arg ref="cyPropertyWriterManagerRef" />
<constructor-arg ref="cyRootNetworkFactoryRef" />
+ <constructor-arg ref="cyServiceRegistrarRef" />
<constructor-arg ref="cySessionManagerRef" />
+ <constructor-arg ref="cySessionReaderManagerRef" />
+ <constructor-arg ref="cySessionWriterManagerRef" />
<constructor-arg ref="cySwingApplicationRef" />
- <constructor-arg ref="presentationFactoryRef" />
+ <constructor-arg ref="cyTableFactoryRef" />
+ <constructor-arg ref="cyTableManagerRef" />
+ <constructor-arg ref="cyTableReaderManagerRef" />
+ <!--
+ <constructor-arg ref="cyTableWriterManagerRef" />
+ -->
+ <constructor-arg ref="guiTaskManagerRef" />
+ <constructor-arg ref="presentationWriterManagerRef" />
+ <constructor-arg ref="renderingEngineManagerRef" />
<constructor-arg ref="taskManagerRef" />
+ <constructor-arg ref="undoSupportRef" />
<constructor-arg ref="visualMappingManagerRef" />
- <constructor-arg ref="cyNetworkViewManagerRef" />
- <constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="visualStyleFactoryRef" />
</bean>
<bean id="pluginLoaderTaskFactory"
class="org.cytoscape.plugin.internal.PluginLoaderTaskFactory">
@@ -43,13 +58,13 @@
<bean id="pluginManagerAction"
class="org.cytoscape.plugin.internal.action.PluginManagerAction">
- <constructor-arg ref="cytoscapeDesktopService" />
+ <constructor-arg ref="cySwingApplicationRef" />
<constructor-arg ref="cyApplicationManagerRef" />
<constructor-arg ref="cytoscapeVersionService" />
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
- <constructor-arg ref="cytoscapePropertiesServiceRef" />
+ <constructor-arg ref="guiTaskManagerRef" />
+ <constructor-arg ref="cyPropertyRef" />
<constructor-arg ref="cyPluginAdapter" />
</bean>
Modified:
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
===================================================================
---
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2011-01-28 23:14:28 UTC (rev 23819)
+++
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2011-01-28 23:14:38 UTC (rev 23820)
@@ -1,21 +1,42 @@
package org.cytoscape.plugin.internal;
+
+import org.cytoscape.plugin.CyPluginAdapter;
+import org.cytoscape.plugin.CyPluginAdapterTest;
+
+import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.application.swing.CySwingApplication;
-//import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.TaskManager;
-import org.cytoscape.plugin.CyPluginAdapterTest;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+//import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import java.util.Properties;
+
+
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -23,38 +44,37 @@
@Before
public void setUp() {
-
- CyTableFactory cyTableFactory = mock(CyTableFactory.class);
- CyEventHelper cyEventHelper = mock(CyEventHelper.class);
-// CyLayouts cyLayouts = mock(CyLayouts.class);
- CyNetworkFactory cyNetworkFactory =
mock(CyNetworkFactory.class);
- CyNetworkManager cyNetworkManager =
mock(CyNetworkManager.class);
- CyNetworkViewFactory cyNetworkViewFactory =
mock(CyNetworkViewFactory.class);
- CyRootNetworkFactory cyRootNetworkFactory =
mock(CyRootNetworkFactory.class);
- CySessionManager cySessionManager =
mock(CySessionManager.class);
- CySwingApplication cySwingApplication =
mock(CySwingApplication.class);
- RenderingEngineFactory presentationFactory =
mock(RenderingEngineFactory.class);
- TaskManager taskManager = mock(TaskManager.class);
- VisualMappingManager visualMappingManager =
mock(VisualMappingManager.class);
- CyNetworkViewManager networkViewManager =
mock(CyNetworkViewManager.class);
- CyApplicationManager applicationManager =
mock(CyApplicationManager.class);
-
adapter = new CyPluginAdapterImpl(
- cyTableFactory,
- cyEventHelper,
-// cyLayouts,
- cyNetworkFactory,
- cyNetworkManager,
- cyNetworkViewFactory,
- cyRootNetworkFactory,
- cySessionManager,
- cySwingApplication,
- presentationFactory,
- taskManager,
- visualMappingManager,
- networkViewManager,
- applicationManager
- );
+ mock(CyApplicationManager.class),
+ mock(CyEventHelper.class),
+ mock(CyLayouts.class),
+ mock(CyNetworkFactory.class),
+ mock(CyNetworkManager.class),
+ mock(CyNetworkViewFactory.class),
+ mock(CyNetworkViewManager.class),
+ mock(CyNetworkViewReaderManager.class),
+ mock(CyNetworkViewWriterManager.class),
+ (CyProperty<Properties>)mock(CyProperty.class),
+ mock(CyPropertyReaderManager.class),
+ mock(CyPropertyWriterManager.class),
+ mock(CyRootNetworkFactory.class),
+ mock(CyServiceRegistrar.class),
+ mock(CySessionManager.class),
+ mock(CySessionReaderManager.class),
+ mock(CySessionWriterManager.class),
+ mock(CySwingApplication.class),
+ mock(CyTableFactory.class),
+ mock(CyTableManager.class),
+ mock(CyTableReaderManager.class),
+// mock(CyTableWriterManager.class),
+ mock(GUITaskManager.class),
+ mock(PresentationWriterManager.class),
+ mock(RenderingEngineManager.class),
+ mock(TaskManager.class),
+ mock(UndoSupport.class),
+ mock(VisualMappingManager.class),
+ mock(VisualStyleFactory.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.
