Author: ruschein
Date: 2011-07-01 16:16:27 -0700 (Fri, 01 Jul 2011)
New Revision: 26006
Modified:
core3/layout-cytoscape-impl/trunk/pom.xml
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/StackedNodeLayout.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/circularLayout/CircularLayoutAlgorithm.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/AttributeCircleLayout.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/ISOMLayout.java
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
Log:
Updated to track changes in work-api.
Modified: core3/layout-cytoscape-impl/trunk/pom.xml
===================================================================
--- core3/layout-cytoscape-impl/trunk/pom.xml 2011-07-01 23:06:07 UTC (rev
26005)
+++ core3/layout-cytoscape-impl/trunk/pom.xml 2011-07-01 23:16:27 UTC (rev
26006)
@@ -78,6 +78,11 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>work-api</artifactId>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/StackedNodeLayout.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/StackedNodeLayout.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/StackedNodeLayout.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -32,6 +32,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -55,9 +56,9 @@
* @param y_start_position the y starting position for the stack
*/
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
/**
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -41,6 +41,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -136,8 +137,8 @@
temperature, nIterations, supportWeights,
singlePartition));
}
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
}
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -36,6 +36,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -98,8 +99,8 @@
m_anticollisionSpringStrength, supportWeights,
singlePartition));
}
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
}
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/circularLayout/CircularLayoutAlgorithm.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/circularLayout/CircularLayoutAlgorithm.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/circularLayout/CircularLayoutAlgorithm.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -5,6 +5,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -32,9 +33,9 @@
super(un, "circular", "Circular Layout", false);
}
- //TODO how to validate these values?
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override //TODO how to validate these values?
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/AttributeCircleLayout.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/AttributeCircleLayout.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/AttributeCircleLayout.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -43,6 +43,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.work.util.ListSingleSelection;
@@ -83,8 +84,8 @@
}
@Override
- public boolean tunablesAreValid(final Appendable errMsg) {
- return attribute.length() > 0 && spacing > 0.0;
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return attribute.length() > 0 && spacing > 0.0 ?
ValidationState.OK : ValidationState.INVALID;
}
@Override
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -17,6 +17,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -35,9 +36,9 @@
this.tableMgr = tableMgr;
}
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
public TaskIterator getTaskIterator() {
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/ISOMLayout.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/ISOMLayout.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/ISOMLayout.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -3,6 +3,7 @@
*/
package csplugins.layout.algorithms.graphPartition;
+
import java.util.Iterator;
//import java.util.List;
@@ -10,11 +11,10 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
-/**
- *
- */
+
public class ISOMLayout extends AbstractLayoutAlgorithm implements
TunableValidator {
@Tunable(description="Number of iterations")
public int maxEpoch = 5000;
@@ -42,9 +42,9 @@
super(undoSupport,"isom", "Inverted Self-Organizing Map
Layout", true);
}
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
public TaskIterator getTaskIterator() {
Modified:
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
===================================================================
---
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
2011-07-01 23:06:07 UTC (rev 26005)
+++
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
2011-07-01 23:16:27 UTC (rev 26006)
@@ -44,6 +44,7 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.undo.UndoSupport;
@@ -95,9 +96,9 @@
super(undoSupport, "hierarchical", "Hierarchical Layout",true);
}
- // TODO
- public boolean tunablesAreValid(final Appendable errMsg) {
- return true;
+ @Override // TODO
+ public ValidationState getValidationState(final Appendable errMsg) {
+ return ValidationState.OK;
}
public TaskIterator getTaskIterator() {
--
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.
