Author: mes
Date: 2012-04-25 14:54:02 -0700 (Wed, 25 Apr 2012)
New Revision: 29007
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportSelectedTableTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportTableTaskFactory.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportSelectedTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
Removed:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportCurrentTableTaskFactory.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
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/export/table/SelectExportTableTask.java
Log:
more core-task-api cleanup
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
===================================================================
--- core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-25 18:53:35 UTC (rev 29006)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -36,7 +36,8 @@
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
+import org.cytoscape.task.write.ExportTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
@@ -639,12 +640,18 @@
ExportNetworkViewTaskFactory get_ExportNetworkViewTaskFactory();
/**
- * Returns an instance of {@link ExportCurrentTableTaskFactory}.
- * @return an instance of {@link ExportCurrentTableTaskFactory}.
+ * Returns an instance of {@link ExportSelectedTableTaskFactory}.
+ * @return an instance of {@link ExportSelectedTableTaskFactory}.
*/
- ExportCurrentTableTaskFactory get_ExportCurrentTableTaskFactory();
-
+ ExportSelectedTableTaskFactory get_ExportSelectedTableTaskFactory();
+
/**
+ * Returns an instance of {@link ExportTableTaskFactory}.
+ * @return an instance of {@link ExportTableTaskFactory}.
+ */
+ ExportTableTaskFactory get_ExportTableTaskFactory();
+
+ /**
* Returns an instance of {@link ExportVizmapTaskFactory}.
* @return an instance of {@link ExportVizmapTaskFactory}.
*/
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportCurrentTableTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportCurrentTableTaskFactory.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportCurrentTableTaskFactory.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -1,25 +0,0 @@
-package org.cytoscape.task.write;
-
-import org.cytoscape.model.CyTable;
-import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-/**
- * This interface provides a task iterator for exporting the current
- * table.
- * @CyAPI.Api.Interface
- *
- */
-public interface ExportCurrentTableTaskFactory extends TableTaskFactory {
-
- /**
- * Creates a task iterator for exporting the current table to a
selected table.
- * This task will run synchronously in the current thread and it will
not create a
- * task monitor.
- * @param table The table to be exported.
- * @param format The file format description (e.g. .csv, .tsv)
- * @return task iterator
- */
- TaskIterator createTaskIterator(CyTable table, String format);
-
-}
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportSelectedTableTaskFactory.java
(from rev 29002,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportCurrentTableTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportSelectedTableTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportSelectedTableTaskFactory.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -0,0 +1,15 @@
+package org.cytoscape.task.write;
+
+
+import org.cytoscape.work.TaskFactory;
+
+/**
+ * This interface provides a task iterator for exporting the current
+ * table.
+ * @CyAPI.Api.Interface
+ *
+ */
+public interface ExportSelectedTableTaskFactory extends TaskFactory {
+
+
+}
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportTableTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportTableTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/write/ExportTableTaskFactory.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -0,0 +1,22 @@
+package org.cytoscape.task.write;
+
+import java.io.File;
+
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+/**
+ * This task factory provides a task iterator for writing a specified
+ * table to a specified file.
+ */
+public interface ExportTableTaskFactory extends TableTaskFactory {
+
+ /**
+ * Returns a task factory that write the specified table to the
specified file.
+ * @param table The table to be written.
+ * @param file The file the table will be written to.
+ * @return a task factory that write the specified table to the
specified file.
+ */
+ public TaskIterator createTaskIterator(CyTable table, File file);
+}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -95,7 +95,8 @@
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
+import org.cytoscape.task.write.ExportTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
@@ -207,7 +208,8 @@
CreateNetworkViewTaskFactory createNetworkViewTaskFactory =
getService(bc,CreateNetworkViewTaskFactory.class);
ExportNetworkImageTaskFactory exportNetworkImageTaskFactory =
getService(bc,ExportNetworkImageTaskFactory.class);
ExportNetworkViewTaskFactory exportNetworkViewTaskFactory =
getService(bc,ExportNetworkViewTaskFactory.class);
- ExportCurrentTableTaskFactory exportCurrentTableTaskFactory =
getService(bc,ExportCurrentTableTaskFactory.class);
+ ExportSelectedTableTaskFactory exportSelectedTableTaskFactory
= getService(bc,ExportSelectedTableTaskFactory.class);
+ ExportTableTaskFactory exportTableTaskFactory =
getService(bc,ExportTableTaskFactory.class);
ApplyPreferredLayoutTaskFactory
applyPreferredLayoutTaskFactory =
getService(bc,ApplyPreferredLayoutTaskFactory.class);
DeleteColumnTaskFactory deleteColumnTaskFactory =
getService(bc,DeleteColumnTaskFactory.class);
RenameColumnTaskFactory renameColumnTaskFactory =
getService(bc,RenameColumnTaskFactory.class);
@@ -274,7 +276,8 @@
createNetworkViewTaskFactory,
exportNetworkImageTaskFactory,
exportNetworkViewTaskFactory,
- exportCurrentTableTaskFactory,
+ exportSelectedTableTaskFactory,
+ exportTableTaskFactory,
applyPreferredLayoutTaskFactory,
deleteColumnTaskFactory,
renameColumnTaskFactory,
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -86,7 +86,8 @@
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
+import org.cytoscape.task.write.ExportTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
@@ -256,7 +257,8 @@
private CreateNetworkViewTaskFactory createNetworkViewTaskFactory;
private ExportNetworkImageTaskFactory exportNetworkImageTaskFactory;
private ExportNetworkViewTaskFactory exportNetworkViewTaskFactory;
- private ExportCurrentTableTaskFactory exportCurrentTableTaskFactory;
+ private ExportSelectedTableTaskFactory exportSelectedTableTaskFactory;
+ private ExportTableTaskFactory exportTableTaskFactory;
private ApplyPreferredLayoutTaskFactory applyPreferredLayoutTaskFactory;
private DeleteColumnTaskFactory deleteColumnTaskFactory;
private RenameColumnTaskFactory renameColumnTaskFactory;
@@ -374,7 +376,8 @@
final CreateNetworkViewTaskFactory
createNetworkViewTaskFactory,
final ExportNetworkImageTaskFactory
exportNetworkImageTaskFactory,
final ExportNetworkViewTaskFactory
exportNetworkViewTaskFactory,
- final ExportCurrentTableTaskFactory
exportCurrentTableTaskFactory,
+ final ExportSelectedTableTaskFactory
exportSelectedTableTaskFactory,
+ final ExportTableTaskFactory
exportTableTaskFactory,
final ApplyPreferredLayoutTaskFactory
applyPreferredLayoutTaskFactory,
final DeleteColumnTaskFactory
deleteColumnTaskFactory,
final RenameColumnTaskFactory
renameColumnTaskFactory,
@@ -478,7 +481,8 @@
this.createNetworkViewTaskFactory =
createNetworkViewTaskFactory;
this.exportNetworkImageTaskFactory =
exportNetworkImageTaskFactory;
this.exportNetworkViewTaskFactory =
exportNetworkViewTaskFactory;
- this.exportCurrentTableTaskFactory =
exportCurrentTableTaskFactory;
+ this.exportSelectedTableTaskFactory =
exportSelectedTableTaskFactory;
+ this.exportTableTaskFactory = exportTableTaskFactory;
this.applyPreferredLayoutTaskFactory =
applyPreferredLayoutTaskFactory;
this.deleteColumnTaskFactory = deleteColumnTaskFactory;
this.renameColumnTaskFactory = renameColumnTaskFactory;
@@ -584,7 +588,8 @@
@Override public CreateNetworkViewTaskFactory
get_CreateNetworkViewTaskFactory(){ return this.createNetworkViewTaskFactory;
}
@Override public ExportNetworkImageTaskFactory
get_ExportNetworkImageTaskFactory(){ return
this.exportNetworkImageTaskFactory;}
@Override public ExportNetworkViewTaskFactory
get_ExportNetworkViewTaskFactory(){ return this.exportNetworkViewTaskFactory;
}
- @Override public ExportCurrentTableTaskFactory
get_ExportCurrentTableTaskFactory(){ return
this.exportCurrentTableTaskFactory; }
+ @Override public ExportSelectedTableTaskFactory
get_ExportSelectedTableTaskFactory(){ return
this.exportSelectedTableTaskFactory; }
+ @Override public ExportTableTaskFactory get_ExportTableTaskFactory(){
return this.exportTableTaskFactory; }
@Override public ExportVizmapTaskFactory get_ExportVizmapTaskFactory(){
return this.exportVizmapTaskFactory; }
@Override public NewSessionTaskFactory get_NewSessionTaskFactory(){
return this.newSessionTaskFactory;}
@Override public OpenSessionTaskFactory get_OpenSessionTaskFactory(){
return this.openSessionTaskFactory;}
Modified:
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
===================================================================
---
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -74,9 +74,10 @@
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
+import org.cytoscape.task.write.ExportTableTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
import org.cytoscape.task.write.SaveSessionAsTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -181,7 +182,8 @@
mock(CreateNetworkViewTaskFactory.class),
mock(ExportNetworkImageTaskFactory.class),
mock(ExportNetworkViewTaskFactory.class),
- mock(ExportCurrentTableTaskFactory.class),
+ mock(ExportSelectedTableTaskFactory.class),
+ mock(ExportTableTaskFactory.class),
mock(ApplyPreferredLayoutTaskFactory.class),
mock(DeleteColumnTaskFactory.class),
mock(RenameColumnTaskFactory.class),
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-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -69,7 +69,8 @@
import org.cytoscape.task.internal.edit.ConnectSelectedNodesTaskFactoryImpl;
import
org.cytoscape.task.internal.export.graphics.ExportNetworkImageTaskFactoryImpl;
import
org.cytoscape.task.internal.export.network.ExportNetworkViewTaskFactoryImpl;
-import
org.cytoscape.task.internal.export.table.ExportCurrentTableTaskFactoryImpl;
+import
org.cytoscape.task.internal.export.table.ExportSelectedTableTaskFactoryImpl;
+import org.cytoscape.task.internal.export.table.ExportTableTaskFactoryImpl;
import org.cytoscape.task.internal.export.vizmap.ExportVizmapTaskFactoryImpl;
import org.cytoscape.task.internal.group.GroupNodeContextTaskFactoryImpl;
import org.cytoscape.task.internal.group.GroupNodesTaskFactoryImpl;
@@ -109,7 +110,7 @@
import org.cytoscape.task.internal.table.DeleteColumnTaskFactoryImpl;
import org.cytoscape.task.internal.table.DeleteTableTaskFactoryImpl;
import org.cytoscape.task.internal.table.MapGlobalToLocalTableTaskFactoryImpl;
-import org.cytoscape.task.internal.table.MapNetworkAttrTaskFactoryImpl;
+import
org.cytoscape.task.internal.table.MapTableToNetworkTablesTaskFactoryImpl;
import org.cytoscape.task.internal.table.RenameColumnTaskFactoryImpl;
import org.cytoscape.task.internal.title.EditNetworkTitleTaskFactoryImpl;
import org.cytoscape.task.internal.vizmap.ApplyVisualStyleTaskFactoryimpl;
@@ -138,9 +139,10 @@
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
+import org.cytoscape.task.write.ExportTableTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
import org.cytoscape.task.write.SaveSessionAsTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -254,7 +256,7 @@
CreateNetworkViewTaskFactoryImpl createNetworkViewTaskFactory =
new
CreateNetworkViewTaskFactoryImpl(undoSupportServiceRef,cyNetworkViewFactoryServiceRef,cyNetworkViewManagerServiceRef,cyLayoutsServiceRef,cyEventHelperRef);
ExportNetworkImageTaskFactoryImpl exportNetworkImageTaskFactory
= new
ExportNetworkImageTaskFactoryImpl(viewWriterManagerServiceRef,cyApplicationManagerServiceRef);
ExportNetworkViewTaskFactoryImpl exportNetworkViewTaskFactory =
new ExportNetworkViewTaskFactoryImpl(networkViewWriterManagerServiceRef,
tunableSetterServiceRef);
- ExportCurrentTableTaskFactoryImpl exportCurrentTableTaskFactory
= new ExportCurrentTableTaskFactoryImpl(cyTableWriterManagerRef,
cyTableManagerServiceRef, cyNetworkManagerServiceRef, tunableSetterServiceRef);
+ ExportSelectedTableTaskFactoryImpl
exportCurrentTableTaskFactory = new
ExportSelectedTableTaskFactoryImpl(cyTableWriterManagerRef,
cyTableManagerServiceRef, cyNetworkManagerServiceRef);
ApplyPreferredLayoutTaskFactoryImpl
applyPreferredLayoutTaskFactory = new
ApplyPreferredLayoutTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef,cyLayoutsServiceRef,cyPropertyServiceRef);
DeleteColumnTaskFactoryImpl deleteColumnTaskFactory = new
DeleteColumnTaskFactoryImpl(undoSupportServiceRef);
RenameColumnTaskFactoryImpl renameColumnTaskFactory = new
RenameColumnTaskFactoryImpl(undoSupportServiceRef, tunableSetterServiceRef);
@@ -785,7 +787,7 @@
exportCurrentTableTaskFactoryProps.setProperty(COMMAND,"export-table");
exportCurrentTableTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"table");
registerService(bc,exportCurrentTableTaskFactory,TableTaskFactory.class,
exportCurrentTableTaskFactoryProps);
-
registerService(bc,exportCurrentTableTaskFactory,ExportCurrentTableTaskFactory.class,
exportCurrentTableTaskFactoryProps);
+
registerService(bc,exportCurrentTableTaskFactory,ExportSelectedTableTaskFactory.class,
exportCurrentTableTaskFactoryProps);
Properties exportVizmapTaskFactoryProps = new Properties();
exportVizmapTaskFactoryProps.setProperty(ENABLE_FOR,"vizmap");
@@ -947,9 +949,13 @@
unGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace
registerService(bc,unGroupNodesTaskFactory,NodeViewTaskFactory.class,
unGroupTaskFactoryProps);
- MapNetworkAttrTaskFactoryImpl mapNetworkAttrTaskFactory = new
MapNetworkAttrTaskFactoryImpl(cyNetworkManagerServiceRef,
cyApplicationManagerServiceRef,
+ MapTableToNetworkTablesTaskFactoryImpl
mapNetworkAttrTaskFactory = new
MapTableToNetworkTablesTaskFactoryImpl(cyNetworkManagerServiceRef,
cyApplicationManagerServiceRef,
cyRootNetworkFactoryServiceRef,tunableSetterServiceRef);
Properties mapNetworkAttrTaskFactoryProps = new Properties();
registerService(bc,mapNetworkAttrTaskFactory,MapTableToNetworkTablesTaskFactory.class,mapNetworkAttrTaskFactoryProps);
+
+ ExportTableTaskFactoryImpl exportTableTaskFactory = new
ExportTableTaskFactoryImpl(cyTableWriterManagerRef,tunableSetterServiceRef);
+ Properties exportTableTaskFactoryProps = new Properties();
+
registerService(bc,exportTableTaskFactory,ExportTableTaskFactory.class,exportTableTaskFactoryProps);
}
}
Deleted:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactoryImpl.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactoryImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -1,50 +0,0 @@
-package org.cytoscape.task.internal.export.table;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.cytoscape.io.write.CyTableWriterManager;
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
-import org.cytoscape.task.AbstractTableTaskFactory;
-import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
-import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.TunableSetter;
-import org.cytoscape.work.util.ListSingleSelection;
-
-public class ExportCurrentTableTaskFactoryImpl extends
AbstractTableTaskFactory implements ExportCurrentTableTaskFactory{
-
- private final CyTableWriterManager writerManager;
- private final CyTableManager cyTableManagerServiceRef;
- private final CyNetworkManager cyNetworkManagerServiceRef;
-
- private final TunableSetter tunableSetter;
-
-
- public ExportCurrentTableTaskFactoryImpl(CyTableWriterManager
writerManager, CyTableManager cyTableManagerServiceRef, CyNetworkManager
cyNetworkManagerServiceRef
- ,TunableSetter tunableSetter) {
- this.writerManager = writerManager;
- this.cyTableManagerServiceRef = cyTableManagerServiceRef;
- this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
- this.tunableSetter = tunableSetter;
- }
-
- @Override
- public TaskIterator createTaskIterator(CyTable table) {
- return new TaskIterator(new
SelectExportTableTask(this.writerManager, this.cyTableManagerServiceRef,
this.cyNetworkManagerServiceRef));
- }
-
- @Override
- public TaskIterator createTaskIterator(CyTable table, String format) {
- final Map<String, Object> m = new HashMap<String, Object>();
-
- ListSingleSelection<String> formatSelection = new
ListSingleSelection<String>(format);
- formatSelection.setSelectedValue(format);
-
- m.put("options", formatSelection);
-
- return tunableSetter.createTaskIterator(new TaskIterator(2, new
CyTableWriter(writerManager, table)), m);
-
- }
-}
Copied:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportSelectedTableTaskFactoryImpl.java
(from rev 29002,
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactoryImpl.java)
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportSelectedTableTaskFactoryImpl.java
(rev 0)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportSelectedTableTaskFactoryImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -0,0 +1,31 @@
+package org.cytoscape.task.internal.export.table;
+
+
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.task.write.ExportSelectedTableTaskFactory;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.AbstractTaskFactory;
+
+public class ExportSelectedTableTaskFactoryImpl extends AbstractTaskFactory
implements ExportSelectedTableTaskFactory{
+
+ private final CyTableWriterManager writerManager;
+ private final CyTableManager cyTableManagerServiceRef;
+ private final CyNetworkManager cyNetworkManagerServiceRef;
+
+
+
+ public ExportSelectedTableTaskFactoryImpl(CyTableWriterManager
writerManager, CyTableManager cyTableManagerServiceRef, CyNetworkManager
cyNetworkManagerServiceRef) {
+ this.writerManager = writerManager;
+ this.cyTableManagerServiceRef = cyTableManagerServiceRef;
+ this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
+ }
+
+ @Override
+ public TaskIterator createTaskIterator() {
+ return new TaskIterator(new
SelectExportTableTask(this.writerManager, this.cyTableManagerServiceRef,
this.cyNetworkManagerServiceRef));
+ }
+
+
+}
Added:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportTableTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportTableTaskFactoryImpl.java
(rev 0)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/ExportTableTaskFactoryImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -0,0 +1,39 @@
+package org.cytoscape.task.internal.export.table;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.write.ExportTableTaskFactory;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.TunableSetter;
+
+public class ExportTableTaskFactoryImpl extends
org.cytoscape.task.AbstractTableTaskFactory
+ implements ExportTableTaskFactory {
+ private final CyTableWriterManager writerManager;
+ private final TunableSetter tunableSetter;
+
+ public ExportTableTaskFactoryImpl(CyTableWriterManager writerManager,
TunableSetter tunableSetter) {
+ super();
+ this.writerManager = writerManager;
+ this.tunableSetter = tunableSetter;
+ }
+
+ @Override
+ public TaskIterator createTaskIterator(CyTable table) {
+ return new TaskIterator(2, new CyTableWriter(writerManager,
table));
+ }
+
+ @Override
+ public TaskIterator createTaskIterator(CyTable table, File file) {
+
+ final Map<String, Object> m = new HashMap<String, Object>();
+ m.put("OutputFile", file);
+
+ return tunableSetter.createTaskIterator(new TaskIterator(2, new
CyTableWriter(writerManager, table)), m);
+ }
+
+}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -37,19 +37,19 @@
this.writerManager = writerManager;
this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
- populateTableNetowrkMap();
-
+ populateNetworkTableMap();
+ populateSelectTable();
+ }
+
+ private void populateSelectTable() {
final List<String> options = new ArrayList<String>();
- Set<CyTable> tableSet =
this.cyTableManagerServiceRef.getAllTables(false);
- Iterator<CyTable> it = tableSet.iterator();
- while (it.hasNext()){
- CyTable tbl = it.next();
+ for ( CyTable tbl :
cyTableManagerServiceRef.getAllTables(false)) {
CyNetwork net = this.tableNetworkMap.get(tbl);
String title = tbl.getTitle();
- if (net != null){
+ if (net != null) {
title = net.getRow(net).get("name",
String.class)+" -- "+title;
}
@@ -62,12 +62,9 @@
}
- private void populateTableNetowrkMap() {
+ private void populateNetworkTableMap() {
- Iterator<CyNetwork> it =
this.cyNetworkManagerServiceRef.getNetworkSet().iterator();
-
- while (it.hasNext()){
- CyNetwork net = it.next();
+ for (CyNetwork net: cyNetworkManagerServiceRef.getNetworkSet())
{
this.tableNetworkMap.put(net.getDefaultNetworkTable(),
net);
this.tableNetworkMap.put(net.getDefaultNodeTable(),
net);
this.tableNetworkMap.put(net.getDefaultEdgeTable(),
net);
Deleted:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java
2012-04-25 18:53:35 UTC (rev 29006)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -1,59 +0,0 @@
-package org.cytoscape.task.internal.table;
-
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.model.CyIdentifiable;
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.subnetwork.CyRootNetworkManager;
-import org.cytoscape.task.edit.MapTableToNetworkTablesTaskFactory;
-import org.cytoscape.work.AbstractTaskFactory;
-import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.TunableSetter;
-import org.cytoscape.work.util.ListSingleSelection;
-import java.util.Map;
-import java.util.HashMap;
-
-public class MapNetworkAttrTaskFactoryImpl extends AbstractTaskFactory
implements MapTableToNetworkTablesTaskFactory {
-
- private final CyNetworkManager networkManager;
- private final CyApplicationManager applicationManager;
- private final CyRootNetworkManager rootNetworkManager;
- private final TunableSetter tunableSetter;
-
- public MapNetworkAttrTaskFactoryImpl(final CyNetworkManager
networkManager,
- final CyApplicationManager applicationManager,
- final CyRootNetworkManager rootNetworkManager,
- final TunableSetter tunableSetter)
- {
- this.networkManager = networkManager;
- this.applicationManager = applicationManager;
- this.rootNetworkManager = rootNetworkManager;
- this.tunableSetter = tunableSetter;
- }
- @Override
- public TaskIterator createTaskIterator() {
- throw new UnsupportedOperationException("This TaskFactory
doesn't support createTaskIterator()");
- }
-
-
- @Override
- public TaskIterator createTaskIterator(
- Class<? extends CyIdentifiable> type, CyTable
newGlobalTable,
- String mappingKey, MappingType mappingType) {
- ListSingleSelection<String> lss = new
ListSingleSelection<String>(mappingType.getDescription());
- lss.setSelectedValue(mappingType.getDescription());
-
- Map<String,Object> m = new HashMap<String,Object>();
- m.put("whichTable",lss);
-
- return
tunableSetter.createTaskIterator(this.createTaskIterator(type,newGlobalTable,mappingKey),
m);
- }
-
- @Override
- public TaskIterator createTaskIterator(
- Class<? extends CyIdentifiable> type, CyTable
newGlobalTable,
- String mappingKey) {
- return new TaskIterator(1,new
MapNetworkAttrTask(type,newGlobalTable,mappingKey,networkManager,applicationManager,rootNetworkManager));
- }
-
-}
Copied:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
(from rev 29006,
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java)
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
(rev 0)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
2012-04-25 21:54:02 UTC (rev 29007)
@@ -0,0 +1,59 @@
+package org.cytoscape.task.internal.table;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
+import org.cytoscape.task.edit.MapTableToNetworkTablesTaskFactory;
+import org.cytoscape.work.AbstractTaskFactory;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.TunableSetter;
+import org.cytoscape.work.util.ListSingleSelection;
+import java.util.Map;
+import java.util.HashMap;
+
+public class MapTableToNetworkTablesTaskFactoryImpl extends
AbstractTaskFactory implements MapTableToNetworkTablesTaskFactory {
+
+ private final CyNetworkManager networkManager;
+ private final CyApplicationManager applicationManager;
+ private final CyRootNetworkManager rootNetworkManager;
+ private final TunableSetter tunableSetter;
+
+ public MapTableToNetworkTablesTaskFactoryImpl(final CyNetworkManager
networkManager,
+ final CyApplicationManager applicationManager,
+ final CyRootNetworkManager rootNetworkManager,
+ final TunableSetter tunableSetter)
+ {
+ this.networkManager = networkManager;
+ this.applicationManager = applicationManager;
+ this.rootNetworkManager = rootNetworkManager;
+ this.tunableSetter = tunableSetter;
+ }
+ @Override
+ public TaskIterator createTaskIterator() {
+ throw new UnsupportedOperationException("This TaskFactory
doesn't support createTaskIterator()");
+ }
+
+
+ @Override
+ public TaskIterator createTaskIterator(
+ Class<? extends CyIdentifiable> type, CyTable
newGlobalTable,
+ String mappingKey, MappingType mappingType) {
+ ListSingleSelection<String> lss = new
ListSingleSelection<String>(mappingType.getDescription());
+ lss.setSelectedValue(mappingType.getDescription());
+
+ Map<String,Object> m = new HashMap<String,Object>();
+ m.put("whichTable",lss);
+
+ return
tunableSetter.createTaskIterator(this.createTaskIterator(type,newGlobalTable,mappingKey),
m);
+ }
+
+ @Override
+ public TaskIterator createTaskIterator(
+ Class<? extends CyIdentifiable> type, CyTable
newGlobalTable,
+ String mappingKey) {
+ return new TaskIterator(1,new
MapNetworkAttrTask(type,newGlobalTable,mappingKey,networkManager,applicationManager,rootNetworkManager));
+ }
+
+}
--
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.
