Author: pwang
Date: 2011-01-14 13:41:51 -0800 (Fri, 14 Jan 2011)
New Revision: 23466
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
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:
Add CyNetworkManager
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
2011-01-14 21:25:41 UTC (rev 23465)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
2011-01-14 21:41:51 UTC (rev 23466)
@@ -11,6 +11,8 @@
import org.cytoscape.work.swing.GUITaskManager;
import java.io.IOException;
import javax.xml.bind.JAXBException;
+
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.tableimport.internal.util.CytoscapeServices;
import org.cytoscape.util.swing.OpenBrowser;
@@ -23,6 +25,7 @@
* Creates a new ImportAttributeTableAction object.
*/
public ImportAttributeTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
+ CyNetworkManager netMgr,
CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService)
@@ -41,6 +44,7 @@
CytoscapeServices.openBrowser = openBrowserService;
CytoscapeServices.fileUtil = fileUtilService;
CytoscapeServices.appMgr = appMgr;
+ CytoscapeServices.netMgr = netMgr;
}
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-14 21:25:41 UTC (rev 23465)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
2011-01-14 21:41:51 UTC (rev 23466)
@@ -39,6 +39,7 @@
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.bookmark.Bookmarks;
@@ -65,6 +66,7 @@
* Creates a new ImportNetworkTableAction object.
*/
public ImportNetworkTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
+ CyNetworkManager netMgr,
CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService) {
@@ -81,7 +83,7 @@
CytoscapeServices.openBrowser = openBrowserService;
CytoscapeServices.fileUtil = fileUtilService;
CytoscapeServices.appMgr = appMgr;
-
+ CytoscapeServices.netMgr = netMgr;
}
/**
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-14 21:25:41 UTC (rev 23465)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2011-01-14 21:41:51 UTC (rev 23466)
@@ -1,6 +1,7 @@
package org.cytoscape.tableimport.internal.util;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.bookmark.Bookmarks;
@@ -21,4 +22,5 @@
public static OpenBrowser openBrowser;
public static FileUtil fileUtil;
public static CyApplicationManager appMgr;
+ public static CyNetworkManager netMgr;
}
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-14 21:25:41 UTC (rev 23465)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-14 21:41:51 UTC (rev 23466)
@@ -12,9 +12,8 @@
<osgi:reference id="cytoscapeDesktopService"
interface="org.cytoscape.application.swing.CySwingApplication"
/>
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.session.CyApplicationManager">
- </osgi:reference>
+ <osgi:reference id="cyApplicationManagerRef"
interface="org.cytoscape.session.CyApplicationManager" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
<osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
<osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
<osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
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-14 21:25:41 UTC (rev 23465)
+++
core3/table-import-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-14 21:41:51 UTC (rev 23466)
@@ -18,6 +18,7 @@
<bean id="importAttributeTableAction"
class="org.cytoscape.tableimport.internal.actions.ImportAttributeTableAction">
<constructor-arg ref="cytoscapeDesktopService" />
<constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
<constructor-arg ref="guiTaskManagerServiceRef" />
@@ -30,6 +31,7 @@
<bean id="importNetworkTableAction"
class="org.cytoscape.tableimport.internal.actions.ImportNetworkTableAction">
<constructor-arg ref="cytoscapeDesktopService" />
<constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
<constructor-arg ref="guiTaskManagerServiceRef" />
--
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.
