Author: mes
Date: 2011-09-13 16:18:06 -0700 (Tue, 13 Sep 2011)
New Revision: 26789
Added:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/java/csplugins/layout/CyActivator.java
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/layout-jgraph-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/layout-jgraph-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/layout-jgraph-impl/osgi.bnd 2011-09-13
23:13:51 UTC (rev 26788)
+++ core3/impl/branches/no-spring/layout-jgraph-impl/osgi.bnd 2011-09-13
23:18:06 UTC (rev 26789)
@@ -3,4 +3,4 @@
#-----------------------------------------------------------------
Private-Package: csplugins.*
-
+Bundle-Activator: csplugins.layout.CyActivator
Added:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/java/csplugins/layout/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/java/csplugins/layout/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/java/csplugins/layout/CyActivator.java
2011-09-13 23:18:06 UTC (rev 26789)
@@ -0,0 +1,78 @@
+
+
+
+
+package csplugins.layout;
+
+import org.cytoscape.work.undo.UndoSupport;
+
+import csplugins.layout.JGraphLayoutWrapper;
+
+import org.cytoscape.view.layout.CyLayoutAlgorithm;
+
+
+import org.osgi.framework.BundleContext;
+
+import org.cytoscape.service.util.AbstractCyActivator;
+
+import java.util.Properties;
+
+
+
+public class CyActivator extends AbstractCyActivator {
+ public CyActivator() {
+ super();
+ }
+
+
+ public void start(BundleContext bc) {
+
+ UndoSupport undoSupportServiceRef =
getService(bc,UndoSupport.class);
+
+ JGraphLayoutWrapper jGraphAnnealingLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.ANNEALING);
+ JGraphLayoutWrapper jGraphMoenLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.MOEN);
+ JGraphLayoutWrapper jGraphCircleGraphLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.CIRCLE_GRAPH);
+ JGraphLayoutWrapper jGraphRadialTreeLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.RADIAL_TREE);
+ JGraphLayoutWrapper jGraphGEMLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.GEM);
+ JGraphLayoutWrapper jGraphSpringEmbeddedLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.SPRING_EMBEDDED);
+ JGraphLayoutWrapper jGraphSugiyamaLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.SUGIYAMA);
+ JGraphLayoutWrapper jGraphTreeLayout = new
JGraphLayoutWrapper(undoSupportServiceRef,JGraphLayoutWrapper.TREE);
+
+
+ Properties jGraphAnnealingLayoutProps = new Properties();
+ jGraphAnnealingLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+
registerService(bc,jGraphAnnealingLayout,CyLayoutAlgorithm.class,
jGraphAnnealingLayoutProps);
+
+ Properties jGraphMoenLayoutProps = new Properties();
+ jGraphMoenLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+ registerService(bc,jGraphMoenLayout,CyLayoutAlgorithm.class,
jGraphMoenLayoutProps);
+
+ Properties jGraphCircleGraphLayoutProps = new Properties();
+
jGraphCircleGraphLayoutProps.setProperty("preferredMenu","JGraph Layouts");
+
registerService(bc,jGraphCircleGraphLayout,CyLayoutAlgorithm.class,
jGraphCircleGraphLayoutProps);
+
+ Properties jGraphRadialTreeLayoutProps = new Properties();
+ jGraphRadialTreeLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+
registerService(bc,jGraphRadialTreeLayout,CyLayoutAlgorithm.class,
jGraphRadialTreeLayoutProps);
+
+ Properties jGraphGEMLayoutProps = new Properties();
+ jGraphGEMLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+ registerService(bc,jGraphGEMLayout,CyLayoutAlgorithm.class,
jGraphGEMLayoutProps);
+
+ Properties jGraphSpringEmbeddedLayoutProps = new Properties();
+
jGraphSpringEmbeddedLayoutProps.setProperty("preferredMenu","JGraph Layouts");
+
registerService(bc,jGraphSpringEmbeddedLayout,CyLayoutAlgorithm.class,
jGraphSpringEmbeddedLayoutProps);
+
+ Properties jGraphSugiyamaLayoutProps = new Properties();
+ jGraphSugiyamaLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+
registerService(bc,jGraphSugiyamaLayout,CyLayoutAlgorithm.class,
jGraphSugiyamaLayoutProps);
+
+ Properties jGraphTreeLayoutProps = new Properties();
+ jGraphTreeLayoutProps.setProperty("preferredMenu","JGraph
Layouts");
+ registerService(bc,jGraphTreeLayout,CyLayoutAlgorithm.class,
jGraphTreeLayoutProps);
+
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 23:13:51 UTC (rev 26788)
+++
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 23:18:06 UTC (rev 26789)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
- <osgi:service id="jGraphAnnealingLayoutService"
- ref="jGraphAnnealingLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphMoenLayoutService"
- ref="jGraphMoenLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphCircleGraphLayoutService"
- ref="jGraphCircleGraphLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphRadialTreeLayoutService"
- ref="jGraphRadialTreeLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphGEMLayoutService"
- ref="jGraphGEMLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphSpringEmbeddedLayoutService"
- ref="jGraphSpringEmbeddedLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphSugiyamaLayoutService"
- ref="jGraphSugiyamaLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="jGraphTreeLayoutService"
- ref="jGraphTreeLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="JGraph Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:reference id="undoSupportServiceRef"
- interface="org.cytoscape.work.undo.UndoSupport">
- </osgi:reference>
-
-</beans>
Copied:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-13 23:18:06 UTC (rev 26789)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+ <osgi:service id="jGraphAnnealingLayoutService"
+ ref="jGraphAnnealingLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphMoenLayoutService"
+ ref="jGraphMoenLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphCircleGraphLayoutService"
+ ref="jGraphCircleGraphLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphRadialTreeLayoutService"
+ ref="jGraphRadialTreeLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphGEMLayoutService"
+ ref="jGraphGEMLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphSpringEmbeddedLayoutService"
+ ref="jGraphSpringEmbeddedLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphSugiyamaLayoutService"
+ ref="jGraphSugiyamaLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="jGraphTreeLayoutService"
+ ref="jGraphTreeLayout"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="JGraph Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:reference id="undoSupportServiceRef"
+ interface="org.cytoscape.work.undo.UndoSupport">
+ </osgi:reference>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 23:13:51 UTC (rev 26788)
+++
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 23:18:06 UTC (rev 26789)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
- xmlns:context="http://www.springframework.org/schema/context";
- xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xmlns:util="http://www.springframework.org/schema/util";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd";
- default-lazy-init="false">
-
- <context:annotation-config />
-
- <bean id="jGraphAnnealingLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.ANNEALING"/>
- </constructor-arg>
- </bean>
-
- <bean id="jGraphMoenLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.MOEN"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphCircleGraphLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.CIRCLE_GRAPH"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphRadialTreeLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.RADIAL_TREE"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphGEMLayout" class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.GEM"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphSpringEmbeddedLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.SPRING_EMBEDDED"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphSugiyamaLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.SUGIYAMA"/>
- </constructor-arg>
- </bean>
- <bean id="jGraphTreeLayout"
class="csplugins.layout.JGraphLayoutWrapper">
- <constructor-arg ref="undoSupportServiceRef"/>
- <constructor-arg type="int">
- <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.TREE"/>
- </constructor-arg>
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/layout-jgraph-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-13 23:18:06 UTC (rev 26789)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xmlns:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd";
+ default-lazy-init="false">
+
+ <context:annotation-config />
+
+ <bean id="jGraphAnnealingLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.ANNEALING"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="jGraphMoenLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.MOEN"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphCircleGraphLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.CIRCLE_GRAPH"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphRadialTreeLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.RADIAL_TREE"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphGEMLayout" class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.GEM"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphSpringEmbeddedLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.SPRING_EMBEDDED"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphSugiyamaLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.SUGIYAMA"/>
+ </constructor-arg>
+ </bean>
+ <bean id="jGraphTreeLayout"
class="csplugins.layout.JGraphLayoutWrapper">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ <constructor-arg type="int">
+ <util:constant
static-field="csplugins.layout.JGraphLayoutWrapper.TREE"/>
+ </constructor-arg>
+ </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.
