Author: pwang
Date: 2012-03-09 14:36:20 -0800 (Fri, 09 Mar 2012)
New Revision: 28475
Modified:
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/CyActivator.java
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/MyNetworkTask.java
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
Log:
Do not use getCurrentNetwork()
Modified:
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
---
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-03-09 22:00:28 UTC (rev 28474)
+++
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-03-09 22:36:20 UTC (rev 28475)
@@ -1,19 +1,12 @@
package org.cytoscape.sample.internal;
import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.model.CyNetworkManager;
-
import org.cytoscape.sample.internal.Sample05TaskFactory;
-
import org.cytoscape.work.TaskFactory;
-
-
import org.osgi.framework.BundleContext;
-
import org.cytoscape.service.util.AbstractCyActivator;
-
import java.util.Properties;
@@ -26,22 +19,17 @@
public void start(BundleContext bc) {
- CyApplicationManager cyApplicationManagerService =
getService(bc,CyApplicationManager.class);
CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
CyNetworkNaming cyNetworkNamingServiceRef =
getService(bc,CyNetworkNaming.class);
CyNetworkFactory cyNetworkFactoryServiceRef =
getService(bc,CyNetworkFactory.class);
- Sample05TaskFactory sample05TaskFactory = new
Sample05TaskFactory(cyApplicationManagerService,cyNetworkManagerServiceRef,cyNetworkNamingServiceRef,cyNetworkFactoryServiceRef);
-
-
+ Sample05TaskFactory sample05TaskFactory = new
Sample05TaskFactory(cyNetworkManagerServiceRef,cyNetworkNamingServiceRef,cyNetworkFactoryServiceRef);
+
Properties sample05TaskFactoryProps = new Properties();
sample05TaskFactoryProps.setProperty("preferredMenu","Apps");
sample05TaskFactoryProps.setProperty("menuGravity","11.0");
sample05TaskFactoryProps.setProperty("title","Sample 5");
registerService(bc,sample05TaskFactory,TaskFactory.class,
sample05TaskFactoryProps);
-
-
-
}
}
Modified:
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/MyNetworkTask.java
===================================================================
---
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/MyNetworkTask.java
2012-03-09 22:00:28 UTC (rev 28474)
+++
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/MyNetworkTask.java
2012-03-09 22:36:20 UTC (rev 28475)
@@ -1,6 +1,5 @@
package org.cytoscape.sample.internal;
-import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
@@ -12,14 +11,11 @@
public class MyNetworkTask extends AbstractTask {
- private CyApplicationManager appMgr;
private final CyNetworkManager netMgr;
private final CyNetworkFactory cnf;
private final CyNetworkNaming namingUtil;
- public MyNetworkTask(CyApplicationManager appMgr, final
CyNetworkManager netMgr,
- final CyNetworkNaming namingUtil, final
CyNetworkFactory cnf){
- this.appMgr = appMgr;
+ public MyNetworkTask(final CyNetworkManager netMgr, final
CyNetworkNaming namingUtil, final CyNetworkFactory cnf){
this.netMgr = netMgr;
this.cnf = cnf;
this.namingUtil = namingUtil;
@@ -43,11 +39,8 @@
// Set the variable destroyNetwork to true, the following code
will destroy a network
boolean destroyNetwork = false;
if (destroyNetwork){
- // Get current network
- CyNetwork currNet = appMgr.getCurrentNetwork();
// Destroy it
- netMgr.destroyNetwork(currNet);
+ netMgr.destroyNetwork(myNet);
}
}
-
}
Modified:
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
===================================================================
---
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
2012-03-09 22:00:28 UTC (rev 28474)
+++
core3/support/trunk/samples/sample05/src/main/java/org/cytoscape/sample/internal/Sample05TaskFactory.java
2012-03-09 22:36:20 UTC (rev 28475)
@@ -1,6 +1,5 @@
package org.cytoscape.sample.internal;
-import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
@@ -8,20 +7,18 @@
import org.cytoscape.work.TaskIterator;
public class Sample05TaskFactory implements TaskFactory {
- private CyApplicationManager appMgr;
private final CyNetworkManager netMgr;
private final CyNetworkFactory cnf;
private final CyNetworkNaming namingUtil;
- public Sample05TaskFactory(CyApplicationManager appMgr, final
CyNetworkManager netMgr,
+ public Sample05TaskFactory(final CyNetworkManager netMgr,
final CyNetworkNaming namingUtil, final
CyNetworkFactory cnf){
- this.appMgr = appMgr;
this.netMgr = netMgr;
this.namingUtil = namingUtil;
this.cnf = cnf;
}
public TaskIterator createTaskIterator(){
- return new TaskIterator(new MyNetworkTask(appMgr, netMgr,
namingUtil, cnf));
+ return new TaskIterator(new MyNetworkTask(netMgr, namingUtil,
cnf));
}
}
--
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.
