Author: kono
Date: 2010-08-04 16:03:04 -0700 (Wed, 04 Aug 2010)
New Revision: 21206
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
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
Log:
Presentation module classes are renamed for consistency.
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
2010-08-04 23:02:35 UTC (rev 21205)
+++
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2010-08-04 23:03:04 UTC (rev 21206)
@@ -6,7 +6,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.layout.CyLayouts;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.session.CySessionManager;
@@ -94,10 +94,10 @@
//
/**
- * Returns an instance of {...@link PresentationFactory}.
- * @return an instance of {...@link PresentationFactory}.
+ * Returns an instance of {...@link RenderingEngineFactory}.
+ * @return an instance of {...@link RenderingEngineFactory}.
*/
- PresentationFactory getPresentationFactory();
+ RenderingEngineFactory getPresentationFactory();
//
// vizmap api
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
2010-08-04 23:02:35 UTC (rev 21205)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2010-08-04 23:03:04 UTC (rev 21206)
@@ -14,7 +14,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.work.TaskManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -38,7 +38,7 @@
private final CyNetworkViewFactory cyNetworkViewFactory;
private final CyRootNetworkFactory cyRootNetworkFactory;
private final CySessionManager cySessionManager;
- private final PresentationFactory presentationFactory;
+ private final RenderingEngineFactory presentationFactory;
private final TaskManager taskManager;
private final VisualMappingManager visualMappingManager;
@@ -56,7 +56,7 @@
CyNetworkViewFactory cyNetworkViewFactory,
CyRootNetworkFactory cyRootNetworkFactory,
CySessionManager cySessionManager,
- PresentationFactory presentationFactory,
+ RenderingEngineFactory presentationFactory,
TaskManager taskManager,
VisualMappingManager visualMappingManager
) {
@@ -94,7 +94,7 @@
public CySessionManager getCySessionManager() { return
cySessionManager; }
- public PresentationFactory getPresentationFactory() { return
presentationFactory; }
+ public RenderingEngineFactory getPresentationFactory() { return
presentationFactory; }
public TaskManager getTaskManager() { return taskManager; }
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
2010-08-04 23:02:35 UTC (rev 21205)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-04 23:03:04 UTC (rev 21206)
@@ -45,7 +45,7 @@
</osgi:reference>
<osgi:reference id="presentationFactoryRef"
- interface="org.cytoscape.view.presentation.PresentationFactory">
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory">
</osgi:reference>
<osgi:reference id="taskManagerRef"
--
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.
