Author: mes
Date: 2012-04-25 11:08:31 -0700 (Wed, 25 Apr 2012)
New Revision: 28999
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/GroupNodesTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapNetworkAttrTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyVisualStyleTaskFactory.java
Removed:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/GroupNodesTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapGlobalToLocalTableTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapNetworkAttrTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/ApplyVisualStyleTaskFactory.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/group/GroupNodesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTask.java
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/vizmap/ApplyVisualStyleTaskFactoryimpl.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
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/util/CytoscapeServices.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportClient.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/task/ImportTableFromNCBITask.java
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CyActivator.java
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
Log:
more package reorg for core-task-api
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:05:04 UTC (rev 28998)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -34,14 +34,13 @@
import org.cytoscape.work.swing.PanelTaskManager;
import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
import org.cytoscape.task.write.ExportVizmapTaskFactory;
import org.cytoscape.task.write.SaveSessionAsTaskFactory;
import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.task.read.LoadTableFileTaskFactory;
@@ -81,11 +80,12 @@
import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/GroupNodesTaskFactory.java
(from rev 28992,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/GroupNodesTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/GroupNodesTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/GroupNodesTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -0,0 +1,11 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.task.NetworkViewTaskFactory;
+
+/**
+ * This interface provides a task iterator for grouping nodes.
+ * @CyAPI.Api.Interface
+ */
+public interface GroupNodesTaskFactory extends NetworkViewTaskFactory{
+
+}
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
(from rev 28992,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapGlobalToLocalTableTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -0,0 +1,22 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+
+/**
+ * This interface provides a task iterator for mapping a global to a local
table.
+ * @CyAPI.Api.Interface
+ */
+public interface MapGlobalToLocalTableTaskFactory extends TaskFactory{
+
+ /**
+ * Creates a task iterator for mapping a selected global table to a
selected local table.
+ * The created task will run synchronously in the current thread and
will not create a
+ * new task monitor.
+ * @param globalTable The global table name to map from.
+ * @param localTable The local table name to map to.
+ * @return A task iterator of type {@link TaskIterator}.
+ */
+ TaskIterator createTaskIterator(final String globalTable, final String
localTable);
+}
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapNetworkAttrTaskFactory.java
(from rev 28992,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapNetworkAttrTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapNetworkAttrTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapNetworkAttrTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -0,0 +1,57 @@
+package org.cytoscape.task.edit;
+
+import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public interface MapNetworkAttrTaskFactory extends TaskFactory {
+
+ enum MappingType {
+ CURRENT_LOCAL("Only to the current network"),
+ CURRENT_SHARED("All networks related to current network"),
+ ALL_SHARED("All networks"),
+ INDEPENDENT("None (create Global Table w/o mapping)"),
+ ;
+
+ private final String desc;
+ private MappingType(String desc) {
+ this.desc = desc;
+ }
+ public String getDescription(){
+ return desc;
+ }
+ public static MappingType fromDescription(String d) {
+ for (MappingType m : values())
+ if (m.getDescription().equals(d))
+ return m;
+ throw new IllegalArgumentException("String " + d + "
doesn't match a known description in MappingType");
+ }
+ }
+ /**
+ * This creates a task iterator that will take a specified table and
ask whether
+ * the columns in the specified table should become virtual columns in
the node or
+ * edge table of the current network, all networks, or no networks.
+ * @param type The type of table to map to, either CyNode.class or
CyEdge.class.
+ * @param newGlobalTable The table to be mapped.
+ * @param mappingKey The column name in the existing table used to join
with the primary key in the new table.
+ * @param mappingType The type of mapping to be performed.
+ */
+ TaskIterator createTaskIterator(final Class<? extends CyIdentifiable>
type,
+ final CyTable newGlobalTable,
+ String mappingKey,
+ MappingType mappingType);
+ /**
+ * This creates a task iterator that will take a specified table and
ask whether
+ * the columns in the specified table should become virtual columns in
the node or
+ * edge table of the current network, all networks, or no networks.
The resulting
+ * Task will prompt the user to determine which mapping type to choose
via the Tunable
+ * user interface.
+ * @param type The type of table to map to, either CyNode.class or
CyEdge.class.
+ * @param newGlobalTable The table to be mapped.
+ * @param mappingKey The column name in the existing table used to join
with the primary key in the new table.
+ */
+ TaskIterator createTaskIterator(final Class<? extends CyIdentifiable>
type,
+ final CyTable newGlobalTable,
+ String mappingKey);
+}
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/GroupNodesTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/GroupNodesTaskFactory.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/GroupNodesTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -1,11 +0,0 @@
-package org.cytoscape.task.group;
-
-import org.cytoscape.task.NetworkViewTaskFactory;
-
-/**
- * This interface provides a task iterator for grouping nodes.
- * @CyAPI.Api.Interface
- */
-public interface GroupNodesTaskFactory extends NetworkViewTaskFactory{
-
-}
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyVisualStyleTaskFactory.java
(from rev 28992,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/ApplyVisualStyleTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyVisualStyleTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyVisualStyleTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -0,0 +1,21 @@
+package org.cytoscape.task.layout;
+
+import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.work.TaskIterator;
+
+/**
+ * This interface provides a task iterator for applying a visual style.
+ * @CyAPI.Api.Interface
+ */
+public interface ApplyVisualStyleTaskFactory extends NetworkViewTaskFactory{
+
+ /**
+ * Creates a task iterator for applying a visual style on a network
view.
+ * @param networkView The network view to apply the visual style on.
+ * @param style The visual styles to apply.
+ * @return a task iterator of type {@link TaskIterator}.
+ */
+ TaskIterator createTaskIterator(final CyNetworkView networkView, final
VisualStyle style);
+}
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapGlobalToLocalTableTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapGlobalToLocalTableTaskFactory.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapGlobalToLocalTableTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -1,22 +0,0 @@
-package org.cytoscape.task.table;
-
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-
-/**
- * This interface provides a task iterator for mapping a global to a local
table.
- * @CyAPI.Api.Interface
- */
-public interface MapGlobalToLocalTableTaskFactory extends TaskFactory{
-
- /**
- * Creates a task iterator for mapping a selected global table to a
selected local table.
- * The created task will run synchronously in the current thread and
will not create a
- * new task monitor.
- * @param globalTable The global table name to map from.
- * @param localTable The local table name to map to.
- * @return A task iterator of type {@link TaskIterator}.
- */
- TaskIterator createTaskIterator(final String globalTable, final String
localTable);
-}
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapNetworkAttrTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapNetworkAttrTaskFactory.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/MapNetworkAttrTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -1,57 +0,0 @@
-package org.cytoscape.task.table;
-
-import org.cytoscape.model.CyIdentifiable;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-public interface MapNetworkAttrTaskFactory extends TaskFactory {
-
- enum MappingType {
- CURRENT_LOCAL("Only to the current network"),
- CURRENT_SHARED("All networks related to current network"),
- ALL_SHARED("All networks"),
- INDEPENDENT("None (create Global Table w/o mapping)"),
- ;
-
- private final String desc;
- private MappingType(String desc) {
- this.desc = desc;
- }
- public String getDescription(){
- return desc;
- }
- public static MappingType fromDescription(String d) {
- for (MappingType m : values())
- if (m.getDescription().equals(d))
- return m;
- throw new IllegalArgumentException("String " + d + "
doesn't match a known description in MappingType");
- }
- }
- /**
- * This creates a task iterator that will take a specified table and
ask whether
- * the columns in the specified table should become virtual columns in
the node or
- * edge table of the current network, all networks, or no networks.
- * @param type The type of table to map to, either CyNode.class or
CyEdge.class.
- * @param newGlobalTable The table to be mapped.
- * @param mappingKey The column name in the existing table used to join
with the primary key in the new table.
- * @param mappingType The type of mapping to be performed.
- */
- TaskIterator createTaskIterator(final Class<? extends CyIdentifiable>
type,
- final CyTable newGlobalTable,
- String mappingKey,
- MappingType mappingType);
- /**
- * This creates a task iterator that will take a specified table and
ask whether
- * the columns in the specified table should become virtual columns in
the node or
- * edge table of the current network, all networks, or no networks.
The resulting
- * Task will prompt the user to determine which mapping type to choose
via the Tunable
- * user interface.
- * @param type The type of table to map to, either CyNode.class or
CyEdge.class.
- * @param newGlobalTable The table to be mapped.
- * @param mappingKey The column name in the existing table used to join
with the primary key in the new table.
- */
- TaskIterator createTaskIterator(final Class<? extends CyIdentifiable>
type,
- final CyTable newGlobalTable,
- String mappingKey);
-}
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/ApplyVisualStyleTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/ApplyVisualStyleTaskFactory.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/ApplyVisualStyleTaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -1,21 +0,0 @@
-package org.cytoscape.task.vizmap;
-
-import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.vizmap.VisualStyle;
-import org.cytoscape.work.TaskIterator;
-
-/**
- * This interface provides a task iterator for applying a visual style.
- * @CyAPI.Api.Interface
- */
-public interface ApplyVisualStyleTaskFactory extends NetworkViewTaskFactory{
-
- /**
- * Creates a task iterator for applying a visual style on a network
view.
- * @param networkView The network view to apply the visual style on.
- * @param style The visual styles to apply.
- * @return a task iterator of type {@link TaskIterator}.
- */
- TaskIterator createTaskIterator(final CyNetworkView networkView, final
VisualStyle style);
-}
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:05:04 UTC (rev 28998)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -66,8 +66,10 @@
import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -75,6 +77,7 @@
import org.cytoscape.task.hide.UnHideAllNodesTaskFactory;
import org.cytoscape.task.hide.UnHideAllTaskFactory;
import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
@@ -92,9 +95,6 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
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:05:04 UTC (rev 28998)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -55,8 +55,10 @@
import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -64,6 +66,7 @@
import org.cytoscape.task.hide.UnHideAllNodesTaskFactory;
import org.cytoscape.task.hide.UnHideAllTaskFactory;
import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.task.read.LoadTableFileTaskFactory;
@@ -83,9 +86,6 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
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:05:04 UTC (rev 28998)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -45,8 +45,10 @@
import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -54,6 +56,7 @@
import org.cytoscape.task.hide.UnHideAllNodesTaskFactory;
import org.cytoscape.task.hide.UnHideAllTaskFactory;
import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.task.read.LoadVizmapFileTaskFactory;
@@ -71,9 +74,6 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
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:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -49,8 +49,10 @@
import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.task.edit.RenameColumnTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
import org.cytoscape.task.hide.HideSelectedTaskFactory;
@@ -116,6 +118,7 @@
import org.cytoscape.task.internal.zoom.ZoomInTaskFactory;
import org.cytoscape.task.internal.zoom.ZoomOutTaskFactory;
import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.task.read.LoadTableFileTaskFactory;
@@ -135,9 +138,6 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.ExportCurrentTableTaskFactory;
import org.cytoscape.task.write.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -32,7 +32,7 @@
import org.cytoscape.group.CyGroupFactory;
import org.cytoscape.group.CyGroupManager;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.group.GroupNodesTaskFactory;
+import org.cytoscape.task.edit.GroupNodesTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -5,7 +5,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTask.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTask.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -16,8 +16,10 @@
import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.model.subnetwork.CyRootNetwork;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory.MappingType;
-import static org.cytoscape.task.table.MapNetworkAttrTaskFactory.MappingType.*;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory.MappingType;
+
+import static org.cytoscape.task.edit.MapNetworkAttrTaskFactory.MappingType.*;
+
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
Modified:
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:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapNetworkAttrTaskFactoryImpl.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -5,7 +5,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -4,7 +4,7 @@
import java.util.Map;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.vizmap.ApplyVisualStyleTaskFactory;
+import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -75,7 +75,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.CheckBoxJList;
import org.cytoscape.work.swing.DialogTaskManager;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -21,7 +21,7 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.osgi.framework.BundleContext;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -36,7 +36,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.model.events.TableAboutToBeDeletedEvent;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -20,7 +20,7 @@
import org.cytoscape.model.events.TableAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
+import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
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-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -34,7 +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.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.io.read.InputStreamTaskFactory;
import org.cytoscape.application.swing.CyAction;
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-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -16,7 +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.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.util.swing.FileUtil;
import org.cytoscape.io.util.StreamUtil;
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -41,7 +41,7 @@
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.osgi.framework.ServiceException;
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -11,7 +11,7 @@
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.service.util.AbstractCyActivator;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.osgi.framework.BundleContext;
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -21,7 +21,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskMonitor;
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -20,7 +20,7 @@
import org.osgi.framework.BundleContext;
import org.cytoscape.service.util.AbstractCyActivator;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import java.util.Properties;
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportClient.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportClient.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportClient.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -6,7 +6,7 @@
import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.webservice.ncbi.task.ImportTableFromNCBITask;
import org.cytoscape.work.TaskIterator;
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/task/ImportTableFromNCBITask.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/task/ImportTableFromNCBITask.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/task/ImportTableFromNCBITask.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -8,7 +8,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.webservice.ncbi.rest.EntrezRestClient;
import org.cytoscape.webservice.ncbi.ui.AnnotationCategory;
import org.cytoscape.work.AbstractTask;
Modified:
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
===================================================================
---
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -8,7 +8,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
Modified:
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CyActivator.java
===================================================================
---
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/CyActivator.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -10,7 +10,7 @@
import org.osgi.framework.BundleContext;
import org.cytoscape.service.util.AbstractCyActivator;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import java.util.Properties;
Modified:
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
===================================================================
---
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
2012-04-25 18:05:04 UTC (rev 28998)
+++
core3/samples/trunk/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
2012-04-25 18:08:31 UTC (rev 28999)
@@ -1,7 +1,7 @@
package org.cytoscape.sample.internal;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.task.table.MapNetworkAttrTaskFactory;
+import org.cytoscape.task.edit.MapNetworkAttrTaskFactory;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
--
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.
