Author: pwang
Date: 2012-05-01 16:12:06 -0700 (Tue, 01 May 2012)
New Revision: 29067
Modified:
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/CyActivator.java
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTask.java
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTaskFactory.java
Log:
Updated
Modified:
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
---
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-05-01 22:46:26 UTC (rev 29066)
+++
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-05-01 23:12:06 UTC (rev 29067)
@@ -1,13 +1,14 @@
package org.cytoscape.sample.internal;
import org.osgi.framework.BundleContext;
+import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.service.util.AbstractCyActivator;
-import org.cytoscape.task.creation.LoadVisualStyles;
+import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
import org.cytoscape.work.TaskFactory;
import java.util.Properties;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
@@ -16,9 +17,12 @@
public void start(BundleContext bc) {
- LoadVisualStyles loadVizmapFileTaskFactory =
getService(bc,LoadVisualStyles.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+ LoadVizmapFileTaskFactory loadVizmapFileTaskFactory =
getService(bc,LoadVizmapFileTaskFactory.class);
+ ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory =
getService(bc,ApplyVisualStyleTaskFactory.class);
- LoadVisualPropertiesTaskFactory lvp= new
LoadVisualPropertiesTaskFactory(loadVizmapFileTaskFactory);
+ LoadVisualPropertiesTaskFactory lvp= new
LoadVisualPropertiesTaskFactory(loadVizmapFileTaskFactory,
+ cyApplicationManagerServiceRef,
applyVisualStyleTaskFactory);
Properties sample17Props = new Properties();
sample17Props.setProperty("preferredMenu","Apps");
Modified:
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTask.java
===================================================================
---
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTask.java
2012-05-01 22:46:26 UTC (rev 29066)
+++
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTask.java
2012-05-01 23:12:06 UTC (rev 29067)
@@ -1,11 +1,13 @@
package org.cytoscape.sample.internal;
-
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
-import org.cytoscape.task.creation.LoadVisualStyles;
+import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskIterator;
import java.io.File;
import java.util.Set;
@@ -14,10 +16,15 @@
@Tunable(description = "Vizmap file", params =
"fileCategory=vizmap;input=true")
public File f;
- private final LoadVisualStyles loadVizmapFileTaskFactory;
+ private final LoadVizmapFileTaskFactory loadVizmapFileTaskFactory;
+ private CyNetworkView view;
+ private final ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory;
- public LoadVisualPropertiesTask(LoadVisualStyles
loadVizmapFileTaskFactory){
+ public LoadVisualPropertiesTask(LoadVizmapFileTaskFactory
loadVizmapFileTaskFactory, CyNetworkView view,
+ ApplyVisualStyleTaskFactory
applyVisualStyleTaskFactory){
this.loadVizmapFileTaskFactory = loadVizmapFileTaskFactory;
+ this.view = view;
+ this.applyVisualStyleTaskFactory = applyVisualStyleTaskFactory;
}
@@ -26,9 +33,17 @@
taskMonitor.setStatusMessage("Loading visual styles from file
...");
- Set<VisualStyle> vsSet =
loadVizmapFileTaskFactory.loadStyles(f);
+ Set<VisualStyle> vsSet =
loadVizmapFileTaskFactory.loadStyles(f);
+
+ if (view == null || vsSet.size() ==0){
+ return;
+ }
- System.out.println("Number of VisualStyles loaded =
"+vsSet.size());
+ // Apply one loaded visual style to teh given view
+ VisualStyle vs = vsSet.iterator().next();
+
+ TaskIterator ti =
this.applyVisualStyleTaskFactory.createTaskIterator(view, vs);
+ this.insertTasksAfterCurrentTask(ti);
}
}
Modified:
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTaskFactory.java
===================================================================
---
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTaskFactory.java
2012-05-01 22:46:26 UTC (rev 29066)
+++
core3/samples/trunk/sample17/src/main/java/org/cytoscape/sample/internal/LoadVisualPropertiesTaskFactory.java
2012-05-01 23:12:06 UTC (rev 29067)
@@ -1,22 +1,26 @@
package org.cytoscape.sample.internal;
-import org.cytoscape.task.creation.LoadVisualStyles;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
-public class LoadVisualPropertiesTaskFactory implements TaskFactory {
+public class LoadVisualPropertiesTaskFactory extends AbstractTaskFactory {
-
- private final LoadVisualStyles loadVizmapFileTaskFactory;
+ private final LoadVizmapFileTaskFactory loadVizmapFileTaskFactory;
+ private final CyApplicationManager cyApplicationManagerServiceRef;
+ private final ApplyVisualStyleTaskFactory applyVisualStyleTaskFactory;
- public LoadVisualPropertiesTaskFactory(LoadVisualStyles
loadVizmapFileTaskFactory){
+ public LoadVisualPropertiesTaskFactory(LoadVizmapFileTaskFactory
loadVizmapFileTaskFactory, CyApplicationManager cyApplicationManagerServiceRef,
+ ApplyVisualStyleTaskFactory
applyVisualStyleTaskFactory){
this.loadVizmapFileTaskFactory = loadVizmapFileTaskFactory;
+ this.cyApplicationManagerServiceRef =
cyApplicationManagerServiceRef;
+ this.applyVisualStyleTaskFactory = applyVisualStyleTaskFactory;
}
-
- @Override
public TaskIterator createTaskIterator(){
- return new TaskIterator(new
LoadVisualPropertiesTask(this.loadVizmapFileTaskFactory));
+ return new TaskIterator(new
LoadVisualPropertiesTask(this.loadVizmapFileTaskFactory,
this.cyApplicationManagerServiceRef.getCurrentNetworkView(),
+ this.applyVisualStyleTaskFactory));
}
-
}
--
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.
