Author: kono
Date: 2010-10-28 16:58:30 -0700 (Thu, 28 Oct 2010)
New Revision: 22629
Modified:
core3/ding-presentation-impl/trunk/pom.xml
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
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.xml
Log:
Ding rendering engine is fixed to use RenderingEngineManager and register
engine by factory.
Modified: core3/ding-presentation-impl/trunk/pom.xml
===================================================================
--- core3/ding-presentation-impl/trunk/pom.xml 2010-10-28 23:57:29 UTC (rev
22628)
+++ core3/ding-presentation-impl/trunk/pom.xml 2010-10-28 23:58:30 UTC (rev
22629)
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>presentation-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -179,7 +179,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>presentation-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-10-28 23:57:29 UTC (rev 22628)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-10-28 23:58:30 UTC (rev 22629)
@@ -20,6 +20,7 @@
import org.cytoscape.view.model.events.UpdateNetworkPresentationEventListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
@@ -37,6 +38,9 @@
{
private static final Logger logger =
LoggerFactory.getLogger(DingNavigationRenderingEngineFactory.class);
+
+ private final RenderingEngineManager renderingEngineManager;
+
private CyTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
@@ -58,7 +62,7 @@
CyRootNetworkFactory rootNetworkFactory, UndoSupport
undo,
SpacialIndex2DFactory spacialFactory,
VisualLexicon dingLexicon, TaskManager tm,
- CyServiceRegistrar registrar, CyTableManager tableMgr) {
+ CyServiceRegistrar registrar, CyTableManager tableMgr,
RenderingEngineManager renderingEngineManager) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkFactory = rootNetworkFactory;
@@ -68,6 +72,7 @@
this.tm = tm;
this.registrar = registrar;
this.tableMgr = tableMgr;
+ this.renderingEngineManager = renderingEngineManager;
viewMap = new HashMap<CyNetworkView, DGraphView>();
nodeViewTFs = new HashMap<NodeViewTaskFactory, Map>();
@@ -103,7 +108,10 @@
// dgv);
// target.add(bev);
- return new DingNavigationRenderingEngine(null);
+ DingNavigationRenderingEngine bev = new
DingNavigationRenderingEngine(null);
+ // Register engine to manager
+ this.renderingEngineManager.addRenderingEngine(bev);
+ return bev;
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-10-28 23:57:29 UTC (rev 22628)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-10-28 23:58:30 UTC (rev 22629)
@@ -25,6 +25,7 @@
import org.cytoscape.view.model.events.UpdateNetworkPresentationEventListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
@@ -35,6 +36,8 @@
private static final Logger logger = LoggerFactory
.getLogger(DingRenderingEngineFactory.class);
+
+ final RenderingEngineManager renderingEngineManager;
private CyTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
@@ -58,7 +61,7 @@
CyRootNetworkFactory rootNetworkFactory, UndoSupport
undo,
SpacialIndex2DFactory spacialFactory, VisualLexicon
dingLexicon,
TaskManager tm, CyServiceRegistrar registrar,
- CyTableManager tableMgr, CyEventHelper eventHelper) {
+ CyTableManager tableMgr, CyEventHelper eventHelper,
RenderingEngineManager renderingEngineManager) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkFactory = rootNetworkFactory;
this.spacialFactory = spacialFactory;
@@ -68,6 +71,7 @@
this.registrar = registrar;
this.tableMgr = tableMgr;
this.eventHelper = eventHelper;
+ this.renderingEngineManager = renderingEngineManager;
viewMap = new HashMap<CyNetworkView, DGraphView>();
nodeViewTFs = new HashMap<NodeViewTaskFactory, Map>();
@@ -125,7 +129,10 @@
registrar.registerAllServices(dgv, new Properties());
registrar.registerAllServices(new AddDeleteHandler(dgv),
new Properties());
-
+
+ // Register engine to manager
+ this.renderingEngineManager.addRenderingEngine(dgv);
+
return dgv;
}
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-10-28 23:57:29 UTC (rev 22628)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 23:58:30 UTC (rev 22629)
@@ -5,6 +5,11 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
+
+ <osgi:reference id="renderingEngineManagerServiceRef"
+
interface="org.cytoscape.view.presentation.RenderingEngineManager">
+ </osgi:reference>
+
<osgi:reference id="cyRootNetworkFactoryServiceRef"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
</osgi:reference>
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 23:57:29 UTC (rev 22628)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 23:58:30 UTC (rev 22629)
@@ -13,7 +13,7 @@
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
-
+
<import resource="bundle-context-osgi.xml" />
<context:annotation-config />
@@ -31,6 +31,7 @@
<constructor-arg ref="cyServiceRegistrarRef" />
<constructor-arg ref="cyTableManagerServiceRef" />
<constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="renderingEngineManagerServiceRef" />
</bean>
<bean id="dingNavigationRenderingEngineFactory"
@@ -43,5 +44,6 @@
<constructor-arg ref="taskManagerServiceRef" />
<constructor-arg ref="cyServiceRegistrarRef" />
<constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="renderingEngineManagerServiceRef" />
</bean>
</beans>
--
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.
