Author: mmichaud
Date: 2009-04-17 10:01:12 -0700 (Fri, 17 Apr 2009)
New Revision: 16611
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-17 12:55:20 UTC (rev 16610)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-17 17:01:12 UTC (rev 16611)
@@ -46,6 +46,10 @@
<osgi:reference id="creditScreenServiceRef"
interface="org.cytoscape.splash.CreditScreen">
</osgi:reference>
+
+ <osgi:reference id="fileUtilServiceRef"
interface="org.cytoscape.io.util.FileUtil">
+ </osgi:reference>
+
<!-- define services that application provides -->
@@ -250,9 +254,12 @@
<osgi:service id="aboutDialogFactoryService" ref="aboutDialogFactory"
interface="cytoscape.dialogs.AboutDialogFactory" />
- <osgi:service id="fileUtilService" ref="fileUtil"
- interface="cytoscape.util.FileUtil" />
+<!-- <osgi:service id="fileUtilService" ref="fileUtil"-->
+<!-- interface="cytoscape.util.FileUtil" />-->
+
+
+
<osgi:service id="createNetworkViewTaskFactoryService"
ref="createNetworkViewTaskFactory">
<osgi:interfaces>
<value>org.cytoscape.work.TaskFactory</value>
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-17 12:55:20 UTC (rev 16610)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-17 17:01:12 UTC (rev 16611)
@@ -40,9 +40,14 @@
<bean name="cyOperatingContext"
class="cytoscape.internal.CyOperatingContextImpl">
<constructor-arg ref="cytoscapeProperties" />
</bean>
- <bean name="fileUtil" class="cytoscape.internal.util.FileUtilImpl">
- <constructor-arg ref="streamUtilServiceRef" />
- </bean>
+
+
+<!-- <bean id="fileUtil" class="cytoscape.internal.util.FileUtilImpl">-->
+<!-- <constructor-arg ref="streamUtilServiceRef" />-->
+<!-- </bean>-->
+
+
+
<bean name="networkNamingUtil"
class="cytoscape.internal.util.CyNetworkNamingImpl" />
<bean name="cyHelpBroker"
class="cytoscape.internal.view.CyHelpBrokerImpl">
@@ -123,7 +128,7 @@
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="networkManager" />
<constructor-arg ref="cytoscapeVersion" />
- <constructor-arg ref="fileUtil" />
+ <constructor-arg ref="fileUtilServiceRef" />
</bean>
<!--
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
