Author: kono
Date: 2010-10-26 17:02:42 -0700 (Tue, 26 Oct 2010)
New Revision: 22499
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
Log:
render method renamed to getInstance().
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -76,7 +76,7 @@
}
- @Override public RenderingEngine<CyNetwork> render(final Object
visualizationContainer, final View<CyNetwork> view) {
+ @Override public RenderingEngine<CyNetwork> getInstance(final Object
visualizationContainer, final View<CyNetwork> view) {
// if (visualizationContainer == null)
// throw new IllegalArgumentException(
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -79,7 +79,7 @@
* Render given view model by Ding rendering engine.
*
*/
- @Override public RenderingEngine<CyNetwork> render(Object
presentationContainer,
+ @Override public RenderingEngine<CyNetwork> getInstance(Object
presentationContainer,
View<CyNetwork> view) {
if (view == null)
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/RenderingEngineFactory.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -14,7 +14,7 @@
public interface RenderingEngineFactory<T> {
/**
- * A presentation can contain multiple view models. This enable
developers
+ * A view model can have multiple presentations. This enable developers
* to render multiple View Models in the same display. For example, if
* View<CyNetwork> and View<Decoration> are passed to this, both of them
* will be rendered in a window, using same rendering engine.
@@ -27,7 +27,7 @@
*
* @return Rendering Engine for visualization on the
visualizationContainer.
*/
- RenderingEngine<T> render(final Object visualizationContainer,
+ RenderingEngine<T> getInstance(final Object visualizationContainer,
final View<T> viewModel);
}
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractRenderingEngineTest.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -29,7 +29,7 @@
public void testFactory() {
final JPanel panel = new JPanel();
- RenderingEngine<CyNetwork> engine = factory.render(panel,
networkView);
+ RenderingEngine<CyNetwork> engine = factory.getInstance(panel,
networkView);
assertNotNull(engine);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -149,7 +149,7 @@
// view.setVisualProperty(NETWORK_BACKGROUND_COLOR, background);
// Render it in this panel
- presentationFactory.render(this, dummyview);
+ presentationFactory.getInstance(this, dummyview);
}
/**
@@ -170,7 +170,7 @@
// TODO: is this correct???
this.removeAll();
- presentationFactory.render(this, dummyview);
+ presentationFactory.getInstance(this, dummyview);
// canvas.setLocation(PADDING / 2, PADDING / 2);
// vs.apply(dummyview);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-10-26 23:57:01 UTC (rev 22498)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-10-27 00:02:42 UTC (rev 22499)
@@ -392,7 +392,7 @@
long start = System.currentTimeMillis();
logger.debug("Rendering view model: " + view.getSUID());
- final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.render(iframe, view);
+ final RenderingEngine<CyNetwork> renderingEngine =
currentRenderingEngineFactory.getInstance(iframe, view);
logger.debug("Rendering finished in " +
(System.currentTimeMillis() - start) + " m sec.");
this.presentationMap.put(view.getModel().getSUID(),
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.
