Author: kono
Date: 2011-04-05 19:13:55 -0700 (Tue, 05 Apr 2011)
New Revision: 24687
Added:
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
Removed:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRangeImpl.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/DiscreteRangeImpl.java
Modified:
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
core3/ding-presentation-impl/trunk/pom.xml
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/impl/visualproperty/ArrowShapeTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/IntegerTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
core3/dnd-api/trunk/pom.xml
core3/filter-impl/trunk/pom.xml
core3/manual-layout-impl/trunk/pom.xml
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
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/NodeShapeVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
core3/viewmodel-impl/trunk/pom.xml
core3/vizmap-impl/trunk/pom.xml
core3/work-swing-impl/trunk/pom.xml
Log:
Continuous and DiscreteRange interfaces are converted to concrete, public
classes.
Modified:
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -4,7 +4,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.ContinuousRangeImpl;
+import org.cytoscape.view.model.ContinuousRange;
import org.cytoscape.view.model.Range;
public class ColorVisualProperty extends AbstractVisualProperty<Color> {
@@ -12,7 +12,7 @@
private static final Color MIN_COLOR = new Color(0, 0, 0);
private static final Color MAX_COLOR = new Color(0xFF, 0xFF, 0xFF);
- private static final Range<Color> COLOR_RANGE = new
ContinuousRangeImpl<Color>(Color.class, MIN_COLOR, MAX_COLOR);
+ private static final Range<Color> COLOR_RANGE = new
ContinuousRange<Color>(Color.class, MIN_COLOR, MAX_COLOR);
public ColorVisualProperty(final Color defaultValue,
final String id, final String name) {
Modified: core3/ding-presentation-impl/trunk/pom.xml
===================================================================
--- core3/ding-presentation-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev
24686)
+++ core3/ding-presentation-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev
24687)
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>dnd-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha2-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-04-06 01:01:56 UTC (rev 24686)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -5,8 +5,12 @@
import org.cytoscape.view.model.DiscreteRange;
-public class CustomGraphicsRange implements DiscreteRange<CyCustomGraphics> {
+public class CustomGraphicsRange extends DiscreteRange<CyCustomGraphics> {
+ public CustomGraphicsRange() {
+ super(CyCustomGraphics.class, new HashSet<CyCustomGraphics>());
+ }
+
private CustomGraphicsManager manager;
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ArrowShapeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ArrowShapeTwoDVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ArrowShapeTwoDVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -42,7 +42,7 @@
import org.cytoscape.ding.ArrowShape;
import org.cytoscape.model.CyEdge;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
public class ArrowShapeTwoDVisualProperty extends
@@ -57,7 +57,7 @@
final Set<ArrowShape> arrowSet = new HashSet<ArrowShape>();
for (final ArrowShape arrow : ArrowShape.values())
arrowSet.add(arrow);
- ARROW_SHAPE_RANGE = new
DiscreteRangeImpl<ArrowShape>(ArrowShape.class,
+ ARROW_SHAPE_RANGE = new
DiscreteRange<ArrowShape>(ArrowShape.class,
arrowSet);
// We have to support Cytoscape 2.8 XGMML shapes!
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -40,7 +40,7 @@
import java.util.Set;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
public class FontTwoDVisualProperty extends AbstractVisualProperty<Font> {
@@ -55,7 +55,7 @@
for(Font f: allFonts)
fontSet.add(f.deriveFont(DEF_FONT_SIZE));
- FONT_RANGE = new DiscreteRangeImpl<Font>(Font.class,fontSet);
+ FONT_RANGE = new DiscreteRange<Font>(Font.class,fontSet);
}
public FontTwoDVisualProperty(final Font def, final String id,
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/IntegerTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/IntegerTwoDVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/IntegerTwoDVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -36,12 +36,12 @@
package org.cytoscape.ding.impl.visualproperty;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.ContinuousRangeImpl;
+import org.cytoscape.view.model.ContinuousRange;
import org.cytoscape.view.model.Range;
public class IntegerTwoDVisualProperty extends AbstractVisualProperty<Integer>
{
- private static final Range<Integer> INT_RANGE = new
ContinuousRangeImpl<Integer>(Integer.class, Integer.MIN_VALUE,
Integer.MAX_VALUE);
+ private static final Range<Integer> INT_RANGE = new
ContinuousRange<Integer>(Integer.class, Integer.MIN_VALUE, Integer.MAX_VALUE);
public IntegerTwoDVisualProperty(final Integer def, final String id,
final String name, final Class<?> targetDataType) {
super(def,INT_RANGE, id, name, targetDataType);
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -3,7 +3,7 @@
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.impl.ObjectPositionImpl;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.ContinuousRangeImpl;
+import org.cytoscape.view.model.ContinuousRange;
import org.cytoscape.view.model.Range;
public class ObjectPositionVisualProperty extends
AbstractVisualProperty<ObjectPosition> {
@@ -13,7 +13,7 @@
private static final ObjectPosition MIN_OBJECT =
ObjectPositionImpl.DEFAULT_POSITION;
static {
- OBJECT_POSITION_RANGE = new
ContinuousRangeImpl<ObjectPosition>(ObjectPosition.class, MIN_OBJECT,
MIN_OBJECT);
+ OBJECT_POSITION_RANGE = new
ContinuousRange<ObjectPosition>(ObjectPosition.class, MIN_OBJECT, MIN_OBJECT);
}
public ObjectPositionVisualProperty(ObjectPosition defaultValue,
Modified: core3/dnd-api/trunk/pom.xml
===================================================================
--- core3/dnd-api/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev 24686)
+++ core3/dnd-api/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev 24687)
@@ -93,12 +93,12 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: core3/filter-impl/trunk/pom.xml
===================================================================
--- core3/filter-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev 24686)
+++ core3/filter-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev 24687)
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: core3/manual-layout-impl/trunk/pom.xml
===================================================================
--- core3/manual-layout-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev
24686)
+++ core3/manual-layout-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev
24687)
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -39,7 +39,7 @@
import java.util.Set;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
public class BooleanVisualProperty extends AbstractVisualProperty<Boolean> {
@@ -50,7 +50,7 @@
final Set<Boolean> bRange = new HashSet<Boolean>();
bRange.add(true);
bRange.add(false);
- BOOLEAN_RANGE = new DiscreteRangeImpl<Boolean>(Boolean.class,
bRange);
+ BOOLEAN_RANGE = new DiscreteRange<Boolean>(Boolean.class,
bRange);
}
public BooleanVisualProperty(final Boolean def, final String id, final
String name, final Class<?> targetDataType) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -4,7 +4,7 @@
import java.util.Set;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
import org.cytoscape.view.model.Visualizable;
@@ -22,7 +22,7 @@
static {
final Set<Visualizable> vRange = new HashSet<Visualizable>();
- VISUALIZABLE_RANGE = new DiscreteRangeImpl<Visualizable>(
+ VISUALIZABLE_RANGE = new DiscreteRange<Visualizable>(
Visualizable.class, vRange);
}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -5,7 +5,7 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.presentation.property.values.LineType;
public class LineTypeVisualProperty extends AbstractVisualProperty<LineType> {
@@ -30,7 +30,7 @@
lineTypes.add(DASH_DOT);
lineTypes.add(DOT);
- LINE_TYPE_RANGE = new
DiscreteRangeImpl<LineType>(LineType.class, new HashSet<LineType>(lineTypes));
+ LINE_TYPE_RANGE = new DiscreteRange<LineType>(LineType.class,
new HashSet<LineType>(lineTypes));
}
public LineTypeVisualProperty(LineType defaultValue,
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-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/MinimalVisualLexicon.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -42,8 +42,8 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.ContinuousRangeImpl;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.ContinuousRange;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.NullDataType;
import org.cytoscape.view.model.Range;
import org.cytoscape.view.model.VisualProperty;
@@ -61,17 +61,17 @@
// TODO move these!
protected static final Color MIN_COLOR = new Color(0, 0, 0);
protected static final Color MAX_COLOR = new Color(0xFF, 0xFF, 0xFF);
- protected static final Range<Paint> PAINT_RANGE = new
ContinuousRangeImpl<Paint>(
+ protected static final Range<Paint> PAINT_RANGE = new
ContinuousRange<Paint>(
Paint.class, MIN_COLOR, MAX_COLOR);
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
DiscreteRangeImpl<String>(
+ protected static final Range<String> ARBITRARY_STRING_RANGE = new
DiscreteRange<String>(
String.class, STRING_SET);
- protected static final Range<Double> ARBITRARY_DOUBLE_RANGE = new
ContinuousRangeImpl<Double>(
+ protected static final Range<Double> ARBITRARY_DOUBLE_RANGE = new
ContinuousRange<Double>(
Double.class, Double.NEGATIVE_INFINITY,
Double.POSITIVE_INFINITY);
- protected static final Range<Double> NONE_ZERO_POSITIVE_DOUBLE_RANGE =
new ContinuousRangeImpl<Double>(
+ protected static final Range<Double> NONE_ZERO_POSITIVE_DOUBLE_RANGE =
new ContinuousRange<Double>(
Double.class, 0d, Double.POSITIVE_INFINITY, false,
true);
// Top level nodes has null as parent, and will be pointed by parent
node.
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -5,7 +5,7 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.presentation.property.values.NodeShape;
public final class NodeShapeVisualProperty extends
@@ -44,7 +44,7 @@
DEFAULT_SHAPES.add(HEXAGON);
DEFAULT_SHAPES.add(OCTAGON);
- NODE_SHAPE_RANGE = new
DiscreteRangeImpl<NodeShape>(NodeShape.class,
+ NODE_SHAPE_RANGE = new DiscreteRange<NodeShape>(NodeShape.class,
new HashSet<NodeShape>(DEFAULT_SHAPES));
}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -4,7 +4,7 @@
import java.util.Set;
import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.DiscreteRangeImpl;
+import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.NullDataType;
import org.cytoscape.view.model.Range;
@@ -20,7 +20,7 @@
static {
final Set<NullDataType> nRange = new HashSet<NullDataType>();
- NULL_RANGE = new DiscreteRangeImpl<NullDataType>(
+ NULL_RANGE = new DiscreteRange<NullDataType>(
NullDataType.class, nRange);
}
Deleted:
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-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -1,10 +0,0 @@
-package org.cytoscape.view.model;
-
-public interface ContinuousRange<T> extends Range<T> {
-
- T getMin();
- T getMax();
-
- boolean includeMin();
- boolean includeMax();
-}
Copied:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
(from rev 24640,
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRangeImpl.java)
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
(rev 0)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRange.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -0,0 +1,54 @@
+package org.cytoscape.view.model;
+
+public class ContinuousRange<T> implements Range<T> {
+
+ private final Class<T> type;
+
+ private final T min;
+ private final T max;
+
+ private final Boolean includeMin;
+ private final Boolean includeMax;
+
+ public ContinuousRange(final Class<T> type, final T min, final T max) {
+ this(type, min, max, true, true);
+ }
+
+ public ContinuousRange(final Class<T> type, final T min, final T max,
final Boolean includeMin, final Boolean includeMax) {
+ this.type = type;
+ this.min = min;
+ this.max = max;
+ this.includeMin = includeMin;
+ this.includeMax = includeMax;
+ }
+
+ @Override
+ public Class<T> getType() {
+ return type;
+ }
+
+ @Override
+ public boolean isDiscrete() {
+ return false;
+ }
+
+ public T getMin() {
+ return min;
+ }
+
+
+ public T getMax() {
+ return max;
+ }
+
+
+ public boolean includeMin() {
+ return includeMin;
+ }
+
+
+ public boolean includeMax() {
+ return includeMax;
+ }
+
+}
Deleted:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRangeImpl.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRangeImpl.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ContinuousRangeImpl.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -1,55 +0,0 @@
-package org.cytoscape.view.model;
-
-public final class ContinuousRangeImpl<T> implements ContinuousRange<T> {
-
- private final Class<T> type;
-
- private final T min;
- private final T max;
-
- private final Boolean includeMin;
- private final Boolean includeMax;
-
- public ContinuousRangeImpl(final Class<T> type, final T min, final T
max) {
- this(type, min, max, true, true);
- }
-
- public ContinuousRangeImpl(final Class<T> type, final T min, final T
max, final Boolean includeMin, final Boolean includeMax) {
- this.type = type;
- this.min = min;
- this.max = max;
- this.includeMin = includeMin;
- this.includeMax = includeMax;
- }
-
- @Override
- public Class<T> getType() {
- return type;
- }
-
- @Override
- public boolean isDiscrete() {
- return false;
- }
-
- @Override
- public T getMin() {
- return min;
- }
-
- @Override
- public T getMax() {
- return max;
- }
-
- @Override
- public boolean includeMin() {
- return includeMin;
- }
-
- @Override
- public boolean includeMax() {
- return includeMax;
- }
-
-}
Deleted:
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-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -1,24 +0,0 @@
-package org.cytoscape.view.model;
-
-import java.util.Set;
-
-public interface DiscreteRange<T> extends Range<T> {
-
- /**
- * Returns all available values in this type of data.
- * For example, if T is NodeShape, this method returns all types of
node shape,
- * such as oval, triangle, rectangle, etc.
- *
- * @return All available values of the type T.
- *
- */
- Set<T> values();
-
-
- /**
- * Add a new range value.
- *
- * @param newValue new range value.
- */
- void addRangeValue(T newValue);
-}
Copied:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
(from rev 24669,
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRangeImpl.java)
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
(rev 0)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRange.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -0,0 +1,35 @@
+package org.cytoscape.view.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class DiscreteRange<T> implements Range<T> {
+
+ private final Class<T> type;
+ private final Set<T> values;
+
+ public DiscreteRange(final Class<T> type, final Set<T> values) {
+ this.type = type;
+ this.values = values;
+ }
+
+ @Override
+ public Class<T> getType() {
+ return type;
+ }
+
+ @Override
+ public boolean isDiscrete() {
+ return true;
+ }
+
+ public Set<T> values() {
+ // This is immutable to prevent add/remove operation by 3rd
party developers.
+ return Collections.unmodifiableSet(values);
+ }
+
+ public void addRangeValue(final T newValue) {
+ values.add(newValue);
+ }
+
+}
Deleted:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRangeImpl.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRangeImpl.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/DiscreteRangeImpl.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -1,37 +0,0 @@
-package org.cytoscape.view.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public final class DiscreteRangeImpl<T> implements DiscreteRange<T> {
-
- private final Class<T> type;
- private final Set<T> values;
-
- public DiscreteRangeImpl(final Class<T> type, final Set<T> values) {
- this.type = type;
- this.values = values;
- }
-
- @Override
- public Class<T> getType() {
- return type;
- }
-
- @Override
- public boolean isDiscrete() {
- return true;
- }
-
- @Override
- public Set<T> values() {
- // This is immutable to prevent add/remove operation by 3rd
party developers.
- return Collections.unmodifiableSet(values);
- }
-
- @Override
- public void addRangeValue(final T newValue) {
- values.add(newValue);
- }
-
-}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -19,7 +19,7 @@
final Set<DummyObject> dummySet = new HashSet<DummyObject>();
dummySet.add(new DummyObject());
- range = new DiscreteRangeImpl<DummyObject>(DummyObject.class,
dummySet);
+ range = new DiscreteRange<DummyObject>(DummyObject.class,
dummySet);
ignore = false;
vp = new DummyVisualProperty(defaultVal, id, displayName,
range);
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -40,7 +40,7 @@
class IntegerVisualProperty extends AbstractVisualProperty<Integer> {
- private static final ContinuousRange<Integer> cRange = new
ContinuousRangeImpl<Integer>(Integer.class, -10, 10);
+ private static final ContinuousRange<Integer> cRange = new
ContinuousRange<Integer>(Integer.class, -10, 10);
public IntegerVisualProperty() {
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -13,7 +13,7 @@
static {
final Set<String> valSet = new HashSet<String>();
valSet.add("Foo");
- sRange = new DiscreteRangeImpl<String>(String.class, valSet);
+ sRange = new DiscreteRange<String>(String.class, valSet);
}
public StringVisualProperty() {
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
2011-04-06 01:01:56 UTC (rev 24686)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
2011-04-06 02:13:55 UTC (rev 24687)
@@ -26,7 +26,7 @@
public void setUp() throws Exception {
final Set<DummyObject> dummySet = new HashSet<DummyObject>();
dummySet.add(new DummyObject());
- DiscreteRangeImpl<DummyObject> range = new
DiscreteRangeImpl<DummyObject>(DummyObject.class, dummySet);
+ DiscreteRange<DummyObject> range = new
DiscreteRange<DummyObject>(DummyObject.class, dummySet);
vp1 = new DummyVisualProperty(new DummyObject(), "dummy",
"Dummy Visual Property", range);
vp2 = new IntegerVisualProperty();
vp3 = new StringVisualProperty();
Modified: core3/viewmodel-impl/trunk/pom.xml
===================================================================
--- core3/viewmodel-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev 24686)
+++ core3/viewmodel-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev 24687)
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: core3/vizmap-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev 24686)
+++ core3/vizmap-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev 24687)
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: core3/work-swing-impl/trunk/pom.xml
===================================================================
--- core3/work-swing-impl/trunk/pom.xml 2011-04-06 01:01:56 UTC (rev 24686)
+++ core3/work-swing-impl/trunk/pom.xml 2011-04-06 02:13:55 UTC (rev 24687)
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
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.
