Author: kono
Date: 2009-07-21 15:17:01 -0700 (Tue, 21 Jul 2009)
New Revision: 17506
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/PresentationFactoryImpl.java
Log:
Presentation API had been refactored based on the discussion last week.
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
2009-07-21 22:16:10 UTC (rev 17505)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2009-07-21 22:17:01 UTC (rev 17506)
@@ -98,7 +98,7 @@
import org.cytoscape.task.EdgeViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.view.presentation.Renderer;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.work.UndoSupport;
import org.cytoscape.work.TunableInterceptor;
@@ -119,7 +119,7 @@
*
* @author Nerius Landys
*/
-public class DGraphView implements Renderer<CyNetworkView>, GraphView,
Printable,
+public class DGraphView implements RenderingEngine, GraphView, Printable,
PhoebeCanvasDroppable, ViewChangeListener {
private static enum ZOrder {
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
2009-07-21 22:16:10 UTC (rev 17505)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2009-07-21 22:17:01 UTC (rev 17506)
@@ -2,7 +2,6 @@
package org.cytoscape.ding.impl;
import java.awt.Component;
-import java.awt.Container;
import java.util.HashMap;
import java.util.Map;
@@ -13,7 +12,6 @@
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;
@@ -27,7 +25,7 @@
import org.cytoscape.view.model.events.NetworkViewChangedListener;
import org.cytoscape.view.presentation.NavigationPresentation;
import org.cytoscape.view.presentation.PresentationFactory;
-import org.cytoscape.view.presentation.Renderer;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.TunableInterceptor;
import org.cytoscape.work.UndoSupport;
@@ -73,7 +71,7 @@
/**
*
*/
- public <T extends View<?>> Renderer<T> addPresentation(Container
presentationContainer, T view) {
+ public RenderingEngine addPresentation(Object presentationContainer,
View<?> view) {
if ( view == null )
throw new IllegalArgumentException("Cannot create
presentation for null view model.");
@@ -106,7 +104,7 @@
throw new IllegalArgumentException("frame object is not
of type JInternalFrame, which is invalid for this implementation of
PresentationFactory");
}
- return (Renderer<T>) dgv;
+ return dgv;
}
public NavigationPresentation addNavigationPresentation(Object
targetComponent, Object navBounds) {
@@ -182,9 +180,4 @@
emptySpaceTFs.remove(evtf);
}
-
- public <T extends View<?>> Renderer<T> createPresentation(T view) {
- return (Renderer<T>) viewMap.get(view);
- }
-
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
