Author: kono
Date: 2011-10-27 16:41:53 -0700 (Thu, 27 Oct 2011)
New Revision: 27322
Modified:
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.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
core3/impl/trunk/plugin-impl/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
Log:
Methods to get mapping factories had been added.
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-10-27 23:33:20 UTC (rev 27321)
+++
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-10-27 23:41:53 UTC (rev 27322)
@@ -25,6 +25,8 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.vizmap.VisualMappingFunction;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.TaskManager;
@@ -182,6 +184,14 @@
* @return an instance of {@link VisualStyleFactory}.
*/
VisualStyleFactory getVisualStyleFactory();
+
+ /**
+ * Returns an instance of {@link VisualMappingFunctionFactory}.
+ * @return an instance of {@link VisualMappingFunctionFactory}.
+ */
+ VisualMappingFunctionFactory
getVisualMappingFunctionContinuousFactory();
+ VisualMappingFunctionFactory getVisualMappingFunctionDiscreteFactory();
+ VisualMappingFunctionFactory
getVisualMappingFunctionPassthroughFactory();
//
// layout api
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-10-27 23:33:20 UTC (rev 27321)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
2011-10-27 23:41:53 UTC (rev 27322)
@@ -14,6 +14,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.io.read.CySessionReaderManager;
import org.cytoscape.work.TaskManager;
@@ -92,8 +93,13 @@
CyProperty bookmarkServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=bookmarks)");
BookmarksUtil bookmarksUtilServiceRef =
getService(bc,BookmarksUtil.class);
CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
+
+ VisualMappingFunctionFactory vmfFactoryC =
getService(bc,VisualMappingFunctionFactory.class, "(mapping.type=continuous)");
+ VisualMappingFunctionFactory vmfFactoryD =
getService(bc,VisualMappingFunctionFactory.class, "(mapping.type=discrete)");
+ 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,dialogTaskManagerRef,panelTaskManagerRef,submenuTaskManagerRef,presentationWriterManagerRef,renderingEngineManagerRef,taskManagerRef,undoSupportRef,visualMappingManagerRef,visualStyleFactoryRef);
+ 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,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-10-27 23:33:20 UTC (rev 27321)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-10-27 23:41:53 UTC (rev 27322)
@@ -51,6 +51,7 @@
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.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.events.VisualStyleAboutToBeRemovedEvent;
@@ -155,6 +156,9 @@
private DataImportFinishedEvent dataImportFinishedEvent;
private DropNetworkViewTaskFactory dropNetworkViewTaskFactory;
private CyPlugin cyPlugin;
+ private final VisualMappingFunctionFactory
visualMappingFunctionContinuousFactory;
+ private final VisualMappingFunctionFactory
visualMappingFunctionDiscreteFactory;
+ private final VisualMappingFunctionFactory
visualMappingFunctionPassthroughFactory;
//
// Since this is implementation code, there shouldn't be a
@@ -190,6 +194,9 @@
final RenderingEngineManager
renderingEngineManager,
final TaskManager taskManager,
final UndoSupport undoSupport,
+ final VisualMappingFunctionFactory
visualMappingFunctionContinuousFactory,
+ final VisualMappingFunctionFactory
visualMappingFunctionDiscreteFactory,
+ final VisualMappingFunctionFactory
visualMappingFunctionPassthroughFactory,
final VisualMappingManager visualMappingManager,
final VisualStyleFactory visualStyleFactory
)
@@ -223,6 +230,9 @@
this.renderingEngineManager = renderingEngineManager;
this.taskManager = taskManager;
this.undoSupport = undoSupport;
+ this.visualMappingFunctionContinuousFactory =
visualMappingFunctionContinuousFactory;
+ this.visualMappingFunctionDiscreteFactory =
visualMappingFunctionDiscreteFactory;
+ this.visualMappingFunctionPassthroughFactory =
visualMappingFunctionPassthroughFactory;
this.visualMappingManager = visualMappingManager;
this.visualStyleFactory = visualStyleFactory;
}
@@ -259,6 +269,9 @@
public RenderingEngineManager getRenderingEngineManager() { return
renderingEngineManager; }
public TaskManager getTaskManager() { return taskManager; }
public UndoSupport getUndoSupport() { return undoSupport; }
+ @Override public VisualMappingFunctionFactory
getVisualMappingFunctionContinuousFactory() { return
visualMappingFunctionContinuousFactory; }
+ @Override public VisualMappingFunctionFactory
getVisualMappingFunctionDiscreteFactory() { return
visualMappingFunctionDiscreteFactory; }
+ @Override public VisualMappingFunctionFactory
getVisualMappingFunctionPassthroughFactory() { return
visualMappingFunctionPassthroughFactory; }
public VisualMappingManager getVisualMappingManager() { return
visualMappingManager; }
public VisualStyleFactory getVisualStyleFactory() { return
visualStyleFactory; }
}
Modified:
core3/impl/trunk/plugin-impl/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2011-10-27 23:33:20 UTC (rev 27321)
+++
core3/impl/trunk/plugin-impl/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2011-10-27 23:41:53 UTC (rev 27322)
@@ -29,6 +29,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.TaskManager;
@@ -72,6 +73,9 @@
mock(RenderingEngineManager.class),
mock(TaskManager.class),
mock(UndoSupport.class),
+ mock(VisualMappingFunctionFactory.class),
+ mock(VisualMappingFunctionFactory.class),
+ mock(VisualMappingFunctionFactory.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.
