Author: kono
Date: 2012-03-29 14:34:37 -0700 (Thu, 29 Mar 2012)
New Revision: 28697
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
Log:
RenderingEngineFactories do not register rendering engine instances to the
manager anymore. Users should register them manually.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -75,23 +75,11 @@
// Register this rendering engine as service.
this.registrar.registerAllServices(bev, new Properties());
-
- this.renderingEngineManager.addRenderingEngine(bev);
logger.debug("Bird's Eye View had been set to the component.
Network Model = " + view.getModel().getSUID());
return bev;
}
- /**
- * Catch the events from view model layer.
- */
-// @Override
-// public void handleEvent(UpdateNetworkPresentationEvent nvce) {
-// System.out.println("BEV got update view event: " +
nvce.getSource());
-// //DGraphView gv = viewMap.get(nvce.getSource());
-//// if (gv != null)
-//// gv.updateView();
-// }
@Override
public VisualLexicon getVisualLexicon() {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -137,9 +137,6 @@
registrar.registerAllServices(dgv, new Properties());
final AddDeleteHandler addDeleteHandler = new
AddDeleteHandler(dgv);
registrar.registerAllServices(addDeleteHandler, new
Properties());
-
- // Register engine to manager
- this.renderingEngineManager.addRenderingEngine(dgv);
return dgv;
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -131,7 +131,7 @@
dummyview.getNodeView(target).setVisualProperty(NODE_Y_LOCATION, 120d);
innerPanel.setBackground(BACKGROUND_COLOR);
- // Render it in this panel
+ // Render it in this panel. It is not necessary to register
this engine to manager.
final RenderingEngine<CyNetwork> renderingEngine =
presentationFactory.createRenderingEngine(innerPanel, dummyview);
dummyview.fitContent();
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -194,7 +194,7 @@
CytoscapeMenus cytoscapeMenus = new
CytoscapeMenus(cytoscapeMenuBar, cytoscapeToolBar);
ToolBarEnableUpdater toolBarEnableUpdater = new
ToolBarEnableUpdater(cytoscapeToolBar);
NetworkViewManager networkViewManager = new
NetworkViewManager(cyApplicationManagerServiceRef,
-
cyNetworkViewManagerServiceRef,
+
cyNetworkViewManagerServiceRef, renderingEngineManagerServiceRef,
cytoscapePropertiesServiceRef,
cyHelpBroker);
BirdsEyeViewHandler birdsEyeViewHandler = new
BirdsEyeViewHandler(cyApplicationManagerServiceRef,
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -182,6 +182,7 @@
if(presentationPanel == null) {
presentationPanel = new JPanel();
final RenderingEngine<CyNetwork> bevEngine =
bevFactory.createRenderingEngine(presentationPanel, newViewModel);
+ renderingEngineManager.addRenderingEngine(bevEngine);
presentationMap.put((CyNetworkView) newViewModel,
presentationPanel);
}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -72,6 +72,7 @@
import org.cytoscape.view.model.events.ViewChangeRecord;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,6 +118,7 @@
private final CyNetworkViewManager networkViewManager;
private final CyApplicationManager applicationManager;
+ private final RenderingEngineManager renderingEngineManager;
/**
* Creates a new NetworkViewManager object.
@@ -124,13 +126,15 @@
* @param desktop
* DOCUMENT ME!
*/
- public NetworkViewManager(CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr,
+ public NetworkViewManager(CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr,final RenderingEngineManager
renderingEngineManager,
CyProperty<Properties> cyProps, CyHelpBroker help) {
if (appMgr == null)
throw new NullPointerException("CyApplicationManager is
null.");
if (netViewMgr == null)
throw new NullPointerException("CyNetworkViewManager is
null.");
+
+ this.renderingEngineManager = renderingEngineManager;
this.factories = new HashMap<String,
RenderingEngineFactory<CyNetwork>>();
@@ -373,6 +377,8 @@
final long start = System.currentTimeMillis();
logger.debug("Rendering start: view model = " + view.getSUID());
final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.createRenderingEngine(iframe, view);
+ renderingEngineManager.addRenderingEngine(renderingEngine);
+
logger.debug("Rendering finished in " +
(System.currentTimeMillis() - start) + " m sec.");
presentationMap.put(view, renderingEngine);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -21,6 +21,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -90,6 +91,7 @@
CyServiceRegistrar cyServiceRegistrarServiceRef =
getService(bc,CyServiceRegistrar.class);
VizmapReaderManager vizmapReaderManagerServiceRef =
getService(bc,VizmapReaderManager.class);
CyNetworkTableManager cyNetworkTableManagerServiceRef =
getService(bc,CyNetworkTableManager.class);
+ RenderingEngineManager renderingEngineManagerServiceRef =
getService(bc,RenderingEngineManager.class);
AttributeSetManager attributeSetManager = new
AttributeSetManager(cyNetworkTableManagerServiceRef);
SelectedVisualStyleManagerImpl selectedVisualStyleManager = new
SelectedVisualStyleManagerImpl(vmmServiceRef);
@@ -111,7 +113,7 @@
ColorManager colorMgr = new ColorManager();
IconManager iconManager = new IconManager();
VizMapperMenuManager menuManager = new
VizMapperMenuManager(dialogTaskManagerServiceRef,propertySheetPanel,selectedVisualStyleManager,cyApplicationManagerServiceRef);
- DefaultViewPanelImpl defaultViewPanel = new
DefaultViewPanelImpl(cyNetworkFactoryServiceRef,graphViewFactoryServiceRef,presentationFactoryServiceRef,selectedVisualStyleManager);
+ DefaultViewPanelImpl defaultViewPanel = new
DefaultViewPanelImpl(cyNetworkFactoryServiceRef,graphViewFactoryServiceRef,presentationFactoryServiceRef,selectedVisualStyleManager,
renderingEngineManagerServiceRef);
NodeSizeDependency nodeSizeDep = new NodeSizeDependency();
VizMapperUtil vizMapperUtil = new VizMapperUtil(vmmServiceRef);
VisualPropertyDependencyManagerImpl vpDependencyManager = new
VisualPropertyDependencyManagerImpl();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-03-29 20:54:53 UTC (rev 28696)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-03-29 21:34:37 UTC (rev 28697)
@@ -56,6 +56,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
@@ -74,6 +75,8 @@
// Space around view.
private static final int PADDING = 20;
+ private final RenderingEngineManager renderingEngineManager;
+
// Dummy network and its view
private final RenderingEngine<CyNetwork> renderingEngine;
private final SelectedVisualStyleManager selectedManager;
@@ -92,8 +95,9 @@
public DefaultViewPanelImpl(final CyNetworkFactory cyNetworkFactory,
final CyNetworkViewFactory cyNetworkViewFactory,
final RenderingEngineFactory<CyNetwork>
presentationFactory,
- final SelectedVisualStyleManager selectedManager) {
+ final SelectedVisualStyleManager selectedManager, final
RenderingEngineManager renderingEngineManager) {
+ this.renderingEngineManager = renderingEngineManager;
this.innerPanel = new JPanel();
this.innerPanel.setBorder(new EmptyBorder(PADDING, PADDING,
PADDING, PADDING));
@@ -145,8 +149,10 @@
this.innerPanel.setBackground((Color)
currentStyle.getDefaultValue(BasicVisualLexicon.NETWORK_BACKGROUND_PAINT));
// Render it in this panel
- renderingEngine = presentationFactory
- .createRenderingEngine(innerPanel, dummyview);
+ renderingEngine =
presentationFactory.createRenderingEngine(innerPanel, dummyview);
+
+ // Register it to the manager.
+ //renderingEngineManager.addRenderingEngine(renderingEngine);
dummyview.fitContent();
// Remove unnecessary mouse listeners.
--
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.
