Author: rozagh
Date: 2012-03-29 16:17:27 -0700 (Thu, 29 Mar 2012)
New Revision: 28700
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
Log:
adding the task for mapping imported global table to local tables after import
attribute table task.
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-03-29 22:22:49 UTC (rev 28699)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-03-29 23:17:27 UTC (rev 28700)
@@ -34,6 +34,7 @@
import
org.cytoscape.tableimport.internal.reader.ontology.OBONetworkReaderFactory;
import org.cytoscape.tableimport.internal.ui.ImportTablePanel;
import org.cytoscape.tableimport.internal.util.CytoscapeServices;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.io.read.InputStreamTaskFactory;
import org.cytoscape.application.swing.CyAction;
@@ -75,8 +76,11 @@
CytoscapeServices.cyTableFactory =
getService(bc,CyTableFactory.class);
CytoscapeServices.streamUtil = getService(bc,StreamUtil.class);
CytoscapeServices.cyEventHelper =
getService(bc,CyEventHelper.class);
+ CytoscapeServices.mapGlobalToLocalTableTaskFactory =
getService(bc, MapGlobalToLocalTableTaskFactory.class);
+
+
- BasicCyFileFilter attrsTableFilter_txt = new
BasicCyFileFilter(new String[]{"csv","tsv", "txt", "tab", "net"}, new
String[]{"text/csv","text/plain","text/tab-separated-values"},"Comma or Tab
Separated Value Files",TABLE,CytoscapeServices.streamUtil);
+ BasicCyFileFilter attrsTableFilter_txt = new
BasicCyFileFilter(new String[]{"csv","tsv", "txt", "tab", "net"}, new
String[]{"text/csv","text/tab-separated-values"},"Comma or Tab Separated Value
Files",TABLE,CytoscapeServices.streamUtil);
BasicCyFileFilter attrsTableFilter_xls = new
BasicCyFileFilter(new String[]{"xls","xlsx"}, new
String[]{"application/excel"},"Excel Files",TABLE,CytoscapeServices.streamUtil);
BasicCyFileFilter oboFilter = new BasicCyFileFilter(new
String[]{"obo"}, new String[]{"text/obo"},"OBO
Files",NETWORK,CytoscapeServices.streamUtil);
OBONetworkReaderFactory oboReaderFactory = new
OBONetworkReaderFactory(oboFilter);
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2012-03-29 22:22:49 UTC (rev 28699)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2012-03-29 23:17:27 UTC (rev 28700)
@@ -129,6 +129,7 @@
this.reader = new
DefaultAttributeTableReader(null,amp,this.is);
loadAnnotation(tm);
}
+
insertTasksAfterCurrentTask(CytoscapeServices.mapGlobalToLocalTableTaskFactory.createTaskIterator());
}
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-03-29 22:22:49 UTC (rev 28699)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-03-29 23:17:27 UTC (rev 28700)
@@ -16,6 +16,7 @@
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.util.swing.FileUtil;
import org.cytoscape.io.util.StreamUtil;
@@ -41,4 +42,5 @@
public static CyTableFactory cyTableFactory;
public static StreamUtil streamUtil;
public static CyEventHelper cyEventHelper;
+ public static MapGlobalToLocalTableTaskFactory
mapGlobalToLocalTableTaskFactory;
}
--
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.
