Author: mes
Date: 2011-09-15 12:28:18 -0700 (Thu, 15 Sep 2011)
New Revision: 26809
Added:
core3/impl/branches/no-spring/manual-layout-impl/src/main/java/org/cytoscape/view/manual/internal/CyActivator.java
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/manual-layout-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/manual-layout-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/manual-layout-impl/osgi.bnd 2011-09-15
17:16:31 UTC (rev 26808)
+++ core3/impl/branches/no-spring/manual-layout-impl/osgi.bnd 2011-09-15
19:28:18 UTC (rev 26809)
@@ -2,4 +2,5 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Private-Package: ${bundle.namespace},${bundle.namespace}.*
+Private-Package:
${bundle.namespace},${bundle.namespace}.*,org.cytoscape.math,org.cytoscape.math.*
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Added:
core3/impl/branches/no-spring/manual-layout-impl/src/main/java/org/cytoscape/view/manual/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/manual-layout-impl/src/main/java/org/cytoscape/view/manual/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/manual-layout-impl/src/main/java/org/cytoscape/view/manual/internal/CyActivator.java
2011-09-15 19:28:18 UTC (rev 26809)
@@ -0,0 +1,54 @@
+
+
+
+
+package org.cytoscape.view.manual.internal;
+
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+
+import org.cytoscape.view.manual.internal.rotate.RotatePanelAction;
+import org.cytoscape.view.manual.internal.scale.ScalePanelAction;
+import org.cytoscape.view.manual.internal.control.ControlPanel;
+import org.cytoscape.view.manual.internal.scale.ScalePanel;
+import org.cytoscape.view.manual.internal.control.ControlPanelAction;
+import org.cytoscape.view.manual.internal.rotate.RotatePanel;
+
+import org.cytoscape.application.swing.CytoPanelComponent;
+
+
+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) {
+
+ CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+
+ ControlPanel controlPanel = new
ControlPanel(cyApplicationManagerServiceRef);
+ RotatePanel rotatePanel = new
RotatePanel(cyApplicationManagerServiceRef);
+ ScalePanel scalePanel = new
ScalePanel(cyApplicationManagerServiceRef);
+ ControlPanelAction controlPanelAction = new
ControlPanelAction(controlPanel,cySwingApplicationServiceRef,cyApplicationManagerServiceRef);
+ RotatePanelAction rotatePanelAction = new
RotatePanelAction(rotatePanel,cySwingApplicationServiceRef,cyApplicationManagerServiceRef);
+ ScalePanelAction scalePanelAction = new
ScalePanelAction(scalePanel,cySwingApplicationServiceRef,cyApplicationManagerServiceRef);
+
+ registerAllServices(bc,controlPanelAction, new Properties());
+ registerAllServices(bc,scalePanelAction, new Properties());
+ registerAllServices(bc,rotatePanelAction, new Properties());
+ registerService(bc,controlPanel,CytoPanelComponent.class, new
Properties());
+ registerService(bc,scalePanel,CytoPanelComponent.class, new
Properties());
+ registerService(bc,rotatePanel,CytoPanelComponent.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 17:16:31 UTC (rev 26808)
+++
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:28:18 UTC (rev 26809)
@@ -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:reference id="cySwingApplicationServiceRef"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:service id="controlPanelActionService" ref="controlPanelAction"
auto-export="interfaces" />
-
- <osgi:service id="scalePanelActionService" ref="scalePanelAction"
auto-export="interfaces" />
-
- <osgi:service id="rotatePanelActionService" ref="rotatePanelAction"
auto-export="interfaces" />
-
- <osgi:service id="controlPanelService"
- ref="controlPanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
- </osgi:service>
-
- <osgi:service id="scalePanelService"
- ref="scalePanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
- </osgi:service>
-
- <osgi:service id="rotatePanelService"
- ref="rotatePanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
- </osgi:service>
-</beans>
Copied:
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 19:28:18 UTC (rev 26809)
@@ -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:reference id="cySwingApplicationServiceRef"
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
+
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:service id="controlPanelActionService" ref="controlPanelAction"
auto-export="interfaces" />
+
+ <osgi:service id="scalePanelActionService" ref="scalePanelAction"
auto-export="interfaces" />
+
+ <osgi:service id="rotatePanelActionService" ref="rotatePanelAction"
auto-export="interfaces" />
+
+ <osgi:service id="controlPanelService"
+ ref="controlPanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
+ </osgi:service>
+
+ <osgi:service id="scalePanelService"
+ ref="scalePanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
+ </osgi:service>
+
+ <osgi:service id="rotatePanelService"
+ ref="rotatePanel"
interface="org.cytoscape.application.swing.CytoPanelComponent">
+ </osgi:service>
+</beans>
Deleted:
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 17:16:31 UTC (rev 26808)
+++
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:28:18 UTC (rev 26809)
@@ -1,51 +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:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
-
- <!-- regular spring configuration file defining the beans for this
- bundle. We've kept the osgi definitions in a separate
- configuration file so that this file can easily be used
- for integration testing outside of an OSGi environment -->
-
- <context:annotation-config/>
-
- <bean id="controlPanel"
class="org.cytoscape.view.manual.internal.control.ControlPanel">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="rotatePanel"
class="org.cytoscape.view.manual.internal.rotate.RotatePanel">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="scalePanel"
class="org.cytoscape.view.manual.internal.scale.ScalePanel">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="controlPanelAction"
-
class="org.cytoscape.view.manual.internal.control.ControlPanelAction">
- <constructor-arg ref="controlPanel" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="rotatePanelAction"
-
class="org.cytoscape.view.manual.internal.rotate.RotatePanelAction">
- <constructor-arg ref="rotatePanel" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="scalePanelAction"
- class="org.cytoscape.view.manual.internal.scale.ScalePanelAction">
- <constructor-arg ref="scalePanel" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/manual-layout-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 19:28:18 UTC (rev 26809)
@@ -0,0 +1,51 @@
+<?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:context="http://www.springframework.org/schema/context";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+ <!-- regular spring configuration file defining the beans for this
+ bundle. We've kept the osgi definitions in a separate
+ configuration file so that this file can easily be used
+ for integration testing outside of an OSGi environment -->
+
+ <context:annotation-config/>
+
+ <bean id="controlPanel"
class="org.cytoscape.view.manual.internal.control.ControlPanel">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="rotatePanel"
class="org.cytoscape.view.manual.internal.rotate.RotatePanel">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="scalePanel"
class="org.cytoscape.view.manual.internal.scale.ScalePanel">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="controlPanelAction"
+
class="org.cytoscape.view.manual.internal.control.ControlPanelAction">
+ <constructor-arg ref="controlPanel" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="rotatePanelAction"
+
class="org.cytoscape.view.manual.internal.rotate.RotatePanelAction">
+ <constructor-arg ref="rotatePanel" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="scalePanelAction"
+ class="org.cytoscape.view.manual.internal.scale.ScalePanelAction">
+ <constructor-arg ref="scalePanel" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </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.
