Author: pwang
Date: 2010-08-17 17:21:49 -0700 (Tue, 17 Aug 2010)
New Revision: 21438
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Refactored
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-18 00:21:20 UTC (rev 21437)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-18 00:21:49 UTC (rev 21438)
@@ -18,9 +18,14 @@
<osgi:reference id="cyRootNetworkFactoryServiceRef"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory"
/>
- <osgi:reference id="cyReaderManagerServiceRef"
- interface="org.cytoscape.io.read.CyReaderManager" />
+ <osgi:reference id="cyNetworkViewProducerManagerServiceRef"
+ interface="org.cytoscape.io.read.CyNetworkViewProducerManager"
/>
+<!--
+ <osgi:reference id="cyDataTableProducerManagerServiceRef"
+ interface="org.cytoscape.io.read.CyDataTableProducerManager" />
+ -->
+
<osgi:reference id="visualMappingManagerServiceRef"
interface="org.cytoscape.view.vizmap.VisualMappingManager" />
@@ -68,7 +73,7 @@
</osgi:service-properties>
</osgi:service>
-
+<!--
<osgi:service id="loadDataTableTaskFactoryService"
ref="loadDataTableTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
@@ -76,7 +81,7 @@
<entry key="preferredMenu" value="File.Import" />
</osgi:service-properties>
</osgi:service>
-
+ -->
<osgi:service id="proxySettingsTaskFactoryService"
ref="proxySettingsTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-18 00:21:20 UTC (rev 21437)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-18 00:21:49 UTC (rev 21438)
@@ -25,15 +25,16 @@
<context:annotation-config/>
<!-- this creates a LoadPropsInterceptor object -->
-
+<!--
<bean id="loadDataTableTaskFactory"
class="org.cytoscape.task.internal.loaddatatable.LoadDataTableTaskFactoryImpl">
- <constructor-arg ref="cyReaderManagerServiceRef" />
+ <constructor-arg ref="cyDataTableProducerManagerServiceRef" />
<constructor-arg ref="cyPropertyServiceRef" />
</bean>
+ -->
<bean id="loadNetworkFileTaskFactory"
class="org.cytoscape.task.internal.loadnetwork.LoadNetworkFileTaskFactoryImpl">
- <constructor-arg ref="cyReaderManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewProducerManagerServiceRef" />
<constructor-arg ref="cyNetworkViewFactoryServiceRef" />
<constructor-arg ref="cyLayoutsServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
@@ -44,7 +45,7 @@
<!-- this creates a LoadPropsInterceptor object -->
<bean id="loadNetworkURLTaskFactory"
class="org.cytoscape.task.internal.loadnetwork.LoadNetworkURLTaskFactoryImpl">
- <constructor-arg ref="cyReaderManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewProducerManagerServiceRef" />
<constructor-arg ref="cyNetworkViewFactoryServiceRef" />
<constructor-arg ref="cyLayoutsServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
@@ -55,7 +56,7 @@
<bean id="loadInputStreamTaskFactory"
class="org.cytoscape.task.internal.loadnetwork.LoadInputStreamTaskFactoryImpl">
- <constructor-arg ref="cyReaderManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewProducerManagerServiceRef" />
<constructor-arg ref="cyNetworkViewFactoryServiceRef" />
<constructor-arg ref="cyLayoutsServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
--
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.
