Author: mes
Date: 2011-09-13 16:13:51 -0700 (Tue, 13 Sep 2011)
New Revision: 26788

Added:
   
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/java/csplugins/layout/CyActivator.java
   
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
   
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
   
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
   core3/impl/branches/no-spring/layout-cytoscape-impl/osgi.bnd
Log:
removed use of spring

Modified: core3/impl/branches/no-spring/layout-cytoscape-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/layout-cytoscape-impl/osgi.bnd        
2011-09-13 23:10:30 UTC (rev 26787)
+++ core3/impl/branches/no-spring/layout-cytoscape-impl/osgi.bnd        
2011-09-13 23:13:51 UTC (rev 26788)
@@ -3,4 +3,4 @@
 #-----------------------------------------------------------------
 
 Private-Package: csplugins.*
-
+Bundle-Activator: csplugins.layout.CyActivator

Added: 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/java/csplugins/layout/CyActivator.java
===================================================================
--- 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/java/csplugins/layout/CyActivator.java
                         (rev 0)
+++ 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/java/csplugins/layout/CyActivator.java
 2011-09-13 23:13:51 UTC (rev 26788)
@@ -0,0 +1,91 @@
+
+
+
+
+package csplugins.layout; 
+
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.model.CyTableManager;
+
+import csplugins.layout.algorithms.bioLayout.BioLayoutFRAlgorithm;
+import csplugins.layout.algorithms.StackedNodeLayout;
+import csplugins.layout.algorithms.bioLayout.BioLayoutKKAlgorithm;
+import csplugins.layout.algorithms.GroupAttributesLayout;
+import csplugins.layout.algorithms.graphPartition.ISOMLayout;
+import csplugins.layout.algorithms.circularLayout.CircularLayoutAlgorithm;
+import csplugins.layout.algorithms.graphPartition.DegreeSortedCircleLayout;
+import 
csplugins.layout.algorithms.hierarchicalLayout.HierarchicalLayoutAlgorithm;
+import csplugins.layout.algorithms.graphPartition.AttributeCircleLayout;
+
+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);
+               CyTableManager cyTableManagerServiceRef = 
getService(bc,CyTableManager.class);
+               
+               CircularLayoutAlgorithm circularLayoutAlgorithm = new 
CircularLayoutAlgorithm(undoSupportServiceRef);
+               HierarchicalLayoutAlgorithm hierarchicalLayoutAlgorithm = new 
HierarchicalLayoutAlgorithm(undoSupportServiceRef);
+               AttributeCircleLayout attributeCircleLayout = new 
AttributeCircleLayout(undoSupportServiceRef);
+               DegreeSortedCircleLayout degreeSortedCircleLayout = new 
DegreeSortedCircleLayout(undoSupportServiceRef,cyTableManagerServiceRef);
+               ISOMLayout ISOMLayout = new ISOMLayout(undoSupportServiceRef);
+               BioLayoutKKAlgorithm bioLayoutKKAlgorithmFALSE = new 
BioLayoutKKAlgorithm(undoSupportServiceRef,false);
+               BioLayoutKKAlgorithm bioLayoutKKAlgorithmTRUE = new 
BioLayoutKKAlgorithm(undoSupportServiceRef,true);
+               BioLayoutFRAlgorithm bioLayoutFRAlgorithm = new 
BioLayoutFRAlgorithm(undoSupportServiceRef,true);
+               StackedNodeLayout stackedNodeLayout = new 
StackedNodeLayout(undoSupportServiceRef);
+               GroupAttributesLayout groupAttributesLayout = new 
GroupAttributesLayout(undoSupportServiceRef,cyTableManagerServiceRef);
+               
+               
+               Properties circularLayoutAlgorithmProps = new Properties();
+               
circularLayoutAlgorithmProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,circularLayoutAlgorithm,CyLayoutAlgorithm.class, 
circularLayoutAlgorithmProps);
+
+               Properties hierarchicalLayoutAlgorithmProps = new Properties();
+               
hierarchicalLayoutAlgorithmProps.setProperty("preferredMenu","Cytoscape 
Layouts");
+               
registerService(bc,hierarchicalLayoutAlgorithm,CyLayoutAlgorithm.class, 
hierarchicalLayoutAlgorithmProps);
+
+               Properties attributeCircleLayoutProps = new Properties();
+               
attributeCircleLayoutProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,attributeCircleLayout,CyLayoutAlgorithm.class, 
attributeCircleLayoutProps);
+
+               Properties degreeSortedCircleLayoutProps = new Properties();
+               
degreeSortedCircleLayoutProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,degreeSortedCircleLayout,CyLayoutAlgorithm.class, 
degreeSortedCircleLayoutProps);
+
+               Properties ISOMLayoutProps = new Properties();
+               ISOMLayoutProps.setProperty("preferredMenu","Cytoscape 
Layouts");
+               registerService(bc,ISOMLayout,CyLayoutAlgorithm.class, 
ISOMLayoutProps);
+
+               Properties bioLayoutKKAlgorithmFALSEProps = new Properties();
+               
bioLayoutKKAlgorithmFALSEProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,bioLayoutKKAlgorithmFALSE,CyLayoutAlgorithm.class, 
bioLayoutKKAlgorithmFALSEProps);
+
+               Properties bioLayoutKKAlgorithmTRUEProps = new Properties();
+               
bioLayoutKKAlgorithmTRUEProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,bioLayoutKKAlgorithmTRUE,CyLayoutAlgorithm.class, 
bioLayoutKKAlgorithmTRUEProps);
+
+               Properties bioLayoutFRAlgorithmProps = new Properties();
+               
bioLayoutFRAlgorithmProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,bioLayoutFRAlgorithm,CyLayoutAlgorithm.class, 
bioLayoutFRAlgorithmProps);
+
+               Properties groupAttributesLayoutProps = new Properties();
+               
groupAttributesLayoutProps.setProperty("preferredMenu","Cytoscape Layouts");
+               
registerService(bc,groupAttributesLayout,CyLayoutAlgorithm.class, 
groupAttributesLayoutProps);
+       }
+}
+

