Author: clopes
Date: 2012-05-01 14:11:17 -0700 (Tue, 01 May 2012)
New Revision: 29064
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngine.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
Log:
Fixes #904 : review RenderingEngine.getRenderingEngineID() for use in
alternative renderers (method removed)
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngine.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngine.java
2012-05-01 20:59:19 UTC (rev 29063)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/RenderingEngine.java
2012-05-01 21:11:17 UTC (rev 29064)
@@ -24,13 +24,6 @@
public interface RenderingEngine<T> {
/**
- * Returns globally-unique ID for this rendering engine.
- *
- * @return Unique identifier of this rendering engine.
- */
- String getRenderingEngineID();
-
- /**
* Returns {@linkplain View} being rendered.
*
* @return view model. This is an immutable object.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
2012-05-01 20:59:19 UTC (rev 29063)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BirdsEyeView.java
2012-05-01 21:11:17 UTC (rev 29064)
@@ -73,8 +73,6 @@
private final static long serialVersionUID = 1202416511863994L;
- private static final String ENGINE_ID = "ding-bev";
-
private static final Dimension MIN_SIZE = new Dimension(180, 180);
private static final Color VIEW_WINDOW_COLOR = new Color(50, 50, 255,
50);
@@ -344,7 +342,6 @@
public Properties getProperties() {
return viewModel.getProperties();
}
-
@Override
public Printable createPrintable() {
@@ -362,16 +359,8 @@
throw new UnsupportedOperationException("Printing is not
supported for Bird's eye view.");
}
-
@Override
- public String getRenderingEngineID() {
- return ENGINE_ID;
- }
-
-
- @Override
public void handleEvent(UpdateNetworkPresentationEvent e) {
//System.out.println("#### Got redraw event for BEV");
-
}
}
\ No newline at end of file
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-01 20:59:19 UTC (rev 29063)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-01 21:11:17 UTC (rev 29064)
@@ -157,8 +157,6 @@
private static final Logger logger =
LoggerFactory.getLogger(DGraphView.class);
- private static final String ENGINE_ID = "ding";
-
private static enum ZOrder {
BACKGROUND_PANE, NETWORK_PANE, FOREGROUND_PANE;
@@ -2683,10 +2681,4 @@
public CyAnnotator getCyAnnotator() {
return cyAnnotator;
}
-
-
- @Override
- public String getRenderingEngineID() {
- return ENGINE_ID;
- }
}
--
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.