Author: kono
Date: 2011-06-09 18:36:41 -0700 (Thu, 09 Jun 2011)
New Revision: 25703
Modified:
core3/ding-customgraphics-manager-impl/trunk/pom.xml
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
Log:
Fixed wrong range values. String range accepts all text values.
Modified: core3/ding-customgraphics-manager-impl/trunk/pom.xml
===================================================================
--- core3/ding-customgraphics-manager-impl/trunk/pom.xml 2011-06-10
01:15:45 UTC (rev 25702)
+++ core3/ding-customgraphics-manager-impl/trunk/pom.xml 2011-06-10
01:36:41 UTC (rev 25703)
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>ding-presentation-impl</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
2011-06-10 01:15:45 UTC (rev 25702)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
2011-06-10 01:36:41 UTC (rev 25703)
@@ -36,8 +36,7 @@
@Override
public void addRangeValue(CyCustomGraphics newValue) {
- // TODO Auto-generated method stub
-
+ manager.addCustomGraphics(newValue, null);
}
}
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 01:15:45 UTC (rev 25702)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
2011-06-10 01:36:41 UTC (rev 25703)
@@ -67,7 +67,12 @@
protected static final Set<String> STRING_SET = new HashSet<String>();
// This will be used to for String VP which accepts any string values.
protected static final Range<String> ARBITRARY_STRING_RANGE = new
DiscreteRange<String>(
- String.class, STRING_SET);
+ String.class, STRING_SET) {
+ // Takes any String as valid value.
+ @Override public boolean validate(String value) {
+ return true;
+ }
+ };
protected static final Range<Double> ARBITRARY_DOUBLE_RANGE = new
ContinuousRange<Double>(
Double.class, Double.NEGATIVE_INFINITY,
Double.POSITIVE_INFINITY, true, true);
--
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.
