Code modified by this commit has changed again. The InternationalString
arguments
have been replaced by CharSequence
arguments, and the handling of them modified.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10874 https://svn.osgeo.org/geotools/trunk/modules/library/coverage/src/main/java/org/geotools/coverage/GridSampleDimension.java
Revision 10795 | Revision 10874 |
---|---|
/*
* Geotools 2 - OpenSource mapping toolkit
* (C) 2003, Geotools Project Management Committee (PMC)
* (C) 2001, Institut de Recherche pour le Développement
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public |
/*
* Geotools 2 - OpenSource mapping toolkit
* (C) 2003, Geotools Project Management Committee (PMC)
* (C) 2001, Institut de Recherche pour le D�veloppement
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public |
// J2SE dependencies import java.awt.Color; import java.util.List; import java.util.Locale; import java.util.Arrays; import java.util.ArrayList; import java.io.Serializable; import java.awt.color.ColorSpace; import java.awt.image.ColorModel; import java.awt.image.DataBuffer; import java.awt.image.SampleModel; import java.awt.image.RenderedImage; // For Javadoc import java.awt.image.IndexColorModel; // J2SE extensions import javax.units.Unit; import javax.media.jai.JAI; import javax.media.jai.util.Range; // OpenGIS dependencies import org.opengis.util.InternationalString; import org.opengis.coverage.SampleDimensionType; import org.opengis.coverage.ColorInterpretation; import org.opengis.coverage.PaletteInterpretation; import org.opengis.coverage.MetadataNameNotFoundException; import org.opengis.referencing.operation.MathTransform1D; import org.opengis.referencing.operation.TransformException; // Geotools dependencies import org.geotools.util.SimpleInternationalString; import org.geotools.util.NumberRange; import org.geotools.resources.XMath; import org.geotools.resources.XArray; import org.geotools.resources.Utilities; import org.geotools.resources.ClassChanger; import org.geotools.resources.gcs.Resources; import org.geotools.resources.gcs.ResourceKeys; import org.geotools.resources.image.ColorUtilities; import org.geotools.referencing.operation.transform.LinearTransform1D; /** * Describes the data values for a coverage. For a grid coverage a sample dimension is a band. * Sample values in a band may be organized in categories. This <code>SampleDimension</code> |
// J2SE dependencies import java.awt.Color; import java.awt.color.ColorSpace; import java.awt.image.ColorModel; import java.awt.image.DataBuffer; import java.awt.image.IndexColorModel; import java.awt.image.RenderedImage; import java.awt.image.SampleModel; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; import javax.media.jai.JAI; import javax.media.jai.util.Range; import javax.units.Unit; import org.geotools.referencing.operation.transform.LinearTransform1D; import org.geotools.resources.ClassChanger; import org.geotools.resources.Utilities; import org.geotools.resources.XArray; import org.geotools.resources.XMath; import org.geotools.resources.gcs.ResourceKeys; import org.geotools.resources.gcs.Resources; import org.geotools.resources.image.ColorUtilities; import org.geotools.util.NumberRange; import org.geotools.util.SimpleInternationalString; import org.opengis.coverage.ColorInterpretation; import org.opengis.coverage.MetadataNameNotFoundException; import org.opengis.coverage.PaletteInterpretation; import org.opengis.coverage.SampleDimensionType; import org.opengis.referencing.operation.MathTransform1D; import org.opengis.referencing.operation.TransformException; import org.opengis.util.InternationalString; /** * Describes the data values for a coverage. For a grid coverage a sample dimension is a band. * Sample values in a band may be organized in categories. This <code>SampleDimension</code> |
* * @throws IllegalArgumentException if the range <code>[minimum..maximum]</code> is not valid. */ public SampleDimension(final String description, SampleDimensionType type, ColorInterpretation color, final Color [] palette, final String[] categories, final double[] nodata, double minimum, double maximum, |
* * @throws IllegalArgumentException if the range <code>[minimum..maximum]</code> is not valid. */ public SampleDimension(final InternationalString description, SampleDimensionType type, ColorInterpretation color, final Color [] palette, final InternationalString[] categories, final double[] nodata, double minimum, double maximum, |
} /** Constructs a list of categories. Used by constructors only. */ private static CategoryList list(final String description, SampleDimensionType type, ColorInterpretation color, final Color [] palette, final String[] categories, final double[] nodata, double minimum, double maximum, |
} /** Constructs a list of categories. Used by constructors only. */ private static CategoryList list(final InternationalString description, SampleDimensionType type, ColorInterpretation color, final Color [] palette, final InternationalString[] categories, final double[] nodata, double minimum, double maximum, |
// This category will be added in step 2 below.
continue;
}
name = categories[intValue];
}
final Number value = wrapSample(padValue, type, false);
if (name == null) { |
// This category will be added in step 2 below.
continue;
}
name = categories[intValue].toString();
}
final Number value = wrapSample(padValue, type, false);
if (name == null) { |
if (nameCount != 0) { int lower = 0; for (int upper=1; upper<=categories.length; upper++) { final String name = categories[lower].trim(); if (upper!=categories.length && name.equalsIgnoreCase(categories[upper].trim())) { // If there is a suite of categories with identical name, create only one // category with range [lower..upper] instead of one new category for each // sample value. |
if (nameCount != 0) { int lower = 0; for (int upper=1; upper<=categories.length; upper++) { final String name = categories[lower].toString().trim(); if (upper!=categories.length && name.equalsIgnoreCase(categories[upper].toString().trim())) { // If there is a suite of categories with identical name, create only one // category with range [lower..upper] instead of one new category for each // sample value. |
(int)Math.ceil (minimum),
(int)Math.floor(maximum));
categoryList.add(new Category(
new SimpleInternationalString(description!=null ? description : "(automatic)"),
colors, range, scale, offset));
needQuantitative = false;
} |
(int)Math.ceil (minimum),
(int)Math.floor(maximum));
categoryList.add(new Category(
description!=null ? description : new SimpleInternationalString("(automatic)"),
colors, range, scale, offset));
needQuantitative = false;
} |
} else { colors = null; } final Locale locale = Locale.getDefault(); return new SampleDimension(sd.getDescription(locale), sd.getSampleDimensionType(), sd.getColorInterpretation(), colors, sd.getCategoryNames(locale), sd.getNoDataValues(), sd.getMinimumValue(), sd.getMaximumValue(), |
} else { colors = null; } return new SampleDimension(sd.getDescription(), sd.getSampleDimensionType(), sd.getColorInterpretation(), colors, sd.getCategoryNames(), sd.getNoDataValues(), sd.getMinimumValue(), sd.getMaximumValue(), |