Author: ruschein
Date: 2011-07-01 16:21:08 -0700 (Fri, 01 Jul 2011)
New Revision: 26009
Modified:
core3/layout-prefuse-impl/trunk/pom.xml
core3/layout-prefuse-impl/trunk/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
Log:
Updated to track changes in work-api.
Modified: core3/layout-prefuse-impl/trunk/pom.xml
===================================================================
--- core3/layout-prefuse-impl/trunk/pom.xml 2011-07-01 23:20:53 UTC (rev
26008)
+++ core3/layout-prefuse-impl/trunk/pom.xml 2011-07-01 23:21:08 UTC (rev
26009)
@@ -78,22 +78,26 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>model-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>layout-api</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>prefuse</artifactId>
- <version>20071021</version>
- </dependency>
- </dependencies>
-
+ <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>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>layout-api</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>prefuse</artifactId>
+ <version>20071021</version>
+ </dependency>
+ </dependencies>
</project>
Modified:
core3/layout-prefuse-impl/trunk/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
===================================================================
---
core3/layout-prefuse-impl/trunk/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
2011-07-01 23:20:53 UTC (rev 26008)
+++
core3/layout-prefuse-impl/trunk/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
2011-07-01 23:21:08 UTC (rev 26009)
@@ -1,5 +1,6 @@
package org.cytoscape.prefuse.layouts.internal;
+
import java.io.IOException;
import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
@@ -7,6 +8,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;
@@ -15,6 +17,7 @@
import prefuse.util.force.Integrator;
import org.cytoscape.work.util.ListSingleSelection;
+
public class ForceDirectedLayout extends AbstractLayoutAlgorithm implements
TunableValidator {
@Tunable(description="Number of Iterations", groups="Algorithm
settings")
public int numIterations = 100;
@@ -54,9 +57,11 @@
super(un, "force-directed", "Force Directed Layout", true);
}
- public boolean tunablesAreValid(final Appendable errMsg) {
+ @Override
+ public ValidationState getValidationState(final Appendable errMsg) {
return isPositive(numIterations) &&
isPositive(defaultSpringCoefficient)
- && isPositive(defaultSpringLength) &&
isPositive(defaultNodeMass);
+ && isPositive(defaultSpringLength) &&
isPositive(defaultNodeMass)
+ ? ValidationState.OK : ValidationState.INVALID;
}
private static boolean isPositive(final int n) {
--
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.
