Author: mes
Date: 2011-09-16 13:20:30 -0700 (Fri, 16 Sep 2011)
New Revision: 26842
Added:
core3/impl/branches/no-spring/layout-impl/src/main/java/org/cytoscape/view/layout/internal/CyActivator.java
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/layout-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/layout-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/layout-impl/osgi.bnd 2011-09-16 20:08:52 UTC
(rev 26841)
+++ core3/impl/branches/no-spring/layout-impl/osgi.bnd 2011-09-16 20:20:30 UTC
(rev 26842)
@@ -3,3 +3,4 @@
#-----------------------------------------------------------------
Private-Package: ${bundle.namespace}, ${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Added:
core3/impl/branches/no-spring/layout-impl/src/main/java/org/cytoscape/view/layout/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/layout-impl/src/main/java/org/cytoscape/view/layout/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/layout-impl/src/main/java/org/cytoscape/view/layout/internal/CyActivator.java
2011-09-16 20:20:30 UTC (rev 26842)
@@ -0,0 +1,47 @@
+
+
+package org.cytoscape.view.layout.internal;
+
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.work.undo.UndoSupport;
+
+import org.cytoscape.view.layout.internal.CyLayoutsImpl;
+import org.cytoscape.view.layout.internal.algorithms.GridNodeLayout;
+
+import org.cytoscape.view.layout.CyLayoutAlgorithm;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
+
+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);
+ CyProperty cyPropertyServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=cytoscape3.props)");
+
+ CyLayoutsImpl cyLayouts = new
CyLayoutsImpl(cyPropertyServiceRef);
+ GridNodeLayout gridNodeLayout = new
GridNodeLayout(undoSupportServiceRef);
+
+ registerService(bc,cyLayouts,CyLayoutAlgorithmManager.class,
new Properties());
+
+ Properties gridNodeLayoutProps = new Properties();
+ gridNodeLayoutProps.setProperty("preferredMenu","Cytoscape
Layouts");
+ registerService(bc,gridNodeLayout,CyLayoutAlgorithm.class,
gridNodeLayoutProps);
+
+
registerServiceListener(bc,cyLayouts,"addLayout","removeLayout",CyLayoutAlgorithm.class);
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-16 20:08:52 UTC (rev 26841)
+++
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-16 20:20:30 UTC (rev 26842)
@@ -1,32 +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="cyLayoutsService" ref="cyLayouts"
- interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
- </osgi:service>
-
- <osgi:service id="gridNodeLayoutService" ref="gridNodeLayout"
- interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
- <osgi:service-properties>
- <entry key="preferredMenu" value="Cytoscape Layouts" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:set id="cyLayoutAlgorithmSet"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm"
- cardinality="0..N">
- <osgi:listener bind-method="addLayout"
unbind-method="removeLayout"
- ref="cyLayouts" />
- </osgi:set>
-
- <osgi:reference id="undoSupportServiceRef"
interface="org.cytoscape.work.undo.UndoSupport">
- </osgi:reference>
-
- <osgi:reference id="cyPropertyServiceRef"
interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=cytoscape3.props)" />
-
-
-</beans>
Copied:
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-16 20:20:30 UTC (rev 26842)
@@ -0,0 +1,32 @@
+<?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="cyLayoutsService" ref="cyLayouts"
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
+ </osgi:service>
+
+ <osgi:service id="gridNodeLayoutService" ref="gridNodeLayout"
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+ <osgi:service-properties>
+ <entry key="preferredMenu" value="Cytoscape Layouts" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:set id="cyLayoutAlgorithmSet"
interface="org.cytoscape.view.layout.CyLayoutAlgorithm"
+ cardinality="0..N">
+ <osgi:listener bind-method="addLayout"
unbind-method="removeLayout"
+ ref="cyLayouts" />
+ </osgi:set>
+
+ <osgi:reference id="undoSupportServiceRef"
interface="org.cytoscape.work.undo.UndoSupport">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyServiceRef"
interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=cytoscape3.props)" />
+
+
+</beans>
Deleted:
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-16 20:08:52 UTC (rev 26841)
+++
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-16 20:20:30 UTC (rev 26842)
@@ -1,29 +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";
- 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";
- default-lazy-init="false">
-
- <import resource="bundle-context-osgi.xml" />
-
- <context:annotation-config />
-
- <bean id="cyLayouts"
class="org.cytoscape.view.layout.internal.CyLayoutsImpl">
- <constructor-arg ref="cyPropertyServiceRef"/>
- </bean>
-
- <bean id="gridNodeLayout"
class="org.cytoscape.view.layout.internal.algorithms.GridNodeLayout">
- <constructor-arg ref="undoSupportServiceRef"/>
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-16 20:20:30 UTC (rev 26842)
@@ -0,0 +1,29 @@
+<?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";
+ 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";
+ default-lazy-init="false">
+
+ <import resource="bundle-context-osgi.xml" />
+
+ <context:annotation-config />
+
+ <bean id="cyLayouts"
class="org.cytoscape.view.layout.internal.CyLayoutsImpl">
+ <constructor-arg ref="cyPropertyServiceRef"/>
+ </bean>
+
+ <bean id="gridNodeLayout"
class="org.cytoscape.view.layout.internal.algorithms.GridNodeLayout">
+ <constructor-arg ref="undoSupportServiceRef"/>
+ </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.
