Author: pwang
Date: 2010-08-17 17:21:20 -0700 (Tue, 17 Aug 2010)
New Revision: 21437
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadDataTableTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTaskFactoryImpl.java
Log:
Refactored
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadDataTableTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadDataTableTask.java
2010-08-18 00:20:51 UTC (rev 21436)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadDataTableTask.java
2010-08-18 00:21:20 UTC (rev 21437)
@@ -5,8 +5,8 @@
import java.util.Map;
import java.util.Properties;
-import org.cytoscape.io.read.CyReader;
-import org.cytoscape.io.read.CyReaderManager;
+import org.cytoscape.io.read.CyDataTableProducer;
+import org.cytoscape.io.read.CyDataTableProducerManager;
import org.cytoscape.model.CyDataTable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.work.Task;
@@ -15,28 +15,29 @@
public abstract class AbstractLoadDataTableTask extends AbstractTask {
- protected CyReader reader;
+ protected CyDataTableProducer reader;
protected URI uri;
protected TaskMonitor taskMonitor;
protected String name;
protected Thread myThread = null;
protected boolean interrupted = false;
- protected CyReaderManager mgr;
+ protected CyDataTableProducerManager mgr;
protected Properties props;
protected CyNetworkNaming namingUtil;
- public AbstractLoadDataTableTask(CyReaderManager mgr,
+ public AbstractLoadDataTableTask(CyDataTableProducerManager mgr,
Properties props) {
this.mgr = mgr;
this.props = props;
}
- protected void loadTable(CyReader reader) throws Exception {
+ protected void loadTable(CyDataTableProducer reader) throws Exception {
if (reader == null)
throw new Exception("Could not read file: file reader
was null");
try {
+ /*
myThread = Thread.currentThread();
taskMonitor.setStatusMessage("Reading in Data
Table...");
@@ -57,7 +58,7 @@
sb.append("\nThis file may not be a valid file
format.");
throw new IOException(sb.toString());
}
-
+*/
taskMonitor.setProgress(1.0);
} finally {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
2010-08-18 00:20:51 UTC (rev 21436)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
2010-08-18 00:21:20 UTC (rev 21437)
@@ -5,7 +5,8 @@
import java.io.File;
import java.util.Properties;
-import org.cytoscape.io.read.CyReaderManager;
+//import org.cytoscape.io.read.CyReaderManager;
+import org.cytoscape.io.read.CyDataTableProducerManager;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.Tunable.Param;
@@ -15,7 +16,7 @@
@Tunable(description = "Data table file to load", flags = {
Param.attributes })
public File file;
- public LoadDataTableTask(CyReaderManager mgr,
+ public LoadDataTableTask(CyDataTableProducerManager mgr,
Properties props) {
super(mgr, props);
}
@@ -26,7 +27,7 @@
public void run(TaskMonitor taskMonitor) throws Exception {
this.taskMonitor = taskMonitor;
- reader = mgr.getReader(file.toURI(), TABLE);
+ //reader = mgr.getReader(file.toURI(), TABLE);
uri = file.toURI();
name = file.getName();
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTaskFactoryImpl.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTaskFactoryImpl.java
2010-08-18 00:20:51 UTC (rev 21436)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTaskFactoryImpl.java
2010-08-18 00:21:20 UTC (rev 21437)
@@ -2,17 +2,18 @@
import java.util.Properties;
-import org.cytoscape.io.read.CyReaderManager;
+//import org.cytoscape.io.read.CyReaderManager;
+import org.cytoscape.io.read.CyDataTableProducerManager;
import org.cytoscape.property.CyProperty;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
public class LoadDataTableTaskFactoryImpl implements TaskFactory {
- private CyReaderManager mgr;
+ private CyDataTableProducerManager mgr;
private Properties props;
- public LoadDataTableTaskFactoryImpl(CyReaderManager mgr,
+ public LoadDataTableTaskFactoryImpl(CyDataTableProducerManager mgr,
CyProperty<Properties> cyProp) {
this.mgr = mgr;
this.props = cyProp.getProperties();
--
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.
