Author: mes
Date: 2011-11-30 10:51:35 -0800 (Wed, 30 Nov 2011)
New Revision: 27643
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
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/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/DefaultViewPanelImpl.java
Log:
Renamed factory methods to be more consistent
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -29,7 +29,7 @@
*
* @return Rendering Engine for visualization on the
visualizationContainer.
*/
- RenderingEngine<T> getInstance(final Object visualizationContainer,
+ RenderingEngine<T> createRenderingEngine(final Object
visualizationContainer,
final View<T> viewModel);
Modified:
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
===================================================================
---
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -29,7 +29,7 @@
public void testFactory() {
final JPanel panel = new JPanel();
- RenderingEngine<CyNetwork> engine = factory.getInstance(panel,
networkView);
+ RenderingEngine<CyNetwork> engine =
factory.createRenderingEngine(panel, networkView);
assertNotNull(engine);
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
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -45,7 +45,7 @@
}
@Override
- public RenderingEngine<CyNetwork> getInstance(final Object
visualizationContainer, final View<CyNetwork> view) {
+ public RenderingEngine<CyNetwork> createRenderingEngine(final Object
visualizationContainer, final View<CyNetwork> view) {
if (visualizationContainer == null)
throw new IllegalArgumentException(
"Visualization container is null. This
should be an JComponent for this rendering engine.");
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
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -87,7 +87,7 @@
*
*/
@Override
- public RenderingEngine<CyNetwork> getInstance(
+ public RenderingEngine<CyNetwork> createRenderingEngine(
final Object presentationContainer, final
View<CyNetwork> view) {
// Validate arguments
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
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/BirdsEyeViewHandler.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -164,7 +164,7 @@
+ engine.getViewModel().getSUID());
bevPanel.removeAll();
- bevFactory.getInstance(bevPanel, engine.getViewModel());
+ bevFactory.createRenderingEngine(bevPanel,
engine.getViewModel());
setFocus();
bevPanel.repaint();
}
@@ -187,7 +187,7 @@
engine = newEngine;
logger.debug("Got BEV New Network view = " +
engine.getViewModel());
bevPanel.removeAll();
- bevFactory.getInstance(bevPanel, engine.getViewModel());
+ bevFactory.createRenderingEngine(bevPanel,
engine.getViewModel());
setFocus();
bevPanel.repaint();
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
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -377,7 +377,7 @@
final long start = System.currentTimeMillis();
logger.debug("Rendering start: view model = " + view.getSUID());
- final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.getInstance(iframe, view);
+ final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.createRenderingEngine(iframe, view);
logger.debug("Rendering finished in " +
(System.currentTimeMillis() - start) + " m sec.");
presentationMap.put(modelID, renderingEngine);
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
2011-11-30 18:48:05 UTC (rev 27642)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2011-11-30 18:51:35 UTC (rev 27643)
@@ -144,7 +144,7 @@
this.innerPanel.setBackground((Color)
currentStyle.getDefaultValue(MinimalVisualLexicon.NETWORK_BACKGROUND_PAINT));
// Render it in this panel
renderingEngine = presentationFactory
- .getInstance(innerPanel, dummyview);
+ .createRenderingEngine(innerPanel, dummyview);
dummyview.fitContent();
}
--
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.
