Author: aaime
Date: 2009-11-03 05:08:21 -0500 (Tue, 03 Nov 2009)
New Revision: 34308
Modified:
branches/2.6.x/modules/library/main/
branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/RasterSymbolizerImpl.java
branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/visitor/DuplicatingStyleVisitor.java
branches/2.6.x/modules/library/main/src/test/java/org/geotools/styling/visitor/DuplicatorStyleVisitorTest.java
Log:
GEOT-2819, Duplication of ColorMapEntry broken AND RasterSymbolizerImpl default property name is 'raster' instead of 'geom'
Property changes on: branches/2.6.x/modules/library/main
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5.x/modules/library:33415
/branches/2.5.x/modules/library/main:33331,33335,33340,33415,33601,33603,33614,33682,33788
/branches/2.5.x/modules/library/main/main:33331
/trunk/modules/library/main:34279
+ /branches/2.5.x/modules/library:33415
/branches/2.5.x/modules/library/main:33331,33335,33340,33415,33601,33603,33614,33682,33788
/branches/2.5.x/modules/library/main/main:33331
/trunk/modules/library/main:34279,34307
Modified: branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/RasterSymbolizerImpl.java
===================================================================
--- branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/RasterSymbolizerImpl.java 2009-11-03 09:56:47 UTC (rev 34307)
+++ branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/RasterSymbolizerImpl.java 2009-11-03 10:08:21 UTC (rev 34308)
@@ -49,7 +49,7 @@
private ColorMapImpl colorMap = new ColorMapImpl();
private ContrastEnhancementImpl contrastEnhancement = new ContrastEnhancementImpl();
private ShadedReliefImpl shadedRelief = new ShadedReliefImpl();
- private String geometryName = "raster";
+ private String geometryName = "geom";
private Symbolizer symbolizer;
private Expression opacity;
private Expression overlap;
Modified: branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/visitor/DuplicatingStyleVisitor.java
===================================================================
--- branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/visitor/DuplicatingStyleVisitor.java 2009-11-03 09:56:47 UTC (rev 34307)
+++ branches/2.6.x/modules/library/main/src/main/java/org/geotools/styling/visitor/DuplicatingStyleVisitor.java 2009-11-03 10:08:21 UTC (rev 34308)
@@ -984,7 +984,7 @@
copy.setColor(copy(colorMapEntry.getColor()));
copy.setLabel(colorMapEntry.getLabel());
copy.setOpacity(copy(colorMapEntry.getOpacity()));
- copy.setQuantity(copy.getQuantity());
+ copy.setQuantity(colorMapEntry.getQuantity());
if (STRICT && !copy.equals(colorMapEntry)) {
throw new IllegalStateException("Was unable to duplicate provided ColorMapEntry:" + colorMapEntry);
Modified: branches/2.6.x/modules/library/main/src/test/java/org/geotools/styling/visitor/DuplicatorStyleVisitorTest.java
===================================================================
--- branches/2.6.x/modules/library/main/src/test/java/org/geotools/styling/visitor/DuplicatorStyleVisitorTest.java 2009-11-03 09:56:47 UTC (rev 34307)
+++ branches/2.6.x/modules/library/main/src/test/java/org/geotools/styling/visitor/DuplicatorStyleVisitorTest.java 2009-11-03 10:08:21 UTC (rev 34308)
@@ -16,6 +16,7 @@
*/
package org.geotools.styling.visitor;
+import java.awt.Color;
import java.net.URL;
import java.util.Collections;
@@ -27,6 +28,7 @@
import org.geotools.filter.IllegalFilterException;
import org.geotools.resources.Utilities;
import org.geotools.styling.AnchorPoint;
+import org.geotools.styling.ColorMapEntry;
import org.geotools.styling.Displacement;
import org.geotools.styling.ExternalGraphic;
import org.geotools.styling.FeatureTypeConstraint;
@@ -600,4 +602,26 @@
assertTrue("Equal objects should return equal hashcodes",controlEqHash == testHash);
}
+ public void testColorMapEntryDuplication() throws Exception {
+
+ ColorMapEntry cme = sf.createColorMapEntry();
+ cme.setColor(sb.colorExpression(Color.YELLOW));
+ cme.setLabel("thelabel");
+ cme.setQuantity(sb.literalExpression(66.66));
+ cme.setOpacity(sb.literalExpression(0.77));
+
+ cme.accept(visitor);
+
+ ColorMapEntry cme2 = (ColorMapEntry) visitor.getCopy();
+
+ assertEquals("Colormaps LABEL must be equal after duplication ", cme.getLabel(), cme2
+ .getLabel());
+ assertEquals("Colormaps QUANTITY must be equal after duplication ", cme.getQuantity(), cme2
+ .getQuantity());
+ assertEquals("Colormaps COLOR must be equal after duplication ", cme.getColor(), cme2
+ .getColor());
+ assertEquals("Colormaps OPACITY must be equal after duplication ", cme.getOpacity(), cme2
+ .getOpacity());
+ }
+
}
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference_______________________________________________
GeoTools-commits mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-commits
