Author: mes
Date: 2011-09-15 16:16:21 -0700 (Thu, 15 Sep 2011)
New Revision: 26835
Added:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/work-swing-impl/impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/work-swing-impl/impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/work-swing-impl/impl/osgi.bnd 2011-09-15
23:16:04 UTC (rev 26834)
+++ core3/impl/branches/no-spring/work-swing-impl/impl/osgi.bnd 2011-09-15
23:16:21 UTC (rev 26835)
@@ -3,6 +3,6 @@
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
Private-Package: ${bundle.namespace}.internal.*
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Added:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
2011-09-15 23:16:21 UTC (rev 26835)
@@ -0,0 +1,99 @@
+
+
+
+
+package org.cytoscape.work.internal;
+
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.util.swing.FileUtil;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+
+import org.cytoscape.work.internal.task.SwingTaskManager;
+import org.cytoscape.work.internal.tunables.*;
+import org.cytoscape.work.internal.UndoSupportImpl;
+import org.cytoscape.work.internal.tunables.GUITunableInterceptorImpl;
+import org.cytoscape.work.internal.tunables.FileHandlerFactory;
+import org.cytoscape.work.internal.tunables.utils.SupportedFileTypesManager;
+import org.cytoscape.work.swing.BasicGUITunableHandlerFactory;
+
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.swing.GUITunableHandlerFactory;
+import org.cytoscape.work.TunableInterceptor;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.work.swing.GUITunableInterceptor;
+import org.cytoscape.work.util.*;
+
+import org.cytoscape.io.write.CyWriterFactory;
+import org.cytoscape.io.read.InputStreamTaskFactory;
+import org.cytoscape.work.TunableInterceptor;
+import org.cytoscape.work.swing.GUITunableHandlerFactory;
+
+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) {
+
+ FileUtil fileUtilRef = getService(bc,FileUtil.class);
+ CyProperty bookmarkServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=bookmarks)");
+ BookmarksUtil bookmarksUtilServiceRef =
getService(bc,BookmarksUtil.class);
+
+ UndoSupportImpl undoSupport = new UndoSupportImpl();
+ GUITunableInterceptorImpl guiTunableInterceptor = new
GUITunableInterceptorImpl();
+ SwingTaskManager swingTaskManager = new
SwingTaskManager(guiTunableInterceptor);
+ SupportedFileTypesManager supportedFileTypesManager = new
SupportedFileTypesManager();
+ BasicGUITunableHandlerFactory booleanHandlerFactory = new
BasicGUITunableHandlerFactory(BooleanHandler.class, Boolean.class,
boolean.class);
+ BasicGUITunableHandlerFactory integerHandlerFactory = new
BasicGUITunableHandlerFactory(IntegerHandler.class, Integer.class, int.class);
+ BasicGUITunableHandlerFactory floatHandlerFactory = new
BasicGUITunableHandlerFactory(FloatHandler.class, Float.class, float.class);
+ BasicGUITunableHandlerFactory doubleHandlerFactory = new
BasicGUITunableHandlerFactory(DoubleHandler.class, Double.class, double.class);
+ BasicGUITunableHandlerFactory longHandlerFactory = new
BasicGUITunableHandlerFactory(LongHandler.class, Long.class, long.class);
+ BasicGUITunableHandlerFactory stringHandlerFactory = new
BasicGUITunableHandlerFactory(StringHandler.class,String.class);
+ BasicGUITunableHandlerFactory boundedIntegerHandlerFactory =
new BasicGUITunableHandlerFactory(BoundedHandler.class,BoundedInteger.class);
+ BasicGUITunableHandlerFactory boundedFloatHandlerFactory = new
BasicGUITunableHandlerFactory(BoundedHandler.class,BoundedFloat.class);
+ BasicGUITunableHandlerFactory boundedDoubleHandlerFactory = new
BasicGUITunableHandlerFactory(BoundedHandler.class,BoundedDouble.class);
+ BasicGUITunableHandlerFactory boundedLongHandlerFactory = new
BasicGUITunableHandlerFactory(BoundedHandler.class,BoundedLong.class);
+ BasicGUITunableHandlerFactory listSingleSelectionHandlerFactory
= new
BasicGUITunableHandlerFactory(ListSingleHandler.class,ListSingleSelection.class);
+ BasicGUITunableHandlerFactory
listMultipleSelectionHandlerFactory = new
BasicGUITunableHandlerFactory(ListMultipleHandler.class,ListMultipleSelection.class);
+ URLHandlerFactory urlHandlerFactory = new
URLHandlerFactory(bookmarkServiceRef,bookmarksUtilServiceRef);
+ FileHandlerFactory fileHandlerFactory = new
FileHandlerFactory(fileUtilRef,supportedFileTypesManager);
+
+ registerService(bc,undoSupport,UndoSupport.class, new
Properties());
+
registerService(bc,guiTunableInterceptor,GUITunableInterceptor.class, new
Properties());
+
registerService(bc,guiTunableInterceptor,TunableInterceptor.class, new
Properties());
+ registerService(bc,swingTaskManager,GUITaskManager.class, new
Properties());
+ registerService(bc,swingTaskManager,TaskManager.class, new
Properties());
+
registerService(bc,integerHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,floatHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,doubleHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,longHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,booleanHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,stringHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,boundedIntegerHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,boundedFloatHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,boundedDoubleHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,boundedLongHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,listSingleSelectionHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,listMultipleSelectionHandlerFactory,GUITunableHandlerFactory.class,
new Properties());
+
registerService(bc,fileHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
registerService(bc,urlHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
+
+
registerServiceListener(bc,supportedFileTypesManager,"addInputStreamTaskFactory","removeInputStreamTaskFactory",InputStreamTaskFactory.class);
+
registerServiceListener(bc,supportedFileTypesManager,"addCyWriterTaskFactory","removeCyWriterTaskFactory",CyWriterFactory.class);
+
registerServiceListener(bc,swingTaskManager,"addTunableInterceptor","removeTunableInterceptor",TunableInterceptor.class);
+
registerServiceListener(bc,guiTunableInterceptor,"addTunableHandlerFactory","removeTunableHandlerFactory",GUITunableHandlerFactory.class);
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 23:16:04 UTC (rev 26834)
+++
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 23:16:21 UTC (rev 26835)
@@ -1,113 +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">
-
- <!-- Services imported by this bundle -->
- <osgi:reference id="fileUtilRef"
interface="org.cytoscape.util.swing.FileUtil" />
-
- <!-- Services provided by this bundle -->
-
- <osgi:service id="undoSupportService" ref="undoSupport"
- interface="org.cytoscape.work.undo.UndoSupport">
- </osgi:service>
-
- <osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=bookmarks)" />
-
- <osgi:reference id="bookmarksUtilServiceRef"
- interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-
- <osgi:service id="guiTunableInterceptorService"
ref="guiTunableInterceptor">
- <osgi:interfaces>
-
<value>org.cytoscape.work.swing.GUITunableInterceptor</value>
- <value>org.cytoscape.work.TunableInterceptor</value>
- </osgi:interfaces>
- </osgi:service>
-
- <osgi:service id="taskManagerService" ref="swingTaskManager">
- <osgi:interfaces>
- <value>org.cytoscape.work.swing.GUITaskManager</value>
- <value>org.cytoscape.work.TaskManager</value>
- </osgi:interfaces>
- </osgi:service>
-
- <osgi:service id="integerHandlerFactoryService"
ref="integerHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="floatHandlerFactoryService" ref="floatHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="doubleHandlerFactoryService"
ref="doubleHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="longHandlerFactoryService" ref="longHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="booleanHandlerFactoryService"
ref="booleanHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="stringHandlerFactoryService"
ref="stringHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="boundedIntegerHandlerFactoryService"
ref="boundedIntegerHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="boundedFloatHandlerFactoryService"
ref="boundedFloatHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="boundedDoubleHandlerFactoryService"
ref="boundedDoubleHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="boundedLongHandlerFactoryService"
ref="boundedLongHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="listSingleSelectionHandlerFactoryService"
ref="listSingleSelectionHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="listMultipleSelectionHandlerFactoryService"
ref="listMultipleSelectionHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="fileHandlerFactoryService" ref="fileHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
- <osgi:service id="urlHandlerFactoryService" ref="urlHandlerFactory"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
- </osgi:service>
-
-
-
- <osgi:set id="supportedFileTypes"
- interface="org.cytoscape.io.read.InputStreamTaskFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addInputStreamTaskFactory"
- unbind-method="removeInputStreamTaskFactory"
- ref="supportedFileTypesManager" />
- </osgi:set>
-
- <osgi:set id="supportedFileTypes2"
- interface="org.cytoscape.io.write.CyWriterFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addCyWriterTaskFactory"
- unbind-method="removeCyWriterTaskFactory"
- ref="supportedFileTypesManager" />
- </osgi:set>
-
- <osgi:set id="externalTunableInterceptors"
- interface="org.cytoscape.work.TunableInterceptor"
- cardinality="0..N">
- <osgi:listener bind-method="addTunableInterceptor"
- unbind-method="removeTunableInterceptor"
- ref="swingTaskManager" />
- </osgi:set>
-
- <osgi:set id="tunableHandlerFactories"
- interface="org.cytoscape.work.swing.GUITunableHandlerFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addTunableHandlerFactory"
- unbind-method="removeTunableHandlerFactory"
- ref="guiTunableInterceptor" />
- </osgi:set>
-</beans>
Copied:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 23:16:21 UTC (rev 26835)
@@ -0,0 +1,113 @@
+<?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">
+
+ <!-- Services imported by this bundle -->
+ <osgi:reference id="fileUtilRef"
interface="org.cytoscape.util.swing.FileUtil" />
+
+ <!-- Services provided by this bundle -->
+
+ <osgi:service id="undoSupportService" ref="undoSupport"
+ interface="org.cytoscape.work.undo.UndoSupport">
+ </osgi:service>
+
+ <osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=bookmarks)" />
+
+ <osgi:reference id="bookmarksUtilServiceRef"
+ interface="org.cytoscape.property.bookmark.BookmarksUtil" />
+
+ <osgi:service id="guiTunableInterceptorService"
ref="guiTunableInterceptor">
+ <osgi:interfaces>
+
<value>org.cytoscape.work.swing.GUITunableInterceptor</value>
+ <value>org.cytoscape.work.TunableInterceptor</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <osgi:service id="taskManagerService" ref="swingTaskManager">
+ <osgi:interfaces>
+ <value>org.cytoscape.work.swing.GUITaskManager</value>
+ <value>org.cytoscape.work.TaskManager</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <osgi:service id="integerHandlerFactoryService"
ref="integerHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="floatHandlerFactoryService" ref="floatHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="doubleHandlerFactoryService"
ref="doubleHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="longHandlerFactoryService" ref="longHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="booleanHandlerFactoryService"
ref="booleanHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="stringHandlerFactoryService"
ref="stringHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="boundedIntegerHandlerFactoryService"
ref="boundedIntegerHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="boundedFloatHandlerFactoryService"
ref="boundedFloatHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="boundedDoubleHandlerFactoryService"
ref="boundedDoubleHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="boundedLongHandlerFactoryService"
ref="boundedLongHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="listSingleSelectionHandlerFactoryService"
ref="listSingleSelectionHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="listMultipleSelectionHandlerFactoryService"
ref="listMultipleSelectionHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="fileHandlerFactoryService" ref="fileHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+ <osgi:service id="urlHandlerFactoryService" ref="urlHandlerFactory"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory">
+ </osgi:service>
+
+
+
+ <osgi:set id="supportedFileTypes"
+ interface="org.cytoscape.io.read.InputStreamTaskFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addInputStreamTaskFactory"
+ unbind-method="removeInputStreamTaskFactory"
+ ref="supportedFileTypesManager" />
+ </osgi:set>
+
+ <osgi:set id="supportedFileTypes2"
+ interface="org.cytoscape.io.write.CyWriterFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addCyWriterTaskFactory"
+ unbind-method="removeCyWriterTaskFactory"
+ ref="supportedFileTypesManager" />
+ </osgi:set>
+
+ <osgi:set id="externalTunableInterceptors"
+ interface="org.cytoscape.work.TunableInterceptor"
+ cardinality="0..N">
+ <osgi:listener bind-method="addTunableInterceptor"
+ unbind-method="removeTunableInterceptor"
+ ref="swingTaskManager" />
+ </osgi:set>
+
+ <osgi:set id="tunableHandlerFactories"
+ interface="org.cytoscape.work.swing.GUITunableHandlerFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addTunableHandlerFactory"
+ unbind-method="removeTunableHandlerFactory"
+ ref="guiTunableInterceptor" />
+ </osgi:set>
+</beans>
Deleted:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 23:16:04 UTC (rev 26834)
+++
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 23:16:21 UTC (rev 26835)
@@ -1,112 +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";
- 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/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.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="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl" />
-
- <bean id="swingTaskManager"
class="org.cytoscape.work.internal.task.SwingTaskManager">
- <constructor-arg ref="guiTunableInterceptor" />
- </bean>
-
- <bean id="guiTunableInterceptor"
-
class="org.cytoscape.work.internal.tunables.GUITunableInterceptorImpl">
- </bean>
-
- <bean id="supportedFileTypesManager"
class="org.cytoscape.work.internal.tunables.utils.SupportedFileTypesManager" />
-
- <bean id="booleanHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.BooleanHandler" />
- <constructor-arg>
- <list>
- <value>java.lang.Boolean</value>
- <util:constant
static-field="java.lang.Boolean.TYPE"/>
- </list>
- </constructor-arg>
- </bean>
- <bean id="integerHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.IntegerHandler" />
- <constructor-arg>
- <list>
- <value>java.lang.Integer</value>
- <util:constant
static-field="java.lang.Integer.TYPE"/>
- </list>
- </constructor-arg>
- </bean>
- <bean id="floatHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.FloatHandler" />
- <constructor-arg>
- <list>
- <value>java.lang.Float</value>
- <util:constant
static-field="java.lang.Float.TYPE"/>
- </list>
- </constructor-arg>
- </bean>
- <bean id="doubleHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.DoubleHandler" />
- <constructor-arg>
- <list>
- <value>java.lang.Double</value>
- <util:constant
static-field="java.lang.Double.TYPE"/>
- </list>
- </constructor-arg>
- </bean>
- <bean id="longHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.LongHandler" />
- <constructor-arg>
- <list>
- <value>java.lang.Long</value>
- <util:constant
static-field="java.lang.Long.TYPE"/>
- </list>
- </constructor-arg>
- </bean>
- <bean id="stringHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.StringHandler" />
- <constructor-arg value="java.lang.String" />
- </bean>
- <bean id="boundedIntegerHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
- <constructor-arg value="org.cytoscape.work.util.BoundedInteger"
/>
- </bean>
- <bean id="boundedFloatHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
- <constructor-arg value="org.cytoscape.work.util.BoundedFloat" />
- </bean>
- <bean id="boundedDoubleHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
- <constructor-arg value="org.cytoscape.work.util.BoundedDouble"
/>
- </bean>
- <bean id="boundedLongHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
- <constructor-arg value="org.cytoscape.work.util.BoundedLong" />
- </bean>
- <bean id="listSingleSelectionHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.ListSingleHandler" />
- <constructor-arg
value="org.cytoscape.work.util.ListSingleSelection" />
- </bean>
- <bean id="listMultipleSelectionHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
- <constructor-arg
value="org.cytoscape.work.internal.tunables.ListMultipleHandler" />
- <constructor-arg
value="org.cytoscape.work.util.ListMultipleSelection" />
- </bean>
- <bean id="urlHandlerFactory"
class="org.cytoscape.work.internal.tunables.URLHandlerFactory">
- <constructor-arg ref="bookmarkServiceRef" />
- <constructor-arg ref="bookmarksUtilServiceRef" />
- </bean>
- <bean id="fileHandlerFactory"
class="org.cytoscape.work.internal.tunables.FileHandlerFactory">
- <constructor-arg ref="fileUtilRef"/>
- <constructor-arg ref="supportedFileTypesManager" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/work-swing-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 23:16:21 UTC (rev 26835)
@@ -0,0 +1,112 @@
+<?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";
+ 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/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.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="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl" />
+
+ <bean id="swingTaskManager"
class="org.cytoscape.work.internal.task.SwingTaskManager">
+ <constructor-arg ref="guiTunableInterceptor" />
+ </bean>
+
+ <bean id="guiTunableInterceptor"
+
class="org.cytoscape.work.internal.tunables.GUITunableInterceptorImpl">
+ </bean>
+
+ <bean id="supportedFileTypesManager"
class="org.cytoscape.work.internal.tunables.utils.SupportedFileTypesManager" />
+
+ <bean id="booleanHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.BooleanHandler" />
+ <constructor-arg>
+ <list>
+ <value>java.lang.Boolean</value>
+ <util:constant
static-field="java.lang.Boolean.TYPE"/>
+ </list>
+ </constructor-arg>
+ </bean>
+ <bean id="integerHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.IntegerHandler" />
+ <constructor-arg>
+ <list>
+ <value>java.lang.Integer</value>
+ <util:constant
static-field="java.lang.Integer.TYPE"/>
+ </list>
+ </constructor-arg>
+ </bean>
+ <bean id="floatHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.FloatHandler" />
+ <constructor-arg>
+ <list>
+ <value>java.lang.Float</value>
+ <util:constant
static-field="java.lang.Float.TYPE"/>
+ </list>
+ </constructor-arg>
+ </bean>
+ <bean id="doubleHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.DoubleHandler" />
+ <constructor-arg>
+ <list>
+ <value>java.lang.Double</value>
+ <util:constant
static-field="java.lang.Double.TYPE"/>
+ </list>
+ </constructor-arg>
+ </bean>
+ <bean id="longHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.LongHandler" />
+ <constructor-arg>
+ <list>
+ <value>java.lang.Long</value>
+ <util:constant
static-field="java.lang.Long.TYPE"/>
+ </list>
+ </constructor-arg>
+ </bean>
+ <bean id="stringHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.StringHandler" />
+ <constructor-arg value="java.lang.String" />
+ </bean>
+ <bean id="boundedIntegerHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
+ <constructor-arg value="org.cytoscape.work.util.BoundedInteger"
/>
+ </bean>
+ <bean id="boundedFloatHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
+ <constructor-arg value="org.cytoscape.work.util.BoundedFloat" />
+ </bean>
+ <bean id="boundedDoubleHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
+ <constructor-arg value="org.cytoscape.work.util.BoundedDouble"
/>
+ </bean>
+ <bean id="boundedLongHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.BoundedHandler" />
+ <constructor-arg value="org.cytoscape.work.util.BoundedLong" />
+ </bean>
+ <bean id="listSingleSelectionHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.ListSingleHandler" />
+ <constructor-arg
value="org.cytoscape.work.util.ListSingleSelection" />
+ </bean>
+ <bean id="listMultipleSelectionHandlerFactory"
class="org.cytoscape.work.swing.BasicGUITunableHandlerFactory">
+ <constructor-arg
value="org.cytoscape.work.internal.tunables.ListMultipleHandler" />
+ <constructor-arg
value="org.cytoscape.work.util.ListMultipleSelection" />
+ </bean>
+ <bean id="urlHandlerFactory"
class="org.cytoscape.work.internal.tunables.URLHandlerFactory">
+ <constructor-arg ref="bookmarkServiceRef" />
+ <constructor-arg ref="bookmarksUtilServiceRef" />
+ </bean>
+ <bean id="fileHandlerFactory"
class="org.cytoscape.work.internal.tunables.FileHandlerFactory">
+ <constructor-arg ref="fileUtilRef"/>
+ <constructor-arg ref="supportedFileTypesManager" />
+ </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.
