Author: mmichaud
Date: 2009-03-17 08:32:26 -0700 (Tue, 17 Mar 2009)
New Revision: 16291
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-17 00:54:56 UTC (rev 16290)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-03-17 15:32:26 UTC (rev 16291)
@@ -1,6 +1,7 @@
package org.cytoscape.work.internal.tunables;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.net.URL;
import java.io.File;
@@ -34,6 +35,10 @@
this.flUtil = flUtil;
this.stUtil = stUtil;
}
+
+ public Guihandler getHandler(Method m, Object o, Tunable t) {
+ return null;
+ }
public Guihandler getHandler(Field f, Object o, Tunable t){
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-17 00:54:56 UTC (rev 16290)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-17 15:32:26 UTC (rev 16291)
@@ -26,7 +26,7 @@
<osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=bookmarks)" />
<osgi:reference id="bookmarksUtilServiceRef"
interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-<!--<osgi:referenceS id="fileUtilServiceRef"
interface="cytoscape.util.FileUtil"/>
- <osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil"/> -->
+<!-- <osgi:reference id="fileUtilServiceRef"
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-17 00:54:56 UTC (rev 16290)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-17 15:32:26 UTC (rev 16291)
@@ -19,13 +19,6 @@
<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="guiTunableInterceptor"
class="org.cytoscape.work.internal.tunables.GuiTunableInterceptor">
<constructor-arg ref="guiHandlerFactory" />
</bean>
@@ -33,7 +26,7 @@
<bean id="guiHandlerFactory"
class="org.cytoscape.work.internal.tunables.GuiHandlerFactory">
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
-<!-- <constructor-arg ref="fileUtilServiceRef"/>
+<!-- <constructor-arg ref="fileUtilServiceRef"/>
<constructor-arg ref="streamUtilServiceRef"/> -->
</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
-~----------~----~----~----~------~----~------~--~---
