Author: kono
Date: 2009-07-07 19:58:32 -0700 (Tue, 07 Jul 2009)
New Revision: 17274
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawableFactory.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/P5EdgePresentationImpl.java
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTask.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTaskFactory.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5NodePresentationimpl.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Start implementing factories.
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawableFactory.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawableFactory.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawableFactory.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -0,0 +1,9 @@
+package org.cytoscape.view.presentation.processing;
+
+import gestalt.render.Drawable;
+
+public interface CyDrawableFactory {
+
+ public Drawable getDrawable(Class<? extends Drawable> type);
+
+}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTask.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTask.java
2009-07-08 02:30:32 UTC (rev 17273)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTask.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -1,14 +1,13 @@
package org.cytoscape.view.presentation.processing.internal;
-import javax.swing.JDialog;
import javax.swing.JFrame;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.presentation.PresentationFactory;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
-import cytoscape.CyNetworkManager;
public class CreatePresentationTask implements Task {
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTaskFactory.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTaskFactory.java
2009-07-08 02:30:32 UTC (rev 17273)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CreatePresentationTaskFactory.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -1,10 +1,10 @@
package org.cytoscape.view.presentation.processing.internal;
+import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.presentation.PresentationFactory;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
-import cytoscape.CyNetworkManager;
public class CreatePresentationTaskFactory implements TaskFactory {
Added:
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
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/CyDrawableFactoryImpl.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -0,0 +1,16 @@
+package org.cytoscape.view.presentation.processing.internal;
+
+import gestalt.impl.jogl.shape.JoglDrawableFactory;
+import gestalt.render.Drawable;
+
+import org.cytoscape.view.presentation.processing.CyDrawableFactory;
+
+public class CyDrawableFactoryImpl extends JoglDrawableFactory implements
+ CyDrawableFactory {
+
+ public Drawable getDrawable(Class<? extends Drawable> type) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5EdgePresentationImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5EdgePresentationImpl.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5EdgePresentationImpl.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -0,0 +1,82 @@
+package org.cytoscape.view.presentation.processing.internal;
+
+import gestalt.context.GLContext;
+import gestalt.extension.picking.Pickable;
+import gestalt.render.Drawable;
+import gestalt.shape.AbstractShape;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.processing.P5Presentation;
+import org.cytoscape.view.presentation.processing.PresentationType;
+
+public class P5EdgePresentationImpl extends AbstractShape implements
+ P5Presentation<CyEdge>, Pickable {
+
+ public Drawable getDrawable() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public PresentationType getPresentationType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public View<CyEdge> getViewModel() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setDrawable(Drawable drawable) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setViewModel(View<CyEdge> model) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public VisualLexicon getVisualLexicon() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isPicked() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void mouseEnter() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseLeave() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseWithin() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void pickDraw(GLContext arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void draw(GLContext arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5NodePresentationimpl.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5NodePresentationimpl.java
2009-07-08 02:30:32 UTC (rev 17273)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/P5NodePresentationimpl.java
2009-07-08 02:58:32 UTC (rev 17274)
@@ -15,6 +15,13 @@
public class P5NodePresentationimpl extends AbstractShape implements
P5Presentation<CyNode>, Pickable {
+
+ private Drawable top;
+
+
+ public P5NodePresentationimpl() {
+
+ }
public Drawable getDrawable() {
// TODO Auto-generated method stub
@@ -70,13 +77,13 @@
}
- public void pickDraw(GLContext arg0) {
+ public void pickDraw(GLContext gl) {
// TODO Auto-generated method stub
}
- public void draw(GLContext arg0) {
- // TODO Auto-generated method stub
+ public void draw(GLContext gl) {
+
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-07-08 02:30:32 UTC (rev 17273)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-07-08 02:58:32 UTC (rev 17274)
@@ -6,7 +6,7 @@
default-lazy-init="false">
<osgi:reference id="cyNetworkManagerServiceRef"
- interface="cytoscape.CyNetworkManager" />
+ interface="org.cytoscape.session.CyNetworkManager" />
<osgi:service id="createPresentationTaskFactoryService"
ref="createPresentationTaskFactory"
interface="org.cytoscape.work.TaskFactory">
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