Deleted: 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
--- 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
      2011-09-13 23:10:30 UTC (rev 26787)
+++ 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
      2011-09-13 23:13:51 UTC (rev 26788)
@@ -1,80 +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="circularLayoutAlgorithmService"
-               ref="circularLayoutAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="hierarchicalLayoutAlgorithmService"
-               ref="hierarchicalLayoutAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="attributeCircleLayoutService"
-               ref="attributeCircleLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="degreeSortedCircleLayoutService"
-               ref="degreeSortedCircleLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="ISOMLayoutService"
-               ref="ISOMLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="bioLayoutKKAlgorithmFALSEService"
-               ref="bioLayoutKKAlgorithmFALSE" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="bioLayoutKKAlgorithmTRUEService"
-               ref="bioLayoutKKAlgorithmTRUE" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:service id="bioLayoutFRAlgorithmService"
-               ref="bioLayoutFRAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-<!--
-       <osgi:service id="stackedNodeLayoutService"
-               ref="stackedNodeLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
--->
-       <osgi:service id="groupAttributesLayoutService"
-               ref="groupAttributesLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
-               <osgi:service-properties>
-                       <entry key="preferredMenu" value="Cytoscape Layouts" />
-               </osgi:service-properties>
-       </osgi:service>
-
-       <osgi:reference id="undoSupportServiceRef" 
interface="org.cytoscape.work.undo.UndoSupport" />
-       <osgi:reference id="cyTableManagerServiceRef" 
interface="org.cytoscape.model.CyTableManager" />
-</beans>

