Author: mes
Date: 2012-04-25 11:16:19 -0700 (Wed, 25 Apr 2012)
New Revision: 29002
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/
Removed:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CloneNetworkTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CreateNetworkViewTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewEmptyNetworkViewFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesAndEdgesTaskFatory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesOnlyTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewSessionTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/package-info.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteColumnTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteSelectedNodesAndEdgesTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteTableTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkViewTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/package-info.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyPreferredLayoutTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyVisualStyleTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/package-info.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/creation/CloneNetworkTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/NewSessionTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTask.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTaskFactory.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/NetworkMergeAction.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.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
Log:
final package renames 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:13:18 UTC (rev 29001)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -34,13 +34,13 @@
import org.cytoscape.work.swing.PanelTaskManager;
import org.cytoscape.work.swing.SubmenuTaskManager;
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.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;
@@ -66,18 +66,18 @@
import org.cytoscape.task.hide.UnHideAllTaskFactory;
import org.cytoscape.task.hide.UnHideAllNodesTaskFactory;
import org.cytoscape.task.hide.UnHideAllEdgesTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CloneNetworkTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/CloneNetworkTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CloneNetworkTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.task.NetworkTaskFactory;
/**
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CreateNetworkViewTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/CreateNetworkViewTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/CreateNetworkViewTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,5 +1,5 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.task.NetworkTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewEmptyNetworkViewFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/NewEmptyNetworkViewFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewEmptyNetworkViewFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesAndEdgesTaskFatory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/NewNetworkSelectedNodesAndEdgesTaskFatory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesAndEdgesTaskFatory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.task.NetworkTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesOnlyTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/NewNetworkSelectedNodesOnlyTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewNetworkSelectedNodesOnlyTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.task.NetworkTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewSessionTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/NewSessionTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/NewSessionTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
import org.cytoscape.work.TaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/creation/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/create/package-info.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -2,4 +2,4 @@
* This package provides a variety of interfaces for creating task iterators
* for creating new networks and network views.
*/
-package org.cytoscape.task.creation;
+package org.cytoscape.task.create;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteColumnTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/DeleteColumnTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteColumnTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
import org.cytoscape.task.TableColumnTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteSelectedNodesAndEdgesTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/DeleteSelectedNodesAndEdgesTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteSelectedNodesAndEdgesTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
import org.cytoscape.task.NetworkTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteTableTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/DeleteTableTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DeleteTableTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
import org.cytoscape.task.TableTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/DestroyNetworkTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
import org.cytoscape.task.NetworkCollectionTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkViewTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/DestroyNetworkViewTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/DestroyNetworkViewTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destruction/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/destroy/package-info.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -2,4 +2,4 @@
* This package includes a set of interfaces for creating task iterators
* for destroying networks and network views.
*/
-package org.cytoscape.task.destruction;
+package org.cytoscape.task.destroy;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyPreferredLayoutTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyPreferredLayoutTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyPreferredLayoutTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.visualization;
+package org.cytoscape.task.visualize;
import org.cytoscape.task.NetworkViewTaskFactory;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyVisualStyleTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyVisualStyleTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/ApplyVisualStyleTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.visualization;
+package org.cytoscape.task.visualize;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualize/package-info.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -4,4 +4,4 @@
* This package include an interface to create a task iterator for
* applying the preferred layout.
*/
-package org.cytoscape.task.visualization;
\ No newline at end of file
+package org.cytoscape.task.visualize;
\ No newline at end of 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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -53,17 +53,17 @@
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
@@ -76,8 +76,6 @@
import org.cytoscape.task.hide.UnHideAllEdgesTaskFactory;
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;
@@ -95,6 +93,8 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
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.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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -42,17 +42,17 @@
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
@@ -65,8 +65,6 @@
import org.cytoscape.task.hide.UnHideAllEdgesTaskFactory;
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;
@@ -86,6 +84,8 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
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.ExportNetworkImageTaskFactory;
import org.cytoscape.task.write.ExportNetworkViewTaskFactory;
@@ -113,8 +113,6 @@
import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.work.util.BoundedDouble;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -32,17 +32,17 @@
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.TableCellTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
@@ -55,8 +55,6 @@
import org.cytoscape.task.hide.UnHideAllEdgesTaskFactory;
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;
@@ -74,6 +72,8 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
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.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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -36,17 +36,17 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.task.edit.ConnectSelectedNodesTaskFactory;
import org.cytoscape.task.edit.EditNetworkTitleTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
@@ -136,8 +136,8 @@
import org.cytoscape.task.select.SelectFirstNeighborsNodeViewTaskFactory;
import org.cytoscape.task.select.SelectFirstNeighborsTaskFactory;
import org.cytoscape.task.select.SelectFromFileListTaskFactory;
-import org.cytoscape.task.visualization.ApplyPreferredLayoutTaskFactory;
-import org.cytoscape.task.visualization.ApplyVisualStyleTaskFactory;
+import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.visualize.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/creation/CloneNetworkTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -35,7 +35,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTaskFactory;
-import org.cytoscape.task.creation.CloneNetworkTaskFactory;
+import org.cytoscape.task.create.CloneNetworkTaskFactory;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -33,7 +33,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.task.AbstractNetworkTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -33,7 +33,7 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
-import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
+import org.cytoscape.task.create.NewEmptyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -37,7 +37,7 @@
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTaskFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -37,8 +37,8 @@
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTaskFactory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesAndEdgesTaskFatory;
-import org.cytoscape.task.creation.NewNetworkSelectedNodesOnlyTaskFactory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesAndEdgesTaskFatory;
+import org.cytoscape.task.create.NewNetworkSelectedNodesOnlyTaskFactory;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -35,7 +35,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.task.AbstractNetworkCollectionTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkTaskFactory;
import org.cytoscape.work.TaskIterator;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -33,7 +33,7 @@
import java.util.Collection;
import org.cytoscape.task.AbstractNetworkViewCollectionTaskFactory;
-import org.cytoscape.task.destruction.DestroyNetworkViewTaskFactory;
+import org.cytoscape.task.destroy.DestroyNetworkViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskIterator;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -6,7 +6,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.property.CyProperty;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.visualization.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
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/networkobjects/DeleteSelectedNodesAndEdgesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -32,7 +32,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.task.destruction.DeleteSelectedNodesAndEdgesTaskFactory;
+import org.cytoscape.task.destroy.DeleteSelectedNodesAndEdgesTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.model.CyNetwork;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/NewSessionTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/NewSessionTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/NewSessionTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -34,7 +34,7 @@
import java.util.Map;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.task.creation.NewSessionTaskFactory;
+import org.cytoscape.task.create.NewSessionTaskFactory;
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/DeleteColumnTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -30,7 +30,7 @@
import org.cytoscape.model.CyColumn;
import org.cytoscape.task.AbstractTableColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteColumnTaskFactory;
+import org.cytoscape.task.destroy.DeleteColumnTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.undo.UndoSupport;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableTaskFactoryImpl.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableTaskFactoryImpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -31,7 +31,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.task.AbstractTableTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
import org.cytoscape.work.TaskIterator;
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -4,7 +4,7 @@
import java.util.Map;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.visualization.ApplyVisualStyleTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -12,7 +12,7 @@
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.osgi.framework.BundleContext;
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTask.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTask.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTask.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -7,7 +7,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.task.AbstractNodeViewTask;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTaskFactory.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTaskFactory.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/GoToNestedNetworkTaskFactory.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -5,7 +5,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.task.AbstractNodeViewTaskFactory;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -11,7 +11,7 @@
import org.cytoscape.network.merge.internal.NetworkMergeAction;
import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.osgi.framework.BundleContext;
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/NetworkMergeAction.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/NetworkMergeAction.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/NetworkMergeAction.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -44,7 +44,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.work.TaskManager;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import java.awt.event.ActionEvent;
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -15,7 +15,7 @@
import org.cytoscape.network.merge.internal.util.AttributeValueMatcher;
import org.cytoscape.network.merge.internal.util.DefaultAttributeMerger;
import org.cytoscape.network.merge.internal.util.DefaultAttributeValueMatcher;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-04-25 18:13:18 UTC (rev 29001)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -98,7 +98,7 @@
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.task.creation.CreateNetworkViewTaskFactory;
+import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
/**
*
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -74,7 +74,7 @@
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -20,7 +20,7 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -35,7 +35,7 @@
import org.cytoscape.model.events.NetworkAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
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:13:18 UTC (rev 29001)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-04-25 18:16:19 UTC (rev 29002)
@@ -19,7 +19,7 @@
import org.cytoscape.model.events.TableAddedEvent;
import org.cytoscape.model.events.TableAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.task.destruction.DeleteTableTaskFactory;
+import org.cytoscape.task.destroy.DeleteTableTaskFactory;
import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
--
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.
