Author: kono
Date: 2011-06-10 10:42:13 -0700 (Fri, 10 Jun 2011)
New Revision: 25710
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Range.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/ContinuousRangeTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DiscreteRangeTest.java
core3/vizmap-gui-impl/trunk/pom.xml
Log:
validate() method had been renamed to inRange()
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -61,7 +61,7 @@
FONT_RANGE = new DiscreteRange<Font>(Font.class, fontSet) {
// Takes any String as valid value.
- @Override public boolean validate(Font value) {
+ @Override public boolean inRange(Font value) {
return true;
}
};
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -69,7 +69,7 @@
protected static final Range<String> ARBITRARY_STRING_RANGE = new
DiscreteRange<String>(
String.class, STRING_SET) {
// Takes any String as valid value.
- @Override public boolean validate(String value) {
+ @Override public boolean inRange(String value) {
return true;
}
};
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -49,7 +49,7 @@
}
@Override
- public boolean validate(T value) {
+ public boolean inRange(T value) {
// By default, treat T as number. Otherwise, it should be
implemented by developer.
if(value instanceof Number && min instanceof Number && max
instanceof Number) {
return validateNumber((Number)value, (Number)min,
(Number)max);
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -33,7 +33,7 @@
}
@Override
- public boolean validate(T value) {
+ public boolean inRange(T value) {
if(values.contains(value))
return true;
else
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Range.java
===================================================================
--- core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Range.java
2011-06-10 16:10:56 UTC (rev 25709)
+++ core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Range.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -27,5 +27,5 @@
*
* @return true if the given value is in the range.
*/
- boolean validate(final T value);
+ boolean inRange(final T value);
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/ContinuousRangeTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/ContinuousRangeTest.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/ContinuousRangeTest.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -14,28 +14,28 @@
@Test
public void testContinuousNumberRange() {
final ContinuousRange<Double> range1 = new
ContinuousRange<Double>(Double.class, 0.0d, 100.0d, true, true);
- assertTrue(range1.validate(3.0));
- assertTrue(range1.validate(0.0));
- assertTrue(range1.validate(100.0));
- assertFalse(range1.validate(200.0));
- assertFalse(range1.validate(100.001));
- assertFalse(range1.validate(-1.2));
+ assertTrue(range1.inRange(3.0));
+ assertTrue(range1.inRange(0.0));
+ assertTrue(range1.inRange(100.0));
+ assertFalse(range1.inRange(200.0));
+ assertFalse(range1.inRange(100.001));
+ assertFalse(range1.inRange(-1.2));
final ContinuousRange<Double> range2 = new
ContinuousRange<Double>(Double.class, 0.0d, 100.0d, false, false);
- assertFalse(range2.validate(0.0));
- assertFalse(range2.validate(100.0));
+ assertFalse(range2.inRange(0.0));
+ assertFalse(range2.inRange(100.0));
final ContinuousRange<Double> range3 = new
ContinuousRange<Double>(Double.class, 0.0d, 100.0d, false, true);
- assertFalse(range3.validate(0.0));
- assertTrue(range3.validate(100.0));
+ assertFalse(range3.inRange(0.0));
+ assertTrue(range3.inRange(100.0));
final ContinuousRange<Double> range4 = new
ContinuousRange<Double>(Double.class, 0.0d, 100.0d, true, false);
- assertTrue(range4.validate(0.0));
- assertFalse(range4.validate(100.0));
+ assertTrue(range4.inRange(0.0));
+ assertFalse(range4.inRange(100.0));
final ContinuousRange<Color> colorRange = new
ContinuousRange<Color>(Color.class, Color.BLACK, Color.yellow, false, false);
// Need to define its own validator
- assertTrue(colorRange.validate(new Color(10, 100, 10)));
+ assertTrue(colorRange.inRange(new Color(10, 100, 10)));
}
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DiscreteRangeTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DiscreteRangeTest.java
2011-06-10 16:10:56 UTC (rev 25709)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DiscreteRangeTest.java
2011-06-10 17:42:13 UTC (rev 25710)
@@ -25,17 +25,17 @@
final DiscreteRange<String> range1 = new
DiscreteRange<String>(String.class, rangeValues);
assertEquals(6, range1.values().size());
- assertTrue(range1.validate("a"));
- assertTrue(range1.validate("b"));
- assertTrue(range1.validate("c"));
- assertTrue(range1.validate("d"));
- assertTrue(range1.validate("e"));
- assertFalse(range1.validate("f"));
- assertTrue(range1.validate("foo"));
+ assertTrue(range1.inRange("a"));
+ assertTrue(range1.inRange("b"));
+ assertTrue(range1.inRange("c"));
+ assertTrue(range1.inRange("d"));
+ assertTrue(range1.inRange("e"));
+ assertFalse(range1.inRange("f"));
+ assertTrue(range1.inRange("foo"));
range1.addRangeValue("f");
assertEquals(7, range1.values().size());
- assertTrue(range1.validate("f"));
+ assertTrue(range1.inRange("f"));
}
Modified: core3/vizmap-gui-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-gui-impl/trunk/pom.xml 2011-06-10 16:10:56 UTC (rev 25709)
+++ core3/vizmap-gui-impl/trunk/pom.xml 2011-06-10 17:42:13 UTC (rev 25710)
@@ -113,29 +113,29 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>default-mappings</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>service-util</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<!-- Wrapped 3rd party libraries -->
--
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.