Copied: 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
 (from rev 26762, 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
--- 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
                               (rev 0)
+++ 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
       2011-09-13 23:13:51 UTC (rev 26788)
@@ -0,0 +1,80 @@
+<?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="circularLayoutAlgorithmService"
+               ref="circularLayoutAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="hierarchicalLayoutAlgorithmService"
+               ref="hierarchicalLayoutAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="attributeCircleLayoutService"
+               ref="attributeCircleLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="degreeSortedCircleLayoutService"
+               ref="degreeSortedCircleLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="ISOMLayoutService"
+               ref="ISOMLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="bioLayoutKKAlgorithmFALSEService"
+               ref="bioLayoutKKAlgorithmFALSE" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="bioLayoutKKAlgorithmTRUEService"
+               ref="bioLayoutKKAlgorithmTRUE" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:service id="bioLayoutFRAlgorithmService"
+               ref="bioLayoutFRAlgorithm" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+<!--
+       <osgi:service id="stackedNodeLayoutService"
+               ref="stackedNodeLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+-->
+       <osgi:service id="groupAttributesLayoutService"
+               ref="groupAttributesLayout" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithm">
+               <osgi:service-properties>
+                       <entry key="preferredMenu" value="Cytoscape Layouts" />
+               </osgi:service-properties>
+       </osgi:service>
+
+       <osgi:reference id="undoSupportServiceRef" 
interface="org.cytoscape.work.undo.UndoSupport" />
+       <osgi:reference id="cyTableManagerServiceRef" 
interface="org.cytoscape.model.CyTableManager" />
+</beans>

Deleted: 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml
   2011-09-13 23:10:30 UTC (rev 26787)
+++ 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml
   2011-09-13 23:13:51 UTC (rev 26788)
@@ -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: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="circularLayoutAlgorithm" 
class="csplugins.layout.algorithms.circularLayout.CircularLayoutAlgorithm">
-               <constructor-arg ref="undoSupportServiceRef"/>
-       </bean>
-       <bean id="hierarchicalLayoutAlgorithm" 
class="csplugins.layout.algorithms.hierarchicalLayout.HierarchicalLayoutAlgorithm">
-               <constructor-arg ref="undoSupportServiceRef"/>
-       </bean>
-
-       <bean id="attributeCircleLayout" 
class="csplugins.layout.algorithms.graphPartition.AttributeCircleLayout">
-               <constructor-arg ref="undoSupportServiceRef"/>
-       </bean>
-
-       <bean id="degreeSortedCircleLayout" 
class="csplugins.layout.algorithms.graphPartition.DegreeSortedCircleLayout">
-               <constructor-arg ref="undoSupportServiceRef"/>
-               <constructor-arg ref="cyTableManagerServiceRef"/>
-       </bean>
-
-       <bean id="ISOMLayout" 
class="csplugins.layout.algorithms.graphPartition.ISOMLayout">
-               <constructor-arg ref="undoSupportServiceRef"/>
-       </bean>
-
-       <bean id="bioLayoutKKAlgorithmFALSE" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutKKAlgorithm">
-               <constructor-arg ref="undoSupportServiceRef"/>
-               <constructor-arg type="boolean" value="false"/>
-       </bean>
-
-       <bean id="bioLayoutKKAlgorithmTRUE" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutKKAlgorithm">
-               <constructor-arg ref="undoSupportServiceRef"/>
-               <constructor-arg type="boolean" value="true"/>
-       </bean>
-
-       <bean id="bioLayoutFRAlgorithm" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutFRAlgorithm">
-               <constructor-arg ref="undoSupportServiceRef"/>
-               <constructor-arg type="boolean" value="true"/>
-       </bean>
-
-       <bean id="stackedNodeLayout" 
class="csplugins.layout.algorithms.StackedNodeLayout">
-               <constructor-arg ref="undoSupportServiceRef"/>
-       </bean>
-
-
-       <bean id="groupAttributesLayout" 
class="csplugins.layout.algorithms.GroupAttributesLayout">
-               <constructor-arg ref="undoSupportServiceRef"/>
-               <constructor-arg ref="cyTableManagerServiceRef"/>
-       </bean>
-
-</beans>

Copied: 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
 (from rev 26762, 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
--- 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
                            (rev 0)
+++ 
core3/impl/branches/no-spring/layout-cytoscape-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
    2011-09-13 23:13:51 UTC (rev 26788)
@@ -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: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="circularLayoutAlgorithm" 
class="csplugins.layout.algorithms.circularLayout.CircularLayoutAlgorithm">
+               <constructor-arg ref="undoSupportServiceRef"/>
+       </bean>
+       <bean id="hierarchicalLayoutAlgorithm" 
class="csplugins.layout.algorithms.hierarchicalLayout.HierarchicalLayoutAlgorithm">
+               <constructor-arg ref="undoSupportServiceRef"/>
+       </bean>
+
+       <bean id="attributeCircleLayout" 
class="csplugins.layout.algorithms.graphPartition.AttributeCircleLayout">
+               <constructor-arg ref="undoSupportServiceRef"/>
+       </bean>
+
+       <bean id="degreeSortedCircleLayout" 
class="csplugins.layout.algorithms.graphPartition.DegreeSortedCircleLayout">
+               <constructor-arg ref="undoSupportServiceRef"/>
+               <constructor-arg ref="cyTableManagerServiceRef"/>
+       </bean>
+
+       <bean id="ISOMLayout" 
class="csplugins.layout.algorithms.graphPartition.ISOMLayout">
+               <constructor-arg ref="undoSupportServiceRef"/>
+       </bean>
+
+       <bean id="bioLayoutKKAlgorithmFALSE" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutKKAlgorithm">
+               <constructor-arg ref="undoSupportServiceRef"/>
+               <constructor-arg type="boolean" value="false"/>
+       </bean>
+
+       <bean id="bioLayoutKKAlgorithmTRUE" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutKKAlgorithm">
+               <constructor-arg ref="undoSupportServiceRef"/>
+               <constructor-arg type="boolean" value="true"/>
+       </bean>
+
+       <bean id="bioLayoutFRAlgorithm" 
class="csplugins.layout.algorithms.bioLayout.BioLayoutFRAlgorithm">
+               <constructor-arg ref="undoSupportServiceRef"/>
+               <constructor-arg type="boolean" value="true"/>
+       </bean>
+
+       <bean id="stackedNodeLayout" 
class="csplugins.layout.algorithms.StackedNodeLayout">
+               <constructor-arg ref="undoSupportServiceRef"/>
+       </bean>
+
+
+       <bean id="groupAttributesLayout" 
class="csplugins.layout.algorithms.GroupAttributesLayout">
+               <constructor-arg ref="undoSupportServiceRef"/>
+               <constructor-arg ref="cyTableManagerServiceRef"/>
+       </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.

Reply via email to