Author: pwang
Date: 2011-01-19 10:32:10 -0800 (Wed, 19 Jan 2011)
New Revision: 23512
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
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:
reference two more services
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
2011-01-19 18:10:33 UTC (rev 23511)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
2011-01-19 18:32:10 UTC (rev 23512)
@@ -45,6 +45,7 @@
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
import org.cytoscape.tableimport.internal.util.CytoscapeServices;
import org.cytoscape.util.swing.FileUtil;
@@ -57,6 +58,7 @@
import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
/**
@@ -74,7 +76,8 @@
GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService,
CyLayouts cyLayoutsServiceRef, CyNetworkViewFactory
cyNetworkViewFactoryServiceRef,
- CyNetworkFactory cyNetworkFactoryServiceRef)
+ CyNetworkFactory cyNetworkFactoryServiceRef,
+ CyNetworkViewManager networkViewManager,CyNetworkNaming
cyNetworkNaming)
{
super("Network from Table (Text/MS Excel)...", appMgr);
setPreferredMenu("File.Import");
@@ -94,6 +97,8 @@
CytoscapeServices.cyLayoutsServiceRef= cyLayoutsServiceRef;
CytoscapeServices.cyNetworkViewFactoryServiceRef =
cyNetworkViewFactoryServiceRef;
CytoscapeServices.cyNetworkFactoryServiceRef =
cyNetworkFactoryServiceRef;
+ CytoscapeServices.networkViewManager = networkViewManager;
+ CytoscapeServices.cyNetworkNaming = cyNetworkNaming;
}
/**
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2011-01-19 18:10:33 UTC (rev 23511)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2011-01-19 18:32:10 UTC (rev 23512)
@@ -9,8 +9,10 @@
import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.swing.GUITaskManager;
import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.util.swing.FileUtil;
@@ -29,4 +31,6 @@
public static CyLayouts cyLayoutsServiceRef;
public static CyNetworkViewFactory cyNetworkViewFactoryServiceRef;
public static CyNetworkFactory cyNetworkFactoryServiceRef;
+ public static CyNetworkViewManager networkViewManager;
+ public static CyNetworkNaming cyNetworkNaming;
}
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-01-19 18:10:33 UTC (rev 23511)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-19 18:32:10 UTC (rev 23512)
@@ -33,6 +33,8 @@
<osgi:reference id="fileUtilService"
interface="org.cytoscape.util.swing.FileUtil" />
<osgi:reference id="openBrowserService"
interface="org.cytoscape.util.swing.OpenBrowser" />
+ <osgi:reference id="cyNetworkNamingServiceRef"
interface="org.cytoscape.session.CyNetworkNaming" />
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
interface="org.cytoscape.view.model.CyNetworkViewManager" />
<!--
This code registers the bean we just created "sampleTaskFactory" as an
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-01-19 18:10:33 UTC (rev 23511)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-19 18:32:10 UTC (rev 23512)
@@ -43,6 +43,10 @@
<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.
