Author: mes
Date: 2012-04-25 11:12:09 -0700 (Wed, 25 Apr 2012)
New Revision: 29000
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyVisualStyleTaskFactory.java
Removed:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/package-info.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/package-info.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/package-info.java
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyPreferredLayoutTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/package-info.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/layout/ApplyPreferredLayoutTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
Log:
more renaming and reorg
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/package-info.java
2012-04-25 18:08:31 UTC (rev 28999)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/group/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -1,6 +0,0 @@
-
-
-/**
- * This package includes an interface to create task factory for grouping
nodes.
- */
-package org.cytoscape.task.group;
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/package-info.java
2012-04-25 18:08:31 UTC (rev 28999)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/table/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -1,5 +0,0 @@
-
-/**
- * This package includes a set of interfaces for modifying, deleting and
mapping tables.
- */
-package org.cytoscape.task.table;
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyPreferredLayoutTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyPreferredLayoutTaskFactory.java
2012-04-25 17:43:19 UTC (rev 28992)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyPreferredLayoutTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -1,4 +1,4 @@
-package org.cytoscape.task.layout;
+package org.cytoscape.task.visualization;
import org.cytoscape.task.NetworkViewTaskFactory;
Copied:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyVisualStyleTaskFactory.java
(from rev 28999,
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/ApplyVisualStyleTaskFactory.java)
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyVisualStyleTaskFactory.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/ApplyVisualStyleTaskFactory.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -0,0 +1,21 @@
+package org.cytoscape.task.visualization;
+
+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/api/trunk/core-task-api/src/main/java/org/cytoscape/task/visualization/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/layout/package-info.java
2012-04-25 17:43:19 UTC (rev 28992)
+++
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)
@@ -4,4 +4,4 @@
* This package include an interface to create a task iterator for
* applying the preferred layout.
*/
-package org.cytoscape.task.layout;
\ No newline at end of file
+package org.cytoscape.task.visualization;
\ No newline at end of file
Deleted:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/package-info.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/package-info.java
2012-04-25 18:08:31 UTC (rev 28999)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/vizmap/package-info.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -1,5 +0,0 @@
-
-/**
- * This package includes an interface for applying visual styles on network
views.
- */
-package org.cytoscape.task.vizmap;
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:08:31 UTC (rev 28999)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -117,8 +117,6 @@
import org.cytoscape.task.internal.zoom.FitSelectedTaskFactory;
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;
@@ -138,6 +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.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/layout/ApplyPreferredLayoutTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-04-25 18:08:31 UTC (rev 28999)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -6,7 +6,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.property.CyProperty;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.layout.ApplyPreferredLayoutTaskFactory;
+import org.cytoscape.task.visualization.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/vizmap/ApplyVisualStyleTaskFactoryimpl.java
===================================================================
---
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)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTaskFactoryimpl.java
2012-04-25 18:12:09 UTC (rev 29000)
@@ -4,7 +4,7 @@
import java.util.Map;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.layout.ApplyVisualStyleTaskFactory;
+import org.cytoscape.task.visualization.ApplyVisualStyleTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
--
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.
