Author: kono
Date: 2010-08-04 16:01:19 -0700 (Wed, 04 Aug 2010)
New Revision: 21204
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/GraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Presentation module classes are renamed for consistency.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/GraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/GraphView.java
2010-08-04 23:00:53 UTC (rev 21203)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/GraphView.java
2010-08-04 23:01:19 UTC (rev 21204)
@@ -530,7 +530,7 @@
public int print(Graphics graphics, PageFormat pageFormat, int
pageIndex);
public void print(Graphics g) ;
public void printNoImposter(Graphics g) ;
- public Printable getPrintable();
+ public Printable createPrintable();
// ??
public Point2D getCenter();
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-08-04 23:00:53 UTC (rev 21203)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-08-04 23:01:19 UTC (rev 21204)
@@ -119,7 +119,7 @@
*
* @author Nerius Landys
*/
-public class DGraphView implements RenderingEngine, GraphView, Printable,
+public class DGraphView implements RenderingEngine<CyNetwork>, GraphView,
Printable,
PhoebeCanvasDroppable, ViewChangeListener {
private static enum ZOrder {
@@ -2688,7 +2688,7 @@
// ////// The following implements Presentation API ////////////
- public Printable getPrintable() {
+ public Printable createPrintable() {
return this;
}
@@ -2706,12 +2706,8 @@
}
- public Icon getDefaultIcon(VisualProperty<?> vp) {
- // TODO Auto-generated method stub
- return null;
- }
- public Image getImage(int width, int height) {
+ public Image createImage(int width, int height) {
// TODO Auto-generated method stub
return null;
}
@@ -2723,4 +2719,10 @@
public CyNetworkView getViewModel() {
return cyNetworkView;
}
+
+ @Override
+ public Icon createIcon(VisualProperty<?> vp) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2010-08-04 23:00:53 UTC (rev 21203)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2010-08-04 23:01:19 UTC (rev 21204)
@@ -13,6 +13,7 @@
import org.cytoscape.ding.BirdsEyeView;
import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.spacial.SpacialIndex2DFactory;
import org.cytoscape.task.EdgeViewTaskFactory;
@@ -25,14 +26,14 @@
import org.cytoscape.view.model.events.NetworkViewChangedEvent;
import org.cytoscape.view.model.events.NetworkViewChangedListener;
import org.cytoscape.view.presentation.NavigationPresentation;
-import org.cytoscape.view.presentation.PresentationFactory;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.TunableInterceptor;
import org.cytoscape.work.UndoSupport;
import org.cytoscape.service.util.CyServiceRegistrar;
-public class PresentationFactoryImpl implements PresentationFactory,
NetworkViewChangedListener {
+public class PresentationFactoryImpl implements
RenderingEngineFactory<CyNetwork>, NetworkViewChangedListener {
private CyDataTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
@@ -76,7 +77,7 @@
/**
*
*/
- public RenderingEngine addPresentation(Object presentationContainer,
View<?> view) {
+ public RenderingEngine<CyNetwork> render(Object presentationContainer,
View<CyNetwork> view) {
if ( view == null )
throw new IllegalArgumentException("Cannot create
presentation for null view model.");
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-04 23:00:53 UTC (rev 21203)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-04 23:01:19 UTC (rev 21204)
@@ -38,7 +38,7 @@
<!-- Individual Service -->
<osgi:service id="dingPresentationFactoryService"
ref="dingPresentationFactory">
<osgi:interfaces>
-
<value>org.cytoscape.view.presentation.PresentationFactory</value>
+
<value>org.cytoscape.view.presentation.RenderingEngineFactory</value>
<value>org.cytoscape.view.model.events.NetworkViewChangedListener</value>
</osgi:interfaces>
<osgi:service-properties>
--
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.
