Author: pwang
Date: 2011-11-30 16:08:13 -0800 (Wed, 30 Nov 2011)
New Revision: 27672
Modified:
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
core3/api/trunk/plugin-api/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
Log:
Fixed bug#435
Modified:
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
===================================================================
---
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-11-30 23:59:00 UTC (rev 27671)
+++
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-12-01 00:08:13 UTC (rev 27672)
@@ -211,7 +211,7 @@
* Returns an instance of {@link CyLayoutAlgorithmManager}.
* @return an instance of {@link CyLayoutAlgorithmManager}.
*/
- CyLayoutAlgorithmManager getCyLayouts();
+ CyLayoutAlgorithmManager getCyLayoutAlgorithmManager();
//
// swing application api
Modified:
core3/api/trunk/plugin-api/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
===================================================================
---
core3/api/trunk/plugin-api/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2011-11-30 23:59:00 UTC (rev 27671)
+++
core3/api/trunk/plugin-api/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2011-12-01 00:08:13 UTC (rev 27672)
@@ -19,8 +19,8 @@
}
@Test
- public void testGetCyLayouts() {
- assertNotNull("CyLayouts exists", adapter.getCyLayouts());
+ public void testGetCyLayoutAlgorithmManager() {
+ assertNotNull("CyLayouts exists",
adapter.getCyLayoutAlgorithmManager());
}
@Test
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
2011-11-30 23:59:00 UTC (rev 27671)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
2011-12-01 00:08:13 UTC (rev 27672)
@@ -61,7 +61,7 @@
CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
CyEventHelper cyEventHelperRef =
getService(bc,CyEventHelper.class);
- CyLayoutAlgorithmManager cyLayoutsRef =
getService(bc,CyLayoutAlgorithmManager.class);
+ CyLayoutAlgorithmManager cyLayoutAlgorithmManagerRef =
getService(bc,CyLayoutAlgorithmManager.class);
CyNetworkFactory cyNetworkFactoryRef =
getService(bc,CyNetworkFactory.class);
CyNetworkManager cyNetworkManagerRef =
getService(bc,CyNetworkManager.class);
CyNetworkViewFactory cyNetworkViewFactoryRef =
getService(bc,CyNetworkViewFactory.class);
@@ -99,7 +99,7 @@
VisualMappingFunctionFactory vmfFactoryP =
getService(bc,VisualMappingFunctionFactory.class, "(mapping.type=passthrough)");
- CyPluginAdapterImpl cyPluginAdapter = new
CyPluginAdapterImpl(cyApplicationManagerRef,cyEventHelperRef,cyLayoutsRef,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);
+ CyPluginAdapterImpl cyPluginAdapter = new
CyPluginAdapterImpl(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);
PluginLoaderTaskFactory pluginLoaderTaskFactory = new
PluginLoaderTaskFactory(cyPluginAdapter);
PluginManagerAction pluginManagerAction = new
PluginManagerAction(cySwingApplicationRef,cyApplicationManagerRef,cytoscapeVersionService,bookmarkServiceRef,bookmarksUtilServiceRef,dialogTaskManagerRef,cyPropertyRef,cyPluginAdapter,pluginLoaderTaskFactory,cyApplicationConfigurationServiceRef);
StartupMostlyFinished startupMostlyFinished = new
StartupMostlyFinished(cyEventHelperRef);
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-11-30 23:59:00 UTC (rev 27671)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-12-01 00:08:13 UTC (rev 27672)
@@ -83,7 +83,7 @@
//
private final CyApplicationManager cyApplicationManager;
private final CyEventHelper cyEventHelper;
- private final CyLayoutAlgorithmManager cyLayouts;
+ private final CyLayoutAlgorithmManager cyLayoutAlgorithmManager;
private final CyNetworkFactory cyNetworkFactory;
private final CyNetworkManager cyNetworkManager;
private final CyNetworkViewFactory cyNetworkViewFactory;
@@ -163,7 +163,7 @@
//
CyPluginAdapterImpl( final CyApplicationManager cyApplicationManager,
final CyEventHelper cyEventHelper,
- final CyLayoutAlgorithmManager cyLayouts,
+ final CyLayoutAlgorithmManager
cyLayoutAlgorithmManager,
final CyNetworkFactory cyNetworkFactory,
final CyNetworkManager cyNetworkManager,
final CyNetworkViewFactory cyNetworkViewFactory,
@@ -200,7 +200,7 @@
{
this.cyApplicationManager = cyApplicationManager;
this.cyEventHelper = cyEventHelper;
- this.cyLayouts = cyLayouts;
+ this.cyLayoutAlgorithmManager = cyLayoutAlgorithmManager;
this.cyNetworkFactory = cyNetworkFactory;
this.cyNetworkManager = cyNetworkManager;
this.cyNetworkViewFactory = cyNetworkViewFactory;
@@ -240,7 +240,7 @@
//
public CyApplicationManager getCyApplicationManager() { return
cyApplicationManager; }
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
- public CyLayoutAlgorithmManager getCyLayouts() { return cyLayouts; }
+ public CyLayoutAlgorithmManager getCyLayoutAlgorithmManager() { return
cyLayoutAlgorithmManager; }
public CyNetworkFactory getCyNetworkFactory() { return
cyNetworkFactory; }
public CyNetworkManager getCyNetworkManager() { return
cyNetworkManager; }
public CyNetworkViewFactory getCyNetworkViewFactory() { return
cyNetworkViewFactory; }
--
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.
