Author: pwang
Date: 2010-08-17 17:28:38 -0700 (Tue, 17 Aug 2010)
New Revision: 21440
Modified:
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Refactored
Modified:
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-18 00:22:11 UTC (rev 21439)
+++
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-18 00:28:38 UTC (rev 21440)
@@ -7,24 +7,19 @@
<!-- Import services -->
- <osgi:reference id="cyLayoutsServiceRef"
- interface="org.cytoscape.view.layout.CyLayouts" />
+ <osgi:reference id="cyLayoutsServiceRef"
interface="org.cytoscape.view.layout.CyLayouts" />
<osgi:reference id="cyNetworkFactoryServiceRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
+ interface="org.cytoscape.model.CyNetworkFactory" />
<osgi:reference id="cyNetworkViewFactoryServiceRef"
- interface="org.cytoscape.view.model.CyNetworkViewFactory" />
+ interface="org.cytoscape.view.model.CyNetworkViewFactory" />
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.session.CyNetworkManager" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.session.CyNetworkManager" />
- <osgi:reference id="cyTableManagerServiceRef"
- interface="org.cytoscape.model.CyTableManager" />
-
<!-- Export services -->
- <osgi:service id="cyReaderManagerService" ref="cyReaderManager"
- interface="org.cytoscape.io.read.CyReaderManager">
+ <osgi:service id="cyNetworkViewProducerManagerService"
ref="cyNetworkViewProducerManager"
+ interface="org.cytoscape.io.read.CyNetworkViewProducerManager">
<osgi:service-properties>
<entry key="serviceType" value="manager" />
</osgi:service-properties>
@@ -32,7 +27,7 @@
<!-- Exporting Reader Factory as OSGi Service -->
-
+<!--
<osgi:service id="nodeTextDataTableReaderFactoryService"
ref="nodeTextDataTableReaderFactory"
interface="org.cytoscape.io.read.CyReaderFactory">
<osgi:service-properties>
@@ -41,30 +36,32 @@
<entry key="readerDescription" value="Text data table
file reader for nodes" />
</osgi:service-properties>
</osgi:service>
-
- <osgi:service id="sifReaderFactoryService" ref="sifReaderFactory"
- interface="org.cytoscape.io.read.CyReaderFactory">
+-->
+ <osgi:service id="sifReaderFactoryService"
ref="sifNetworkViewProducerFactory"
+ interface="org.cytoscape.io.read.CyNetworkViewProducerFactory">
<osgi:service-properties>
- <entry key="serviceType" value="readerFactory" />
- <entry key="readerId" value="sifReader" />
+ <entry key="serviceType"
value="sifNetworkViewProducerFactory" />
+ <entry key="readerId" value="sifNetworkViewProducer" />
<entry key="readerDescription" value="Simple
Interaction Format (SIF) file reader" />
</osgi:service-properties>
</osgi:service>
- <osgi:service id="xgmmlReaderFactoryService" ref="xgmmlReaderFactory"
- interface="org.cytoscape.io.read.CyReaderFactory">
+<!--
+ <osgi:service id="xgmmlReaderFactoryService"
ref="xgmmlNetworkViewProducerFactory"
+ interface="org.cytoscape.io.read.CyNetworkViewProducerFactory">
<osgi:service-properties>
- <entry key="serviceType" value="readerFactory" />
- <entry key="readerId" value="xgmmlReader" />
+ <entry key="serviceType"
value="xgmmlNetworkViewProducerFactory" />
+ <entry key="readerId" value="xgmmlNetworkViewProducer"
/>
<entry key="readerDescription"
value="eXtensible Graph Markup and Modeling
Language (XGMML) file reader" />
</osgi:service-properties>
</osgi:service>
+ -->
- <osgi:set id="cyReaderFactories"
interface="org.cytoscape.io.read.CyReaderFactory"
+ <osgi:set id="cyNetworkViewProducerFactories"
interface="org.cytoscape.io.read.CyNetworkViewProducerFactory"
cardinality="0..N">
- <osgi:listener bind-method="addReaderFactory"
- unbind-method="removeReaderFactory"
ref="cyReaderManager" />
+ <osgi:listener bind-method="addNetworkViewProducerFactory"
+ unbind-method="removeNetworkViewProducerFactory"
ref="cyNetworkViewProducerManager" />
</osgi:set>
<osgi:service id="streamUtilService" ref="streamUtil"
Modified:
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-18 00:22:11 UTC (rev 21439)
+++ core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-18 00:28:38 UTC (rev 21440)
@@ -15,31 +15,32 @@
default-lazy-init="true">
<context:annotation-config />
-
- <bean id="nodeTextDataTableReaderFactory"
class="org.cytoscape.io.internal.read.CyReaderFactoryImpl">
+<!--
+ <bean id="nodeTextDataTableReaderFactory"
class="org.cytoscape.io.internal.read.CyDataTableProducerFactoryImpl">
<constructor-arg ref="textDatatableFilter" />
<constructor-arg ref="nodeTextDataTableReader" />
<constructor-arg type="org.cytoscape.io.util.StreamUtil">
<ref bean="streamUtil"/>
</constructor-arg>
</bean>
+-->
- <bean id="sifReaderFactory"
class="org.cytoscape.io.internal.read.CyReaderFactoryImpl">
+ <bean id="sifNetworkViewProducerFactory"
class="org.cytoscape.io.internal.read.CyNetworkViewProducerFactoryImpl">
<constructor-arg ref="sifFilter" />
- <constructor-arg ref="sifReader" />
+ <constructor-arg ref="sifNetworkViewProducer" />
<constructor-arg type="org.cytoscape.io.util.StreamUtil">
<ref bean="streamUtil"/>
</constructor-arg>
</bean>
- <bean id="xgmmlReaderFactory"
class="org.cytoscape.io.internal.read.CyReaderFactoryImpl">
+ <bean id="xgmmlNetworkViewProducerFactory"
class="org.cytoscape.io.internal.read.CyNetworkViewProducerFactoryImpl">
<constructor-arg ref="xgmmlFilter" />
<constructor-arg ref="xgmmlReader" />
<constructor-arg type="org.cytoscape.io.util.StreamUtil">
<ref bean="streamUtil"/>
</constructor-arg>
</bean>
-
+<!--
<bean id="textDatatableFilter"
class="org.cytoscape.io.internal.CyFileFilterImpl">
<constructor-arg index="0">
<set>
@@ -58,7 +59,9 @@
<ref bean="streamUtil"/>
</constructor-arg>
</bean>
+-->
+
<bean id="sifFilter" class="org.cytoscape.io.internal.CyFileFilterImpl">
<constructor-arg index="0">
<set>
@@ -100,9 +103,8 @@
</constructor-arg>
</bean>
-
<!-- Network Readers -->
- <bean id="sifReader"
class="org.cytoscape.io.internal.read.sif.InteractionsReader">
+ <bean id="sifNetworkViewProducer"
class="org.cytoscape.io.internal.read.sif.SIFNetwotkViewProducer">
<constructor-arg ref="readUtil" />
<property name="cyNetworkFactory"
ref="cyNetworkFactoryServiceRef" />
<property name="cyNetworkViewFactory"
ref="cyNetworkViewFactoryServiceRef" />
@@ -111,6 +113,7 @@
<!-- Utilities for XGMML Reader -->
+
<bean id="objectTypeMap"
class="org.cytoscape.io.internal.read.xgmml.ObjectTypeMap" />
<bean id="attributeValueUtil"
class="org.cytoscape.io.internal.read.xgmml.handler.AttributeValueUtil">
@@ -130,7 +133,7 @@
<property name="readDataManager" ref="readDataManager" />
</bean>
- <bean id="xgmmlReader"
class="org.cytoscape.io.internal.read.xgmml.XGMMLReader">
+ <bean id="xgmmlNetworkViewProducer"
class="org.cytoscape.io.internal.read.xgmml.XGMMLNetworkViewProducer">
<property name="parser" ref="xgmmlParser" />
<property name="readDataManager" ref="readDataManager" />
<property name="attributeValueUtil" ref="attributeValueUtil" />
@@ -141,28 +144,30 @@
</bean>
+
<!-- Attribute Readers -->
+
+<!--
<bean id="nodeTextDataTableReader"
class="org.cytoscape.io.internal.read.datatable.TextDataTableReader">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg value="NODE" />
- <constructor-arg ref="cyTableManagerServiceRef" />
</bean>
<bean id="edgeTextDataTableReader"
class="org.cytoscape.io.internal.read.datatable.TextDataTableReader">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg value="EDGE" />
- <constructor-arg ref="cyTableManagerServiceRef" />
</bean>
<bean id="networkTextDataTableReader"
class="org.cytoscape.io.internal.read.datatable.TextDataTableReader">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg value="NETWORK" />
- <constructor-arg ref="cyTableManagerServiceRef" />
</bean>
+-->
+
<!-- Property Readers -->
<!-- Manager for all readers -->
- <bean id="cyReaderManager"
class="org.cytoscape.io.internal.read.CyReaderManagerImpl" />
+ <bean id="cyNetworkViewProducerManager"
class="org.cytoscape.io.internal.read.CyNetworkViewProducerManagerImpl" />
<!-- Utility for Stream/Proxy management -->
--
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.
