Author: pwang
Date: 2012-03-09 17:03:36 -0800 (Fri, 09 Mar 2012)
New Revision: 28482
Modified:
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/CyActivator.java
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/MyNetworkViewTask.java
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
Log:
Updated
Modified:
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
---
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-03-10 00:57:59 UTC (rev 28481)
+++
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-03-10 01:03:36 UTC (rev 28482)
@@ -1,22 +1,17 @@
package org.cytoscape.sample.internal;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
-
-import org.cytoscape.sample.internal.Sample06TaskFactory;
-
+import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.work.TaskFactory;
-
-
import org.osgi.framework.BundleContext;
-
import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.session.CyNetworkNaming;
import java.util.Properties;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
@@ -25,21 +20,21 @@
public void start(BundleContext bc) {
- CyApplicationManager cyApplicationManagerService =
getService(bc,CyApplicationManager.class);
+ CyNetworkNaming cyNetworkNamingServiceRef =
getService(bc,CyNetworkNaming.class);
+
+ CyNetworkFactory cyNetworkFactoryServiceRef =
getService(bc,CyNetworkFactory.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+
CyNetworkViewFactory cyNetworkViewFactoryServiceRef =
getService(bc,CyNetworkViewFactory.class);
CyNetworkViewManager cyNetworkViewManagerServiceRef =
getService(bc,CyNetworkViewManager.class);
- Sample06TaskFactory sample06TaskFactory = new
Sample06TaskFactory(cyApplicationManagerService,cyNetworkViewFactoryServiceRef,cyNetworkViewManagerServiceRef);
-
-
+ Sample06TaskFactory sample06TaskFactory = new
Sample06TaskFactory(cyNetworkNamingServiceRef,
cyNetworkFactoryServiceRef,cyNetworkManagerServiceRef,
cyNetworkViewFactoryServiceRef,cyNetworkViewManagerServiceRef);
+
Properties sample06TaskFactoryProps = new Properties();
sample06TaskFactoryProps.setProperty("preferredMenu","Apps");
sample06TaskFactoryProps.setProperty("menuGravity","12.0");
sample06TaskFactoryProps.setProperty("title","Sample 6");
registerService(bc,sample06TaskFactory,TaskFactory.class,
sample06TaskFactoryProps);
-
-
-
}
}
Modified:
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/MyNetworkViewTask.java
===================================================================
---
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/MyNetworkViewTask.java
2012-03-10 00:57:59 UTC (rev 28481)
+++
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/MyNetworkViewTask.java
2012-03-10 01:03:36 UTC (rev 28482)
@@ -1,7 +1,10 @@
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;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
@@ -10,42 +13,55 @@
public class MyNetworkViewTask extends AbstractTask {
- private CyApplicationManager appMgr;
- private final CyNetworkViewFactory cnvf;
- private final CyNetworkViewManager networkViewManager;
+ private final CyNetworkFactory cnf;
+ private final CyNetworkViewFactory cnvf;
+ private final CyNetworkViewManager networkViewManager;
+ private final CyNetworkManager networkManager;
+ private final CyNetworkNaming cyNetworkNaming;
- public MyNetworkViewTask(CyApplicationManager appMgr,
CyNetworkViewFactory cnvf,
+ public MyNetworkViewTask(CyNetworkNaming
cyNetworkNaming,CyNetworkFactory cnf, CyNetworkManager networkManager,
CyNetworkViewFactory cnvf,
final CyNetworkViewManager networkViewManager){
- this.appMgr = appMgr;
+ this.cnf = cnf;
this.cnvf = cnvf;
this.networkViewManager = networkViewManager;
+ this.networkManager = networkManager;
+ this.cyNetworkNaming = cyNetworkNaming;
}
public void run(TaskMonitor monitor) {
- // Get current network
- CyNetwork currNet = appMgr.getCurrentNetwork();
+ // Create an empty network
+ CyNetwork myNet = this.cnf.createNetwork();
- if(currNet == null){
+ // add a node to the network
+ CyNode node1 = myNet.addNode();
+
+ // set name for the new node
+
myNet.getDefaultNodeTable().getRow(node1.getSUID()).set("name", "Node1");
+
+
+
myNet.getDefaultNetworkTable().getRow(myNet.getSUID()).set("name",
cyNetworkNaming.getSuggestedNetworkTitle("My Network"));
+
+ if(myNet == null){
return;
}
-
- if(networkViewManager.getNetworkView(currNet) == null){
- // create a new view for current network
- CyNetworkView myView =
cnvf.createNetworkView(currNet);
+ this.networkManager.addNetwork(myNet);
+
+ CyNetworkView myView = null;
+ if(networkViewManager.getNetworkView(myNet) == null){
+ // create a new view for my network
+ myView = cnvf.createNetworkView(myNet);
networkViewManager.addNetworkView(myView);
}
else {
System.out.println("networkView already
existed!");
}
-
- // Set the variable destroyView to true, the following
snippet of code will destroy a networkview
+
+ // Set the variable destroyView to true, the following
snippet of code will destroy a view
boolean destroyView = false;
if(destroyView)
{
- CyNetwork currNetwork =
appMgr.getCurrentNetwork();
- CyNetworkView view =
networkViewManager.getNetworkView(currNetwork);
- networkViewManager.destroyNetworkView(view);
+ networkViewManager.destroyNetworkView(myView);
}
}
Modified:
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
===================================================================
---
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
2012-03-10 00:57:59 UTC (rev 28481)
+++
core3/support/trunk/samples/sample06/src/main/java/org/cytoscape/sample/internal/Sample06TaskFactory.java
2012-03-10 01:03:36 UTC (rev 28482)
@@ -1,6 +1,8 @@
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;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskFactory;
@@ -8,18 +10,24 @@
public class Sample06TaskFactory implements TaskFactory {
- private CyApplicationManager appMgr;
- private CyNetworkViewFactory cnvf;
+ private final CyNetworkFactory cnf;
+ private final CyNetworkViewFactory cnvf;
private final CyNetworkViewManager networkViewManager;
+ private final CyNetworkManager networkManager;
+ private final CyNetworkNaming cyNetworkNaming;
- public Sample06TaskFactory(CyApplicationManager appMgr,
CyNetworkViewFactory cnvf,
+ public Sample06TaskFactory(CyNetworkNaming cyNetworkNaming,
CyNetworkFactory cnf, CyNetworkManager networkManager, CyNetworkViewFactory
cnvf,
final CyNetworkViewManager networkViewManager){
- this.appMgr = appMgr;
+
+ this.cnf = cnf;
this.cnvf = cnvf;
this.networkViewManager = networkViewManager;
+ this.networkManager = networkManager;
+ this.cyNetworkNaming = cyNetworkNaming;
+
}
public TaskIterator createTaskIterator(){
- return new TaskIterator(new MyNetworkViewTask(appMgr, cnvf,
networkViewManager));
+ return new TaskIterator(new MyNetworkViewTask(cyNetworkNaming,
cnf,networkManager, cnvf, networkViewManager));
}
}
--
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.
