Author: kono
Date: 2011-06-03 19:39:28 -0700 (Fri, 03 Jun 2011)
New Revision: 25641

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:
Integration to GUI had been started (OBO/GA Readers).

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-06-04 00:15:38 UTC (rev 25640)
+++ 
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
    2011-06-04 02:39:28 UTC (rev 25641)
@@ -80,15 +80,7 @@
                </osgi:service-properties>
        </osgi:service>
        
-       <osgi:service id="importOntologyAndAnnotationTaskFactoryService" 
ref="importOntologyAndAnnotationTaskFactory"
-               interface="org.cytoscape.work.TaskFactory">
-               <osgi:service-properties>
-                       <entry key="title" value="Import Ontology and 
Annotation..." />
-                       <entry key="preferredMenu" value="File.Import" />
-                       <entry key="menuGravity" value="4.0" />
-                       <entry key="command" value="import ontology" />
-               </osgi:service-properties>
-       </osgi:service>
-       
+       <osgi:service id="ontologyActionService" ref="ontologyAction"
+               interface="org.cytoscape.application.swing.CyAction" />
 
 </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-06-04 00:15:38 UTC (rev 25640)
+++ 
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
 2011-06-04 02:39:28 UTC (rev 25641)
@@ -114,11 +114,14 @@
                <constructor-arg value=".xls" />
        </bean>
 
-
-       <!-- For Ontology Import -->
-       <bean id="importOntologyAndAnnotationTaskFactory"
-               
class="org.cytoscape.tableimport.internal.task.ImportOntologyAndAnnotationTaskFactory">
-
+       
+       <bean id="ontologyAction" 
class="org.cytoscape.tableimport.internal.task.ImportOntologyAndAnnotationAction">
+               <constructor-arg ref="cyApplicationManagerRef" />
+               <constructor-arg ref="bookmarkServiceRef" />
+               <constructor-arg ref="bookmarksUtilServiceRef" />
+               <constructor-arg ref="guiTaskManagerServiceRef" />
+               <constructor-arg ref="oboReaderFactory" />
+               <constructor-arg ref="cyNetworkManagerServiceRef" />
        </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.

Reply via email to