Author: paperwing
Date: 2012-02-15 14:57:18 -0800 (Wed, 15 Feb 2012)
New Revision: 28288
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
Log:
Updated swing-application implementation to use ExternalRenderer for creation
of main view RenderingEngine
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-02-15 22:41:27 UTC (rev 28287)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-02-15 22:57:18 UTC (rev 28288)
@@ -207,7 +207,8 @@
NetworkViewManager networkViewManager = new
NetworkViewManager(cyApplicationManagerServiceRef,
cyNetworkViewManagerServiceRef,
cytoscapePropertiesServiceRef,
-
cyHelpBroker);
+
cyHelpBroker,
+
externalRendererManagerServiceRef);
BirdsEyeViewHandler birdsEyeViewHandler = new
BirdsEyeViewHandler(cyApplicationManagerServiceRef,
networkViewManager,
externalRendererManagerServiceRef);
Modified:
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-02-15 22:41:27 UTC (rev 28287)
+++
csplugins/trunk/toronto/yuedong/multi_renderer/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-02-15 22:57:18 UTC (rev 28288)
@@ -56,6 +56,7 @@
import org.cytoscape.application.events.SetCurrentNetworkListener;
import org.cytoscape.application.events.SetCurrentNetworkViewEvent;
import org.cytoscape.application.events.SetCurrentNetworkViewListener;
+import org.cytoscape.application.presentation.MainViewRenderingEngineFactory;
import org.cytoscape.application.swing.CyHelpBroker;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableEntry;
@@ -69,6 +70,7 @@
import org.cytoscape.view.model.events.NetworkViewChangedEvent;
import org.cytoscape.view.model.events.NetworkViewChangedListener;
import org.cytoscape.view.model.events.ViewChangeRecord;
+import org.cytoscape.view.presentation.ExternalRendererManager;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
@@ -117,6 +119,8 @@
private final CyNetworkViewManager networkViewManager;
private final CyApplicationManager applicationManager;
+ private final ExternalRendererManager externalRendererManager;
+
/**
* Creates a new NetworkViewManager object.
*
@@ -124,7 +128,8 @@
* DOCUMENT ME!
*/
public NetworkViewManager(CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr,
- CyProperty<Properties> cyProps, CyHelpBroker help) {
+ CyProperty<Properties> cyProps, CyHelpBroker help,
+ ExternalRendererManager externalRendererManager) {
if (appMgr == null)
throw new NullPointerException("CyApplicationManager is
null.");
@@ -138,6 +143,7 @@
this.props = cyProps.getProperties();
this.desktopPane = new JDesktopPane();
+ this.externalRendererManager = externalRendererManager;
// add Help hooks
help.getHelpBroker().enableHelp(desktopPane,
"network-view-manager", null);
@@ -367,7 +373,18 @@
final long start = System.currentTimeMillis();
logger.debug("Rendering start: view model = " + view.getSUID());
- final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.createRenderingEngine(iframe, view);
+
+ RenderingEngineFactory<CyNetwork> factory;
+ RenderingEngine<CyNetwork> renderingEngine = null;
+
+ if (externalRendererManager.getCurrentRenderer() != null) {
+ factory =
externalRendererManager.getCurrentRenderer().getRenderingEngineFactory(MainViewRenderingEngineFactory.class);
+
+ if (factory != null) {
+ renderingEngine =
factory.createRenderingEngine(iframe, view);
+ }
+ }
+
logger.debug("Rendering finished in " +
(System.currentTimeMillis() - start) + " m sec.");
presentationMap.put(view, renderingEngine);
--
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.
