Author: kono
Date: 2009-07-09 13:41:29 -0700 (Thu, 09 Jul 2009)
New Revision: 17303
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Shape.java
Removed:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShapeGroup.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PGraphView.java
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Presentation.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ShapeManager.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CyDrawableFactoryImpl.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/GestaltFactoryImpl.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingNetworkRenderer.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingVisualLexicon.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ShapeManagerImpl.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/visualproperty/ShapeVisualProperty.java
Log:
Public interfaces simplified.
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,5 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-public interface AnnotationObject extends ObjectShape {
-
-}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,23 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-/**
- *
- * Defines shape of object rendered in Processing.
- *
- * @author kono, kozo
- * @version 0.0.1
- *
- *
- */
-public interface ObjectShape {
-
- /**
- * Name of this shape, such as ellipse, rectangle, triangle, etc. This
is
- * immutable.
- *
- * @return Name of shape as string
- *
- */
- public String getDisplayName();
-
-}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShapeGroup.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShapeGroup.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShapeGroup.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,12 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-import java.util.List;
-
-public interface ObjectShapeGroup {
-
- public List<ObjectShape> getMembers();
- public void addMember(ObjectShape shape);
-
- public void draw();
-
-}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Presentation.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Presentation.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Presentation.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -5,13 +5,49 @@
import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.Renderer;
+/**
+ * Base interface for all renderers. This will be used by:
+ * <ul>
+ * <li>Node Renderer</li>
+ * <li>Edge Renderer</li>
+ * <li>Network Renderer</li>
+ * <li>Decoration Renderer</li>
+ * </ul>
+ *
+ * @author kono
+ *
+ * @param <T>
+ */
public interface P5Presentation <T> extends Renderer {
+
+ /**
+ * Gte backend data structure for this presentation.
+ *
+ * @return View Model of this object.
+ *
+ */
public View<T> getViewModel();
+
+ /**
+ * Set the View Model.
+ * TODO: Is this necessary? (Immutable?)
+ *
+ * @param model
+ */
public void setViewModel(View<T> model);
+ /**
+ * Get top-level Drawable Object.
+ *
+ * @return
+ */
public Drawable getDrawable();
+
+ /**
+ * Set top-level Drawable Object.
+ *
+ * @param drawable
+ */
public void setDrawable(Drawable drawable);
- // This is an immutable value, which represents the type of
presentation.
- public PresentationType getPresentationType();
}
Copied:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Shape.java
(from rev 17210,
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java)
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Shape.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5Shape.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -0,0 +1,27 @@
+package org.cytoscape.view.presentation.processing;
+
+import java.util.Collection;
+
+/**
+ *
+ * Defines shape of object rendered in Processing.
+ *
+ * @author kono, kozo
+ * @version 0.0.1
+ *
+ *
+ */
+public interface P5Shape {
+
+ /**
+ * Name of this shape, such as ellipse, rectangle, triangle, etc. This
is
+ * immutable.
+ *
+ * @return Name of shape as string
+ *
+ */
+ public String getDisplayName();
+
+ public Collection<?> getCompatibleModels();
+
+}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PGraphView.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PGraphView.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PGraphView.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,6 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-
-public interface PGraphView {
-
-}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ShapeManager.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ShapeManager.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ShapeManager.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -4,10 +4,10 @@
public interface ShapeManager {
- public Set<ObjectShape> getAllShapes();
+ public Set<P5Shape> getAllShapes();
- public Set<ObjectShape> getNodeShapes();
+ public Set<P5Shape> getNodeShapes();
- public Set<ObjectShape> getEdgeShapes();
+ public Set<P5Shape> getEdgeShapes();
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CyDrawableFactoryImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CyDrawableFactoryImpl.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CyDrawableFactoryImpl.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -5,11 +5,21 @@
import org.cytoscape.view.presentation.processing.CyDrawableFactory;
+
+/**
+ * Factory for shapes.
+ *
+ * @author kono
+ *
+ */
public class CyDrawableFactoryImpl extends JoglDrawableFactory implements
CyDrawableFactory {
+
+ public CyDrawableFactoryImpl() {
+ super();
+ }
public Drawable getDrawable(Class<? extends Drawable> type) {
- // TODO Auto-generated method stub
return null;
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/GestaltFactoryImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/GestaltFactoryImpl.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/GestaltFactoryImpl.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,13 +1,21 @@
package org.cytoscape.view.presentation.processing.internal;
import gestalt.render.Drawable;
+import gestalt.shape.DrawableFactory;
import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.processing.GestaltFactory;
import org.cytoscape.view.presentation.processing.P5Presentation;
public class GestaltFactoryImpl implements GestaltFactory {
+
+ private DrawableFactory dFactory;
+
+ public GestaltFactoryImpl(DrawableFactory dFactory) {
+ this.dFactory = dFactory;
+ }
+
public <T> P5Presentation<T> getPresentation(
Class<? extends Drawable> type, View<T> viewModel) {
// TODO Auto-generated method stub
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingNetworkRenderer.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingNetworkRenderer.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingNetworkRenderer.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -13,6 +13,7 @@
import gestalt.shape.Plane;
import gestalt.util.CameraMover;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.Image;
import java.awt.event.ContainerEvent;
@@ -126,11 +127,15 @@
private float _myCounter = 0;
+
+ Cube cube;
public void setup() {
size(windowSize.width, windowSize.height, OPENGL);
hint(ENABLE_OPENGL_4X_SMOOTH);
frameRate(30);
smooth();
+
+
physics = new VerletPhysics();
physics.friction = 1000;
AABB boundingBox = new AABB(new Vec3D(0, 0, 0), new Vec3D(width,
@@ -140,76 +145,91 @@
/* create gestalt plugin */
gestalt = new GestaltPlugIn(this);
+
+ //Set Custom DrawableFactory
+ gestalt.setDrawablefactoryRef(new CyDrawableFactoryImpl());
+
+ cube = gestalt.drawablefactory().cube();
+ cube.scale(100, 200, 300);
+ cube.rotation(10, 30, 100);
+ cube.material().lit = true;
+ cube.material().color.set(1, 1);
+ //gestalt.bin(Gestalt.BIN_3D).add(cube);
+
+
+
- /* setup shadow map */
- final int myShadowMapWidth = width;
- final int myShadowMapHeight = height;
- _myShadowMapExtension = new JoglShadowMap(gestalt.light(),
- myShadowMapWidth, myShadowMapHeight, true,
false);
- gestalt.bin(Gestalt.BIN_FRAME_SETUP).add(_myShadowMapExtension);
+// /* setup shadow map */
+// final int myShadowMapWidth = width;
+// final int myShadowMapHeight = height;
+// _myShadowMapExtension = new JoglShadowMap(gestalt.light(),
+// myShadowMapWidth, myShadowMapHeight, true,
false);
+// gestalt.bin(Gestalt.BIN_FRAME_SETUP).add(_myShadowMapExtension);
+//
+// /*
+// * this is a workaround for a state issue between openl,
processing and
+// * gestalt
+// */
+// GestaltPlugIn.SKIP_FIRST_FRAME = true;
+//
+// /* create shapes and a floor */
+// mySphereA = new JoglSphere();
+// mySphereA.position().set(100, 50, -100);
+// mySphereA.scale().set(100, 100, 100);
+// mySphereA.material().lit = true;
+// mySphereA.material().color.set(0.5f, 0.5f, 0, 1);
+//
+// mySphereB = new JoglSphere();
+// mySphereB.position().set(0, 100, 0);
+// mySphereB.scale().set(100, 100, 100);
+// mySphereB.material().lit = true;
+// mySphereB.material().color.set(1, 0, 0, 1);
+//
+// mySphereC = new JoglSphere();
+// mySphereC.position().set(100, 350, 0);
+// mySphereC.scale().set(100, 100, 100);
+// mySphereC.material().lit = true;
+// mySphereC.material().color.set(1, 0.5f, 0, 1);
+//
+// Plane myPlane = gestalt.drawablefactory().plane();
+// myPlane.scale().set(1000, 1000, 1);
+// myPlane.rotation().x = -Gestalt.PI_HALF;
+// myPlane.material().lit = true;
+// myPlane.material().color.set(1, 1);
+//
+// /* add shapes to bins */
+// gestalt.bin(Gestalt.BIN_3D).add(mySphereA);
+// gestalt.bin(Gestalt.BIN_3D).add(mySphereB);
+// gestalt.bin(Gestalt.BIN_3D).add(mySphereC);
+// gestalt.bin(Gestalt.BIN_3D).add(myPlane);
+//
+// /* add shapes to shadow extension */
+// _myShadowMapExtension.addShape(mySphereA);
+// _myShadowMapExtension.addShape(mySphereB);
+// _myShadowMapExtension.addShape(mySphereC);
+// _myShadowMapExtension.lightcamera.nearclipping = 100;
+// _myShadowMapExtension.lightcamera.farclipping = 5000;
+//
+// /* light */
+// gestalt.light().enable = true;
+// gestalt.light().position().set(450, 720, 23);
+// gestalt.light().diffuse.set(1, 1, 1, 1);
+// gestalt.light().ambient.set(0, 0, 0, 1);
+//
+// /* camera() */
+// gestalt.camera().position().set(-400, 1000, 1000);
+// gestalt.camera().setMode(Gestalt.CAMERA_MODE_LOOK_AT);
+
+
+//
+// /* create a display for the shadowmap */
+// createShadowmapDisplay();
+//
+// // /* remove all gestalt presets */
+// // RenderBin myRenderBin = new RenderBin();
+// // gestalt.setBinRef(myRenderBin);
+// // myRenderBin.add(new RawOpenGL());
- /*
- * this is a workaround for a state issue between openl,
processing and
- * gestalt
- */
- GestaltPlugIn.SKIP_FIRST_FRAME = true;
-
- /* create shapes and a floor */
- mySphereA = new JoglSphere();
- mySphereA.position().set(100, 50, -100);
- mySphereA.scale().set(100, 100, 100);
- mySphereA.material().lit = true;
- mySphereA.material().color.set(0.5f, 0.5f, 0, 1);
-
- mySphereB = new JoglSphere();
- mySphereB.position().set(0, 100, 0);
- mySphereB.scale().set(100, 100, 100);
- mySphereB.material().lit = true;
- mySphereB.material().color.set(1, 0, 0, 1);
-
- mySphereC = new JoglSphere();
- mySphereC.position().set(100, 350, 0);
- mySphereC.scale().set(100, 100, 100);
- mySphereC.material().lit = true;
- mySphereC.material().color.set(1, 0.5f, 0, 1);
-
- Plane myPlane = gestalt.drawablefactory().plane();
- myPlane.scale().set(1000, 1000, 1);
- myPlane.rotation().x = -Gestalt.PI_HALF;
- myPlane.material().lit = true;
- myPlane.material().color.set(1, 1);
-
- /* add shapes to bins */
- gestalt.bin(Gestalt.BIN_3D).add(mySphereA);
- gestalt.bin(Gestalt.BIN_3D).add(mySphereB);
- gestalt.bin(Gestalt.BIN_3D).add(mySphereC);
- gestalt.bin(Gestalt.BIN_3D).add(myPlane);
-
- /* add shapes to shadow extension */
- _myShadowMapExtension.addShape(mySphereA);
- _myShadowMapExtension.addShape(mySphereB);
- _myShadowMapExtension.addShape(mySphereC);
- _myShadowMapExtension.lightcamera.nearclipping = 100;
- _myShadowMapExtension.lightcamera.farclipping = 5000;
-
- /* light */
- gestalt.light().enable = true;
- gestalt.light().position().set(450, 720, 23);
- gestalt.light().diffuse.set(1, 1, 1, 1);
- gestalt.light().ambient.set(0, 0, 0, 1);
-
- /* camera() */
- gestalt.camera().position().set(-400, 1000, 1000);
- gestalt.camera().setMode(Gestalt.CAMERA_MODE_LOOK_AT);
-
- /* create a display for the shadowmap */
- createShadowmapDisplay();
-
- // /* remove all gestalt presets */
- // RenderBin myRenderBin = new RenderBin();
- // gestalt.setBinRef(myRenderBin);
- // myRenderBin.add(new RawOpenGL());
-
}
private void createShadowmapDisplay() {
@@ -223,6 +243,8 @@
gestalt.bin(Gestalt.BIN_2D_FOREGROUND).add(myDisplay);
}
+
+ float rot = 0;
public void draw() {
@@ -230,20 +252,26 @@
/* draw processing shape */
// rect(gestalt.event().mouseX, gestalt.event().mouseY, 50,
150);
/* clear screen */
- background(255, 255, 0);
- gl = gestalt.getGL();
- gl.glViewport(0, 0, width, height);
-
- /* move camera */
- CameraMover.handleKeyEvent(gestalt.camera(), gestalt.event(), 1
/ 60f);
-
- /* bounce spheres */
- _myCounter += 1 / 60f;
- mySphereA.position().y += sin(_myCounter * 1.5f) * 2;
- mySphereB.position().y += sin(_myCounter * 2.3f) * 4;
- mySphereC.position().y += sin(_myCounter * 2.5f) * 3;
-
-
+// background(255, 255, 0);
+// gl = gestalt.getGL();
+// gl.glViewport(0, 0, width, height);
+//
+// /* move camera */
+// CameraMover.handleKeyEvent(gestalt.camera(), gestalt.event(), 1
/ 60f);
+//
+// /* bounce spheres */
+// _myCounter += 1 / 60f;
+// mySphereA.position().y += sin(_myCounter * 1.5f) * 2;
+// mySphereB.position().y += sin(_myCounter * 2.3f) * 4;
+// mySphereC.position().y += sin(_myCounter * 2.5f) * 3;
+//
+//
+ rot +=0.1;
+ cube.position().x = mouseX - 60;
+ cube.position().y = mouseY;
+ cube.rotation().set(0, rot);
+
+ cube.draw(gestalt.);
background(0);
physics.update();
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingVisualLexicon.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingVisualLexicon.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ProcessingVisualLexicon.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -3,14 +3,14 @@
import static org.cytoscape.model.GraphObject.NODE;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.processing.ObjectShape;
+import org.cytoscape.view.presentation.processing.P5Shape;
import
org.cytoscape.view.presentation.processing.visualproperty.ShapeVisualProperty;
import org.cytoscape.view.presentation.property.ThreeDVisualLexicon;
public class ProcessingVisualLexicon extends ThreeDVisualLexicon {
- public static final VisualProperty<? extends ObjectShape> NODE_SHAPE =
new ShapeVisualProperty(
+ public static final VisualProperty<? extends P5Shape> NODE_SHAPE = new
ShapeVisualProperty(
NODE, null, "NODE_SHAPE", "Node Shape");
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ShapeManagerImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ShapeManagerImpl.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/ShapeManagerImpl.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -5,22 +5,22 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.view.presentation.processing.ObjectShape;
+import org.cytoscape.view.presentation.processing.P5Shape;
import org.cytoscape.view.presentation.processing.ShapeManager;
public class ShapeManagerImpl implements ShapeManager {
- public Set<ObjectShape> getAllShapes() {
+ public Set<P5Shape> getAllShapes() {
// TODO Auto-generated method stub
return null;
}
- public Set<ObjectShape> getEdgeShapes() {
+ public Set<P5Shape> getEdgeShapes() {
// TODO Auto-generated method stub
return null;
}
- public Set<ObjectShape> getNodeShapes() {
+ public Set<P5Shape> getNodeShapes() {
// TODO Auto-generated method stub
return null;
}
@@ -30,11 +30,11 @@
}
- public void addShape(ObjectShape shape, Map props) {
+ public void addShape(P5Shape shape, Map props) {
}
- public void removeShape(ObjectShape shape, Map props) {
+ public void removeShape(P5Shape shape, Map props) {
}
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -2,9 +2,9 @@
import gestalt.shape.AbstractShape;
-import org.cytoscape.view.presentation.processing.ObjectShape;
+import org.cytoscape.view.presentation.processing.P5Shape;
-public abstract class AbstractObjectShape extends AbstractShape implements
ObjectShape {
+public abstract class AbstractObjectShape extends AbstractShape implements
P5Shape {
// Human readable name of this shape. This is mandatory and immutable.
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/visualproperty/ShapeVisualProperty.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/visualproperty/ShapeVisualProperty.java
2009-07-09 19:56:01 UTC (rev 17302)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/visualproperty/ShapeVisualProperty.java
2009-07-09 20:41:29 UTC (rev 17303)
@@ -1,21 +1,21 @@
package org.cytoscape.view.presentation.processing.visualproperty;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.presentation.processing.ObjectShape;
+import org.cytoscape.view.presentation.processing.P5Shape;
-public class ShapeVisualProperty extends AbstractVisualProperty<ObjectShape> {
+public class ShapeVisualProperty extends AbstractVisualProperty<P5Shape> {
- public ShapeVisualProperty(String ot, ObjectShape shape, String id,
+ public ShapeVisualProperty(String ot, P5Shape shape, String id,
String name) {
super(ot, shape, id, name);
}
- public String getSerializableString(ObjectShape value) {
+ public String getSerializableString(P5Shape value) {
// TODO Auto-generated method stub
return null;
}
- public ObjectShape parseSerializableString(String value) {
+ public P5Shape parseSerializableString(String value) {
// TODO Auto-generated method stub
return null;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
