Author: kono
Date: 2012-07-11 10:49:54 -0700 (Wed, 11 Jul 2012)
New Revision: 29832
Modified:
core3/impl/trunk/scripting-impl/src/main/java/org/cytoscape/scripting/internal/CyActivator.java
core3/impl/trunk/scripting-impl/src/test/java/org/cytoscape/scripting/internal/ExecuteScriptTaskTest.java
Log:
Minor updates only. Need to add tests to run actual scripts.
Modified:
core3/impl/trunk/scripting-impl/src/main/java/org/cytoscape/scripting/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/scripting-impl/src/main/java/org/cytoscape/scripting/internal/CyActivator.java
2012-07-11 16:50:24 UTC (rev 29831)
+++
core3/impl/trunk/scripting-impl/src/main/java/org/cytoscape/scripting/internal/CyActivator.java
2012-07-11 17:49:54 UTC (rev 29832)
@@ -7,24 +7,26 @@
import org.osgi.framework.BundleContext;
public class CyActivator extends AbstractCyActivator {
+
public CyActivator() {
super();
}
public void start(BundleContext bc) {
- CyAppAdapter appAdapter = getService(bc,CyAppAdapter.class);
+ // This object should be injected to all scripts to access
manager objects from scripts.
+ final CyAppAdapter appAdapter = getService(bc,
CyAppAdapter.class);
- ExecuteScriptTaskFactory executeScriptTaskFactory = new
ExecuteScriptTaskFactory(appAdapter);
-
- Properties executeScriptTaskFactoryProps = new Properties();
-
executeScriptTaskFactoryProps.setProperty("id","executeScriptTaskFactory");
-
executeScriptTaskFactoryProps.setProperty("preferredMenu","Tools");
+ final ExecuteScriptTaskFactory executeScriptTaskFactory = new
ExecuteScriptTaskFactory(appAdapter);
+
+ final Properties executeScriptTaskFactoryProps = new
Properties();
+ executeScriptTaskFactoryProps.setProperty("id",
"executeScriptTaskFactory");
+ executeScriptTaskFactoryProps.setProperty("preferredMenu",
"Tools");
executeScriptTaskFactoryProps.setProperty("title", "Run
script...");
- executeScriptTaskFactoryProps.setProperty("menuGravity","2.0");
-
executeScriptTaskFactoryProps.setProperty("toolBarGravity","3.0");
- executeScriptTaskFactoryProps.setProperty("inToolBar","false");
-
- registerAllServices(bc, executeScriptTaskFactory,
executeScriptTaskFactoryProps);
-
+ executeScriptTaskFactoryProps.setProperty("menuGravity", "2.0");
+ executeScriptTaskFactoryProps.setProperty("toolBarGravity",
"3.0");
+ executeScriptTaskFactoryProps.setProperty("inToolBar", "false");
+
+ registerAllServices(bc, executeScriptTaskFactory,
executeScriptTaskFactoryProps);
+
}
}
Modified:
core3/impl/trunk/scripting-impl/src/test/java/org/cytoscape/scripting/internal/ExecuteScriptTaskTest.java
===================================================================
---
core3/impl/trunk/scripting-impl/src/test/java/org/cytoscape/scripting/internal/ExecuteScriptTaskTest.java
2012-07-11 16:50:24 UTC (rev 29831)
+++
core3/impl/trunk/scripting-impl/src/test/java/org/cytoscape/scripting/internal/ExecuteScriptTaskTest.java
2012-07-11 17:49:54 UTC (rev 29832)
@@ -17,7 +17,8 @@
}
@Test
- public void test() {
+ public void testJavaScript() {
+ // TODO: implement this
}
}
--
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.
