Author: oriol
Date: 2012-07-20 05:41:43 -0700 (Fri, 20 Jul 2012)
New Revision: 29938
Modified:
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
Log:
Fixing bug #1243 partially.
Modified:
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
2012-07-20 02:28:28 UTC (rev 29937)
+++
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
2012-07-20 12:41:43 UTC (rev 29938)
@@ -9,6 +9,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
+import org.cytoscape.task.read.LoadTableFileTaskFactory;
import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
import org.cytoscape.task.read.OpenSessionTaskFactory;
import org.cytoscape.work.TaskManager;
@@ -29,6 +30,7 @@
StreamUtil streamUtil = getService(bc,StreamUtil.class);
OpenSessionTaskFactory loadSession = getService(bc,
OpenSessionTaskFactory.class);
LoadNetworkFileTaskFactory networkFileLoader = getService(bc,
LoadNetworkFileTaskFactory.class);
+ LoadTableFileTaskFactory attributesFileLoader = getService(bc,
LoadTableFileTaskFactory.class);
LoadNetworkURLTaskFactory networkURLLoader = getService(bc,
LoadNetworkURLTaskFactory.class);
LoadVizmapFileTaskFactory visualStylesLoader = getService(bc,
LoadVizmapFileTaskFactory.class);
TaskManager <?,?> taskManager = getService(bc,
TaskManager.class);
@@ -36,7 +38,7 @@
CyProperty<Properties> props =
(CyProperty<Properties>)getService(bc, CyProperty.class,
"(cyPropertyName=cytoscape3.props)");
- StartupConfig sc = new
StartupConfig(props.getProperties(),streamUtil, loadSession, networkFileLoader,
networkURLLoader, visualStylesLoader, taskManager, registrar);
+ StartupConfig sc = new
StartupConfig(props.getProperties(),streamUtil,attributesFileLoader,
loadSession, networkFileLoader, networkURLLoader, visualStylesLoader,
taskManager, registrar);
Parser p = new Parser(args.getArgs(), cyShutdown, cyVersion,
sc,props.getProperties());
Modified:
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
===================================================================
---
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
2012-07-20 02:28:28 UTC (rev 29937)
+++
core3/impl/trunk/gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
2012-07-20 12:41:43 UTC (rev 29938)
@@ -90,7 +90,7 @@
private ArrayList<File> tableFiles;
private ArrayList<URL> tableURLs;
- public StartupConfig(Properties globalProps, StreamUtil streamUtil,
+ public StartupConfig(Properties globalProps, StreamUtil streamUtil,
LoadTableFileTaskFactory attributesFileLoader,
OpenSessionTaskFactory loadSession,
LoadNetworkFileTaskFactory networkFileLoader,
LoadNetworkURLTaskFactory networkURLLoader,
LoadVizmapFileTaskFactory visualStylesLoader, TaskManager taskManager,
CyServiceRegistrar registrar) {
@@ -101,6 +101,7 @@
this.networkURLLoader = networkURLLoader;
this.visualStylesLoader = visualStylesLoader;
this.taskManager = taskManager;
+ this.attributesFileLoader = attributesFileLoader;
this.registrar = registrar;
networkFiles= new ArrayList<File>();
--
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.
