Author: pwang
Date: 2011-03-09 17:03:42 -0800 (Wed, 09 Mar 2011)
New Revision: 24357
Modified:
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Use TaskFactory instead of CyAction
Modified:
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-10 01:02:42 UTC (rev 24356)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-10 01:03:42 UTC (rev 24357)
@@ -48,10 +48,23 @@
(like determining which menu to put the service in).
-->
- <osgi:service id="importAttributeTableActionService"
ref="importAttributeTableAction"
- interface="org.cytoscape.application.swing.CyAction" />
+ <osgi:service id="importAttributeTableTaskFactoryService"
ref="importAttributeTableTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="From Table (Text/MS
Excel)..." />
+ <entry key="preferredMenu" value="File.Import.Table" />
+ <entry key="menuGravity" value="2.1" />
+ </osgi:service-properties>
+ </osgi:service>
- <osgi:service id="importNetworkTableActionService"
ref="importNetworkTableAction"
- interface="org.cytoscape.application.swing.CyAction" />
+
+ <osgi:service id="ImportNetworkTableTaskFactoryService"
ref="importNetworkTableTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="From Table (Text/MS
Excel)..." />
+ <entry key="preferredMenu" value="File.Import.Network"
/>
+ <entry key="menuGravity" value="2.2" />
+ </osgi:service-properties>
+ </osgi:service>
</beans>
Modified:
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-10 01:02:42 UTC (rev 24356)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-10 01:03:42 UTC (rev 24357)
@@ -15,7 +15,8 @@
bundle-context-osgi.xml file.
-->
- <bean id="importAttributeTableAction"
class="org.cytoscape.tableimport.internal.actions.ImportAttributeTableAction">
+ <bean id="importAttributeTableTaskFactory"
+
class="org.cytoscape.tableimport.internal.ImportAttributeTableTaskFactory">
<constructor-arg ref="cytoscapeDesktopService" />
<constructor-arg ref="cyApplicationManagerRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
@@ -29,7 +30,9 @@
<constructor-arg ref="cyDataTableFactoryServiceRef" />
</bean>
- <bean id="importNetworkTableAction"
class="org.cytoscape.tableimport.internal.actions.ImportNetworkTableAction">
+
+ <bean id="importNetworkTableTaskFactory"
+
class="org.cytoscape.tableimport.internal.ImportNetworkTableTaskFactory">
<constructor-arg ref="cytoscapeDesktopService" />
<constructor-arg ref="cyApplicationManagerRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
@@ -40,14 +43,11 @@
<constructor-arg ref="cyTableManagerServiceRef" />
<constructor-arg ref="fileUtilService" />
<constructor-arg ref="openBrowserService" />
-
<constructor-arg ref="cyLayoutsServiceRef" />
<constructor-arg ref="cyNetworkViewFactoryServiceRef" />
<constructor-arg ref="cyNetworkFactoryServiceRef" />
-
<constructor-arg ref="cyNetworkNamingServiceRef" />
<constructor-arg ref="cyNetworkViewManagerServiceRef" />
-
</bean>
</beans>
--
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.
