Author: mmichaud
Date: 2009-03-12 11:15:38 -0700 (Thu, 12 Mar 2009)
New Revision: 16231
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-03-12 18:14:39 UTC (rev 16230)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-03-12 18:15:38 UTC (rev 16231)
@@ -19,7 +19,7 @@
private BookmarksUtil bkUtil;
private FileUtil flUtil;
- public GuiHandlerFactory(CyProperty<Bookmarks> book, BookmarksUtil
bkUtil,FileUtil flUtil) {
+ public GuiHandlerFactory(CyProperty<Bookmarks> book, BookmarksUtil
bkUtil) {
this.bookmarks = book.getProperties();
this.bkUtil = bkUtil;
this.flUtil = flUtil;
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 18:14:39 UTC (rev 16230)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 18:15:38 UTC (rev 16231)
@@ -22,18 +22,14 @@
<osgi:service id="guiHandlerFactoryService"
ref="guiHandlerFactory"
interface="org.cytoscape.work.HandlerFactory">
</osgi:service>
+
+<!--
+ <osgi:service id="cyOperatingContextService" ref="cyOperatingContext"
interface="cytoscape.CyOperatingContext" />
+ <osgi:service id="fileUtilService" ref="fileUtil"
interface="cytoscape.util.FileUtil" />
+-->
- <!--
- <osgi:service id="fileUtilService"
- ref="fileUtil" interface="cytoscape.util.FileUtil" >
- </osgi:service>
- -->
-
<!-- Services USED by this bundle -->
<osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=bookmarks)" />
-
<osgi:reference id="bookmarksUtilServiceRef"
interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-
- <osgi:reference id="fileUtil" interface="cytoscape.util.FileUtil" />
-
+<!--<osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil" /> -->
</beans>
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 18:14:39 UTC (rev 16230)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 18:15:38 UTC (rev 16231)
@@ -19,10 +19,17 @@
<bean id="swingTaskManager"
class="org.cytoscape.work.internal.task.SwingTaskManager"/>
+
+<!-- <bean name="fileUtil" class="cytoscape.util.internal.FileUtilImpl">
+ <constructor-arg ref="cyOperatingContext" />
+ <constructor-arg ref="streamUtilServiceRef" />
+ </bean>
+-->
+
<bean id="guiHandlerFactory"
class="org.cytoscape.work.internal.tunables.GuiHandlerFactory">
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
- <constructor-arg ref="fileUtil" />
+<!-- <constructor-arg ref="fileUtil" /> -->
</bean>
<bean id="guiTunableInterceptor"
class="org.cytoscape.work.internal.tunables.GuiTunableInterceptor">
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
