Author: jm
Date: 2011-05-02 09:30:59 -0700 (Mon, 02 May 2011)
New Revision: 24886
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/CPath2Factory.java
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
core3/cpath2-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/gui-distribution/trunk/startlevel-3/pom.xml
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/plugin-api/trunk/pom.xml
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
core3/plugin-impl/trunk/pom.xml
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/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Fixed build breakage due to rename of CyLayouts to CyLayoutAlgorithmManager
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -70,7 +70,7 @@
<osgi:reference id="renderingEngineManagerServiceRef"
interface="org.cytoscape.view.presentation.RenderingEngineManager" />
- <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayouts" />
+ <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager" />
<osgi:reference id="cyTableWriterManagerRef"
interface="org.cytoscape.io.write.CyTableWriterManager" />
Modified:
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/CPath2Factory.java
===================================================================
---
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/CPath2Factory.java
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/CPath2Factory.java
2011-05-02 16:30:59 UTC (rev 24886)
@@ -40,7 +40,7 @@
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.util.swing.OpenBrowser;
-import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskManager;
@@ -59,13 +59,13 @@
private final CyNetworkViewReaderManager networkViewReaderManager;
private final CyNetworkNaming naming;
private final CyNetworkFactory networkFactory;
- private final CyLayouts layouts;
+ private final CyLayoutAlgorithmManager layoutManager;
private final UndoSupport undoSupport;
private final BioPaxContainer bpContainer;
private final MapBioPaxToCytoscapeFactory mapperFactory;
private final NetworkListener networkListener;
- public CPath2Factory(CySwingApplication application, TaskManager
taskManager, OpenBrowser openBrowser, CyNetworkManager networkManager,
CyApplicationManager applicationManager, CyNetworkViewManager
networkViewManager, CyNetworkViewReaderManager networkViewReaderManager,
CyNetworkNaming naming, CyNetworkFactory networkFactory, CyLayouts layouts,
UndoSupport undoSupport, BioPaxContainer bpContainer,
MapBioPaxToCytoscapeFactory mapperFactory, NetworkListener networkListener) {
+ public CPath2Factory(CySwingApplication application, TaskManager
taskManager, OpenBrowser openBrowser, CyNetworkManager networkManager,
CyApplicationManager applicationManager, CyNetworkViewManager
networkViewManager, CyNetworkViewReaderManager networkViewReaderManager,
CyNetworkNaming naming, CyNetworkFactory networkFactory,
CyLayoutAlgorithmManager layouts, UndoSupport undoSupport, BioPaxContainer
bpContainer, MapBioPaxToCytoscapeFactory mapperFactory, NetworkListener
networkListener) {
this.application = application;
this.taskManager = taskManager;
this.openBrowser = openBrowser;
@@ -74,7 +74,7 @@
this.networkViewManager = networkViewManager;
this.networkViewReaderManager = networkViewReaderManager;
this.naming = naming;
- this.layouts = layouts;
+ this.layoutManager = layouts;
this.networkFactory = networkFactory;
this.undoSupport = undoSupport;
this.bpContainer = bpContainer;
@@ -197,7 +197,7 @@
return networkManager;
}
- public CyLayouts getCyLayouts() {
- return layouts;
+ public CyLayoutAlgorithmManager getCyLayoutAlgorithmManager() {
+ return layoutManager;
}
}
Modified:
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
===================================================================
---
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2011-05-02 16:30:59 UTC (rev 24886)
@@ -40,7 +40,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyRow;
import org.cytoscape.session.CyNetworkNaming;
-import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.Task;
@@ -225,8 +225,8 @@
taskMonitor.setProgress(1.0);
}
- CyLayouts layouts = cPathFactory.getCyLayouts();
- TaskFactory tf = layouts.getDefaultLayout(view);
+ CyLayoutAlgorithmManager layoutManager =
cPathFactory.getCyLayoutAlgorithmManager();
+ TaskFactory tf = layoutManager.getDefaultLayout();
TaskIterator ti = tf.getTaskIterator();
Task task = ti.next();
insertTasksAfterCurrentTask(task);
Modified:
core3/cpath2-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/cpath2-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/cpath2-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -35,7 +35,7 @@
interface="org.cytoscape.model.CyNetworkFactory" />
<osgi:reference id="cyLayoutsRef"
- interface="org.cytoscape.view.layout.CyLayouts" />
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager"
/>
<osgi:reference id="undoSupportRef"
interface="org.cytoscape.work.undo.UndoSupport" />
Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-05-02 12:21:24 UTC
(rev 24885)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-05-02 16:30:59 UTC
(rev 24886)
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>plugin-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -9,7 +9,7 @@
<!-- Import services -->
<osgi:reference id="cyEventHelperRef"
interface="org.cytoscape.event.CyEventHelper" />
- <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayouts" />
+ <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager" />
<osgi:reference id="cyNetworkFactoryServiceRef"
interface="org.cytoscape.model.CyNetworkFactory" />
@@ -76,6 +76,10 @@
<osgi:service id="propertyWriterManagerService"
ref="propertyWriterManager"
interface="org.cytoscape.io.write.CyPropertyWriterManager">
</osgi:service>
+
+ <osgi:service id="cyTableWriterManagerService" ref="tableWriterManager"
+ interface="org.cytoscape.io.write.CyTableWriterManager">
+ </osgi:service>
<osgi:service id="sifNetworkViewReaderFactoryService"
ref="sifNetworkViewReaderFactory"
interface="org.cytoscape.io.read.InputStreamTaskFactory">
Modified: core3/plugin-api/trunk/pom.xml
===================================================================
--- core3/plugin-api/trunk/pom.xml 2011-05-02 12:21:24 UTC (rev 24885)
+++ core3/plugin-api/trunk/pom.xml 2011-05-02 16:30:59 UTC (rev 24886)
@@ -180,7 +180,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>layout-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
===================================================================
---
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-05-02 16:30:59 UTC (rev 24886)
@@ -1,37 +1,36 @@
package org.cytoscape.plugin;
+import java.util.Properties;
+
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-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.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 org.cytoscape.work.undo.UndoSupport;
-import java.util.Properties;
-
/**
* A Java-only api providing access to Cytoscape functionality.
* This class will provide access the various Manager and
@@ -175,7 +174,7 @@
* Returns an instance of {@link CyLayouts}.
* @return an instance of {@link CyLayouts}.
*/
- CyLayouts getCyLayouts();
+ CyLayoutAlgorithmManager getCyLayouts();
//
// swing application api
Modified: core3/plugin-impl/trunk/pom.xml
===================================================================
--- core3/plugin-impl/trunk/pom.xml 2011-05-02 12:21:24 UTC (rev 24885)
+++ core3/plugin-impl/trunk/pom.xml 2011-05-02 16:30:59 UTC (rev 24886)
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>plugin-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<!-- dependencies needed for plugin manager -->
@@ -195,7 +195,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>plugin-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
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-05-02 12:21:24 UTC (rev 24885)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-05-02 16:30:59 UTC (rev 24886)
@@ -3,76 +3,68 @@
import java.util.Properties;
-import org.cytoscape.plugin.CyPluginAdapter;
-
+import org.cytoscape.application.swing.CyAction;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.swing.events.CytoPanelComponentSelectedEvent;
+import org.cytoscape.dnd.DropNetworkViewTaskFactory;
+import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.read.CyNetworkViewReader;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.util.StreamUtil;
+import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
+import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
+import org.cytoscape.io.webservice.events.DataImportFinishedEvent;
+import org.cytoscape.io.write.CyNetworkViewWriterFactory;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.events.AboutToRemoveEdgeEvent;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.plugin.CyPlugin;
+import org.cytoscape.plugin.CyPluginAdapter;
+import org.cytoscape.property.BasicCyProperty;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+import org.cytoscape.property.session.Cysession;
+import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
+import org.cytoscape.session.events.SessionAboutToBeSavedEvent;
+import org.cytoscape.task.NetworkTaskFactory;
+import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
+import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.model.events.AboutToRemoveEdgeViewMicroListener;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedEvent;
+import org.cytoscape.view.presentation.property.AbstractVisualLexicon;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.work.TaskManager;
-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;
-
-//
-// The following imports are necessary to trick BND into
-// importing the packages containing these packages.
-//
-import org.cytoscape.session.events.SessionAboutToBeSavedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleAboutToBeRemovedEvent;
-import org.cytoscape.view.model.events.AboutToRemoveEdgeViewMicroListener;
-import org.cytoscape.model.events.AboutToRemoveEdgeEvent;
-import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedEvent;
-import org.cytoscape.view.presentation.property.AbstractVisualLexicon;
-import org.cytoscape.property.BasicCyProperty;
-import org.cytoscape.property.bookmark.BookmarksUtil;
-import org.cytoscape.property.session.Cysession;
-import org.cytoscape.task.NetworkTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.undo.UndoSupport;
-import org.cytoscape.work.util.BoundedDouble;
-import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.application.swing.events.CytoPanelComponentSelectedEvent;
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.read.CyNetworkViewReader;
-import org.cytoscape.io.util.StreamUtil;
-import org.cytoscape.io.write.CyNetworkViewWriterFactory;
-import org.cytoscape.work.swing.AbstractGUITunableHandler;
-import org.cytoscape.work.spring.SpringTunableInterceptor;
-import org.cytoscape.view.layout.AbstractLayout;
-import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.view.vizmap.gui.AbstractVisualPropertyDependency;
import org.cytoscape.view.vizmap.gui.action.VizMapUIAction;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.event.LexiconStateChangedEvent;
import org.cytoscape.view.vizmap.gui.util.ContinuousMappingGenerator;
-import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
-import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
-import org.cytoscape.io.webservice.events.DataImportFinishedEvent;
-import org.cytoscape.dnd.DropNetworkViewTaskFactory;
-import org.cytoscape.plugin.CyPlugin;
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.spring.SpringTunableInterceptor;
+import org.cytoscape.work.swing.AbstractGUITunableHandler;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.util.BoundedDouble;
/**
@@ -90,7 +82,7 @@
//
private final CyApplicationManager cyApplicationManager;
private final CyEventHelper cyEventHelper;
- private final CyLayouts cyLayouts;
+ private final CyLayoutAlgorithmManager cyLayouts;
private final CyNetworkFactory cyNetworkFactory;
private final CyNetworkManager cyNetworkManager;
private final CyNetworkViewFactory cyNetworkViewFactory;
@@ -147,7 +139,7 @@
private CyNetworkViewWriterFactory cyNetworkViewWriterFactory;
private AbstractGUITunableHandler abstractGUITunableHandler;
private SpringTunableInterceptor springTunableInterceptor;
- private AbstractLayout abstractLayout;
+ private AbstractLayoutAlgorithm abstractLayout;
private AbstractFunction abstractFunction;
private AbstractVisualPropertyDependency
abstractVisualPropertyDependency;
private VizMapUIAction vizMapUIAction;
@@ -167,7 +159,7 @@
//
CyPluginAdapterImpl( final CyApplicationManager cyApplicationManager,
final CyEventHelper cyEventHelper,
- final CyLayouts cyLayouts,
+ final CyLayoutAlgorithmManager cyLayouts,
final CyNetworkFactory cyNetworkFactory,
final CyNetworkManager cyNetworkManager,
final CyNetworkViewFactory cyNetworkViewFactory,
@@ -232,7 +224,7 @@
//
public CyApplicationManager getCyApplicationManager() { return
cyApplicationManager; }
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
- public CyLayouts getCyLayouts() { return cyLayouts; }
+ public CyLayoutAlgorithmManager getCyLayouts() { return cyLayouts; }
public CyNetworkFactory getCyNetworkFactory() { return
cyNetworkFactory; }
public CyNetworkManager getCyNetworkManager() { return
cyNetworkManager; }
public CyNetworkViewFactory getCyNetworkViewFactory() { return
cyNetworkViewFactory; }
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-05-02 12:21:24 UTC (rev 24885)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -20,7 +20,7 @@
</osgi:reference>
<osgi:reference id="cyLayoutsRef"
- interface="org.cytoscape.view.layout.CyLayouts">
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
</osgi:reference>
<osgi:reference id="cyNetworkFactoryRef"
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-05-02 12:21:24 UTC (rev 24885)
+++
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2011-05-02 16:30:59 UTC (rev 24886)
@@ -1,43 +1,39 @@
package org.cytoscape.plugin.internal;
-import org.cytoscape.plugin.CyPluginAdapter;
-import org.cytoscape.plugin.CyPluginAdapterTest;
+import static org.mockito.Mockito.mock;
+import java.util.Properties;
+
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.plugin.CyPluginAdapterTest;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-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.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.cytoscape.work.undo.UndoSupport;
import org.junit.Before;
public class CyPluginAdapterImplTest extends CyPluginAdapterTest {
@@ -47,7 +43,7 @@
adapter = new CyPluginAdapterImpl(
mock(CyApplicationManager.class),
mock(CyEventHelper.class),
- mock(CyLayouts.class),
+ mock(CyLayoutAlgorithmManager.class),
mock(CyNetworkFactory.class),
mock(CyNetworkManager.class),
mock(CyNetworkViewFactory.class),
Modified:
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -8,7 +8,7 @@
<!-- Import OSGi services -->
<osgi:reference id="cyLayoutsServiceRef"
- interface="org.cytoscape.view.layout.CyLayouts" />
+
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager" />
<osgi:reference id="cyNetworkFactoryServiceRef"
interface="org.cytoscape.model.CyNetworkFactory" />
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -58,7 +58,7 @@
<osgi:reference id="cyNetworkViewFactoryServiceRef"
interface="org.cytoscape.view.model.CyNetworkViewFactory" />
- <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayouts">
+ <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
</osgi:reference>
<osgi:reference id="undoSupportServiceRef"
interface="org.cytoscape.work.undo.UndoSupport">
Modified:
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 12:21:24 UTC (rev 24885)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-02 16:30:59 UTC (rev 24886)
@@ -10,7 +10,7 @@
default-lazy-init="false">
<!-- Import services -->
- <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayouts" />
+ <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager" />
<osgi:reference id="cyNetworkFactoryServiceRef"
interface="org.cytoscape.model.CyNetworkFactory" />
<osgi:reference id="cyNetworkViewFactoryServiceRef"
interface="org.cytoscape.view.model.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.
