Author: rozagh
Date: 2012-05-30 08:58:56 -0700 (Wed, 30 May 2012)
New Revision: 29391
Added:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
Log:
New importer combined with mapping. showing all o the imported tables in the
global table combo box.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-30 14:55:15 UTC (rev 29390)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-30 15:58:56 UTC (rev 29391)
@@ -171,6 +171,7 @@
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.SynchronousTaskManager;
+import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TunableSetter;
import org.cytoscape.work.undo.UndoSupport;
@@ -216,7 +217,8 @@
LoadAttributesFileTaskFactoryImpl loadAttrsFileTaskFactory =
new LoadAttributesFileTaskFactoryImpl(cyDataTableReaderManagerServiceRef,
tunableSetterServiceRef,cyNetworkManagerServiceRef, cyTableManagerServiceRef);
LoadAttributesURLTaskFactoryImpl loadAttrsURLTaskFactory = new
LoadAttributesURLTaskFactoryImpl(cyDataTableReaderManagerServiceRef,
tunableSetterServiceRef, cyNetworkManagerServiceRef, cyTableManagerServiceRef);
-
+
+
CyGroupManager cyGroupManager = getService(bc,
CyGroupManager.class);
CyGroupFactory cyGroupFactory = getService(bc,
CyGroupFactory.class);
@@ -984,6 +986,7 @@
Properties mapNetworkToTablesProps = new Properties();
registerService(bc, mapNetworkToTables,
MapTableToNetworkTablesTaskFactory.class, mapNetworkToTablesProps);
+
ExportTableTaskFactoryImpl exportTableTaskFactory = new
ExportTableTaskFactoryImpl(cyTableWriterManagerRef,tunableSetterServiceRef);
Properties exportTableTaskFactoryProps = new Properties();
registerService(bc,exportTableTaskFactory,ExportTableTaskFactory.class,exportTableTaskFactoryProps);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2012-05-30 14:55:15 UTC (rev 29390)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2012-05-30 15:58:56 UTC (rev 29391)
@@ -8,6 +8,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.task.internal.table.MapTableToNetworkTablesTask;
+import
org.cytoscape.task.internal.table.MapTableToNetworkTablesTaskFactoryImpl;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
@@ -15,10 +16,6 @@
abstract class AbstractLoadAttributesTask extends AbstractTask {
- @ProvidesTitle
- public String getTitle() {
- return "Import Table";
- }
private final CyTableReaderManager mgr;
private final CyNetworkManager netMgr;
@@ -41,7 +38,7 @@
taskMonitor.setStatusMessage("Importing Data Table...");
- insertTasksAfterCurrentTask(reader , new
MapTableToNetworkTablesTask(netMgr, reader), new AddImportedTableTask(tableMgr,
reader), new FinalStatusMessageUpdateTask(reader));
+ insertTasksAfterCurrentTask(new CombineReaderAndMappingTask(
reader, netMgr) , new AddImportedTableTask(tableMgr, reader));
}
}
Added:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
(rev 0)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
2012-05-30 15:58:56 UTC (rev 29391)
@@ -0,0 +1,40 @@
+package org.cytoscape.task.internal.loaddatatable;
+
+import org.cytoscape.io.read.CyTableReader;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.task.internal.table.MapTableToNetworkTablesTask;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ContainsTunables;
+import org.cytoscape.work.ProvidesTitle;
+import org.cytoscape.work.TaskMonitor;
+
+public class CombineReaderAndMappingTask extends AbstractTask{
+
+ @ProvidesTitle
+ public String getTitle() {
+ return "Import Attribute From Table";
+ }
+
+
+ @ContainsTunables
+ public MapTableToNetworkTablesTask mappingTask;
+
+ @ContainsTunables
+ public CyTableReader readerTask;
+
+
+
+ public CombineReaderAndMappingTask(CyTableReader readerTask ,
CyNetworkManager networkManager){
+ this.readerTask = readerTask;
+ this.mappingTask = new
MapTableToNetworkTablesTask(networkManager, readerTask);
+ }
+
+ @Override
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ readerTask.run(taskMonitor);
+ mappingTask.run(taskMonitor);
+ }
+
+
+
+}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
2012-05-30 14:55:15 UTC (rev 29390)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
2012-05-30 15:58:56 UTC (rev 29391)
@@ -165,8 +165,10 @@
throw new IllegalStateException("Local table's primary
key should be type String!");
final CyColumn trgCol = localTable.getColumn(CyNetwork.NAME);
- if (trgCol != null)
+ if (trgCol != null){
localTable.addVirtualColumns(globalTable,
CyNetwork.NAME, false);
+ //globalTable.setPublic(false);
+ }
else
logger.warn("Name column in the target table was not
found!");
}
--
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.
