You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/10/22 12:09:00 UTC
svn commit: r1709976 - in /sis/branches/JDK6: ./
core/sis-metadata/src/main/java/org/apache/sis/io/wkt/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/test/java/org/apache/sis/metadata/
core/sis-metadata/src/test/java/or...
Author: desruisseaux
Date: Thu Oct 22 10:09:00 2015
New Revision: 1709976
URL: http://svn.apache.org/viewvc?rev=1709976&view=rev
Log:
Merge from the JDK7 branch:
GeoAPI interface "Enumerated" has been renamed "ControlledVocabulary".
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
sis/branches/JDK6/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 22 10:09:00 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1709628
-/sis/branches/JDK8:1584960-1709607
+/sis/branches/JDK7:1394913-1709973
+/sis/branches/JDK8:1584960-1709972
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -52,7 +52,7 @@ import org.opengis.referencing.cs.Coordi
import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.MathTransform;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.apache.sis.measure.Units;
import org.apache.sis.math.DecimalFunctions;
@@ -993,9 +993,9 @@ public class Formatter implements Locali
quote(text, type);
} else {
/*
- * Code lists have no quotes. They are normally formatted by the append(Enumerated) method,
- * but an important exception is the CS[type] element in which the type is defined by the
- * interface implemented by the CoordinateSystem rather than a CodeList instance.
+ * Code lists have no quotes. They are normally formatted by the append(ControlledVocabulary) method,
+ * but an important exception is the CS[type] element in which the type is defined by the interface
+ * implemented by the CoordinateSystem rather than a CodeList instance.
*/
setColor(type);
buffer.append(text);
@@ -1071,7 +1071,7 @@ public class Formatter implements Locali
*
* @param code The code list to append to the WKT, or {@code null} if none.
*/
- public void append(final Enumerated code) {
+ public void append(final ControlledVocabulary code) {
if (code != null) {
appendSeparator();
setColor(ElementKind.CODE_LIST);
@@ -1315,11 +1315,13 @@ public class Formatter implements Locali
} else {
append(number.doubleValue());
}
- }
- else if (value instanceof Enumerated) append((Enumerated) value);
- else if (value instanceof Date) append((Date) value);
- else if (value instanceof Boolean) append((Boolean) value);
- else if (value instanceof CharSequence) {
+ } else if (value instanceof ControlledVocabulary) {
+ append((ControlledVocabulary) value);
+ } else if (value instanceof Date) {
+ append((Date) value);
+ } else if (value instanceof Boolean) {
+ append((Boolean) value);
+ } else if (value instanceof CharSequence) {
append((value instanceof InternationalString) ?
((InternationalString) value).toString(locale) : value.toString(), null);
} else {
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -19,7 +19,7 @@ package org.apache.sis.metadata;
import java.util.Map;
import java.util.Iterator;
import java.util.Collection;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.apache.sis.util.Emptiable;
import org.apache.sis.internal.util.CollectionsExt;
@@ -172,7 +172,7 @@ final class Pruner {
} else if (!prune && element instanceof Emptiable) {
isEmptyElement = ((Emptiable) element).isEmpty();
// If 'prune' is true, we will rather test for Emptiable after our pruning attempt.
- } else if (!(element instanceof Enumerated)) {
+ } else if (!(element instanceof ControlledVocabulary)) {
final MetadataStandard standard = MetadataStandard.forClass(element.getClass());
if (standard != null) {
isEmptyElement = isEmpty(asMap(standard, element, false, prune), tested, prune);
Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -21,7 +21,7 @@ import java.util.Locale;
import java.util.Random;
import java.util.Collection;
import org.opengis.util.CodeList;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.collection.CheckedContainer;
@@ -128,11 +128,11 @@ public abstract strictfp class MetadataT
if (Date.class.isAssignableFrom(type)) {
return new Date(random.nextInt() * 1000L);
}
- if (Enumerated.class.isAssignableFrom(type)) try {
+ if (ControlledVocabulary.class.isAssignableFrom(type)) try {
if (type == CodeList.class) {
return null;
}
- final Enumerated[] codes = (Enumerated[]) type.getMethod("values", (Class[]) null).invoke(null, (Object[]) null);
+ final ControlledVocabulary[] codes = (ControlledVocabulary[]) type.getMethod("values", (Class[]) null).invoke(null, (Object[]) null);
return codes[random.nextInt(codes.length)];
} catch (Exception e) { // (ReflectiveOperationException) on JDK7 branch.
fail(e.toString());
@@ -185,7 +185,7 @@ public abstract strictfp class MetadataT
public void testPropertyValues() {
random = TestUtilities.createRandomNumberGenerator();
for (final Class<?> type : types) {
- if (!Enumerated.class.isAssignableFrom(type)) {
+ if (!ControlledVocabulary.class.isAssignableFrom(type)) {
final Class<?> impl = getImplementation(type);
if (impl != null) {
assertTrue(type.isAssignableFrom(impl));
Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -18,7 +18,7 @@ package org.apache.sis.metadata.iso;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.opengis.annotation.UML;
import org.opengis.annotation.Specification;
import org.apache.sis.internal.jaxb.Context;
@@ -318,7 +318,7 @@ public final strictfp class AllMetadataT
return null;
}
final String classname = "org.apache.sis.internal.jaxb." +
- (Enumerated.class.isAssignableFrom(type) ? "code" : "metadata") +
+ (ControlledVocabulary.class.isAssignableFrom(type) ? "code" : "metadata") +
'.' + type.getAnnotation(UML.class).identifier();
final Class<?> wrapper = Class.forName(classname);
assertTrue("Expected a final class for " + wrapper.getName(), Modifier.isFinal(wrapper.getModifiers()));
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -122,12 +122,12 @@ public class LambertConicConformal exten
*
* <p><b>Note:</b></p>
* <ul>
- * <li>If φ1 = -φ2, then the cone become a cylinder and this {@code n} value become 0.
- * This is limiting case is the Mercator projection, but we can not compare with this class
- * because {@code n=0} causes indetermination like 0 × ∞ in the equations of this class.</li>
- * <li>If φ1 = φ2 = ±90°, then this {@code n} value become ±1. The formulas in the transform and
+ * <li>If φ₁ = -φ₂, then the cone become a cylinder and this {@code n} value become 0.
+ * This limiting case is the Mercator projection, but we can not use this class because
+ * {@code n=0} causes indetermination like 0 × ∞ in the equations of this class.</li>
+ * <li>If φ₁ = φ₂ = ±90°, then this {@code n} value become ±1. The formulas in the transform and
* inverse transform methods become basically the same than the ones in {@link PolarStereographic},
- * (de)normalization matrices contain NaN values.</li>
+ * but (de)normalization matrices contain NaN values.</li>
* <li>Depending on how the formulas are written, <var>n</var> may be positive in the South hemisphere and
* negative in the North hemisphere (or conversely). However Apache SIS adjusts the coefficients of the
* (de)normalization matrices in order to keep <var>n</var> positive, because the formulas are slightly
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -229,7 +229,7 @@ public class ObliqueStereographic extend
* polar stereographic which is designed especially for those cases.
*/
final Double φ0 = context.getValue(LATITUDE_OF_ORIGIN);
- if (φ0 != null && abs(φ0 - 90) < Formulas.ANGULAR_TOLERANCE) {
+ if (φ0 != null && abs(abs(φ0) - 90) < Formulas.ANGULAR_TOLERANCE) {
return delegate(factory, PolarStereographicA.NAME);
}
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -17,7 +17,7 @@
package org.apache.sis.internal.jaxb.gmd;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.apache.sis.util.iso.Types;
@@ -84,7 +84,7 @@ public abstract class EnumAdapter<ValueT
* @param e The enumeration constant.
* @return The text to write in the XML element.
*/
- protected static String value(final Enumerated e) {
+ protected static String value(final ControlledVocabulary e) {
return Types.getCodeName(e);
}
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -29,7 +29,7 @@ import java.text.ParsePosition;
import java.text.ParseException;
import java.util.regex.Matcher;
import java.nio.charset.Charset;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.opengis.util.InternationalString;
import org.apache.sis.io.LineAppender;
import org.apache.sis.io.TableAppender;
@@ -632,8 +632,8 @@ public class TreeTableFormat extends Tab
text = ((InternationalString) value).toString(getDisplayLocale());
} else if (value instanceof CharSequence) {
text = value.toString();
- } else if (value instanceof Enumerated) {
- text = Types.getCodeTitle((Enumerated) value).toString(getDisplayLocale());
+ } else if (value instanceof ControlledVocabulary) {
+ text = Types.getCodeTitle((ControlledVocabulary) value).toString(getDisplayLocale());
} else if (value instanceof Enum<?>) {
text = CharSequences.upperCaseToSentence(((Enum<?>) value).name());
} else if (value instanceof Locale) {
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -31,7 +31,7 @@ import java.lang.reflect.UndeclaredThrow
import org.opengis.annotation.UML;
import org.opengis.util.CodeList;
import org.opengis.util.InternationalString;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.apache.sis.util.Static;
import org.apache.sis.util.Locales;
import org.apache.sis.util.CharSequences;
@@ -47,9 +47,9 @@ import org.apache.sis.internal.system.Lo
* This class provides:
*
* <ul>
- * <li>{@link #getStandardName(Class)}, {@link #getListName(Enumerated)} and {@link #getCodeName(Enumerated)}
- * for fetching ISO names if possible.</li>
- * <li>{@link #getCodeTitle(Enumerated)}, {@link #getDescription(Enumerated)} and
+ * <li>{@link #getStandardName(Class)}, {@link #getListName(ControlledVocabulary)} and
+ * {@link #getCodeName(ControlledVocabulary)} for fetching ISO names if possible.</li>
+ * <li>{@link #getCodeTitle(ControlledVocabulary)}, {@link #getDescription(ControlledVocabulary)} and
* {@link #getDescription(Class)} for fetching human-readable descriptions.</li>
* <li>{@link #forStandardName(String)} and {@link #forCodeName(Class, String, boolean)} for
* fetching an instance from a name (converse of above {@code get} methods).</li>
@@ -140,7 +140,7 @@ public final class Types extends Static
* @param code The code for which to get the class name, or {@code null}.
* @return The ISO (preferred) or Java (fallback) class name, or {@code null} if the given code is null.
*/
- public static String getListName(final Enumerated code) {
+ public static String getListName(final ControlledVocabulary code) {
if (code == null) {
return null;
}
@@ -166,12 +166,12 @@ public final class Types extends Static
* @return The UML identifiers or programmatic name for the given code,
* or {@code null} if the given code is null.
*
- * @see #getCodeLabel(Enumerated)
- * @see #getCodeTitle(Enumerated)
- * @see #getDescription(Enumerated)
+ * @see #getCodeLabel(ControlledVocabulary)
+ * @see #getCodeTitle(ControlledVocabulary)
+ * @see #getDescription(ControlledVocabulary)
* @see #forCodeName(Class, String, boolean)
*/
- public static String getCodeName(final Enumerated code) {
+ public static String getCodeName(final ControlledVocabulary code) {
if (code == null) {
return null;
}
@@ -183,7 +183,7 @@ public final class Types extends Static
* Returns a unlocalized title for the given enumeration or code list value.
* This method builds a title using heuristics rules, which should give reasonable
* results without the need of resource bundles. For better results, consider using
- * {@link #getCodeTitle(Enumerated)} instead.
+ * {@link #getCodeTitle(ControlledVocabulary)} instead.
*
* <p>The current heuristic implementation iterates over {@linkplain CodeList#names() all code names},
* selects the longest one excluding the {@linkplain CodeList#name() field name} if possible, then
@@ -200,11 +200,11 @@ public final class Types extends Static
* @param code The code from which to get a title, or {@code null}.
* @return A unlocalized title for the given code, or {@code null} if the given code is null.
*
- * @see #getCodeName(Enumerated)
- * @see #getCodeTitle(Enumerated)
- * @see #getDescription(Enumerated)
+ * @see #getCodeName(ControlledVocabulary)
+ * @see #getCodeTitle(ControlledVocabulary)
+ * @see #getDescription(ControlledVocabulary)
*/
- public static String getCodeLabel(final Enumerated code) {
+ public static String getCodeLabel(final ControlledVocabulary code) {
if (code == null) {
return null;
}
@@ -223,14 +223,14 @@ public final class Types extends Static
/**
* Returns the title of the given enumeration or code list value. Title are usually much shorter than descriptions.
- * English titles are often the same than the {@linkplain #getCodeLabel(Enumerated) code labels}.
+ * English titles are often the same than the {@linkplain #getCodeLabel(ControlledVocabulary) code labels}.
*
* @param code The code for which to get the title, or {@code null}.
* @return The title, or {@code null} if the given code is null.
*
- * @see #getDescription(Enumerated)
+ * @see #getDescription(ControlledVocabulary)
*/
- public static InternationalString getCodeTitle(final Enumerated code) {
+ public static InternationalString getCodeTitle(final ControlledVocabulary code) {
return (code != null) ? new CodeTitle(code) : null;
}
@@ -242,10 +242,10 @@ public final class Types extends Static
* @param code The code for which to get the localized description, or {@code null}.
* @return The description, or {@code null} if none or if the given code is null.
*
- * @see #getCodeTitle(Enumerated)
+ * @see #getCodeTitle(ControlledVocabulary)
* @see #getDescription(Class)
*/
- public static InternationalString getDescription(final Enumerated code) {
+ public static InternationalString getDescription(final ControlledVocabulary code) {
if (code != null) {
final String resources = getResources(code.getClass().getName());
if (resources != null) {
@@ -262,7 +262,7 @@ public final class Types extends Static
* @param type The GeoAPI interface or code list from which to get the description, or {@code null}.
* @return The description, or {@code null} if none or if the given type is {@code null}.
*
- * @see #getDescription(Enumerated)
+ * @see #getDescription(ControlledVocabulary)
*/
public static InternationalString getDescription(final Class<?> type) {
final String name = getStandardName(type);
@@ -380,14 +380,14 @@ public final class Types extends Static
/**
* The code list for which to create a title.
*/
- private final Enumerated code;
+ private final ControlledVocabulary code;
/**
* Creates a new international string for the given code list element.
*
* @param code The code list for which to create a title.
*/
- CodeTitle(final Enumerated code) {
+ CodeTitle(final ControlledVocabulary code) {
super("org.opengis.metadata.CodeLists", resourceKey(code));
this.code = code;
}
@@ -419,7 +419,7 @@ public final class Types extends Static
/**
* Returns the resource key for the given code list.
*/
- static String resourceKey(final Enumerated code) {
+ static String resourceKey(final ControlledVocabulary code) {
String key = getCodeName(code);
if (key.indexOf(SEPARATOR) < 0) {
key = getListName(code) + SEPARATOR + key;
@@ -443,7 +443,7 @@ public final class Types extends Static
* @see Class#getEnumConstants()
*/
@SuppressWarnings("unchecked")
- public static <T extends Enumerated> T[] getCodeValues(final Class<T> codeType) {
+ public static <T extends ControlledVocabulary> T[] getCodeValues(final Class<T> codeType) {
Object values;
try {
values = codeType.getMethod("values", (Class<?>[]) null).invoke(null, (Object[]) null);
@@ -550,8 +550,8 @@ public final class Types extends Static
if (values == null) {
throw e;
}
- if (values instanceof Enumerated[]) {
- for (final Enumerated code : (Enumerated[]) values) {
+ if (values instanceof ControlledVocabulary[]) {
+ for (final ControlledVocabulary code : (ControlledVocabulary[]) values) {
for (final String candidate : code.names()) {
if (CodeListFilter.accept(candidate, name)) {
return enumType.cast(code);
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -31,7 +31,7 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.lang.reflect.Modifier;
import org.opengis.util.CodeList;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.opengis.util.InternationalString;
import org.apache.sis.util.Debug;
import org.apache.sis.util.Classes;
@@ -412,8 +412,8 @@ public class IndexedResourceBundle exten
replacement = message;
} else if (element instanceof Class<?>) {
replacement = Classes.getShortName(getPublicType((Class<?>) element));
- } else if (element instanceof Enumerated) {
- replacement = Types.getCodeTitle((Enumerated) element).toString(getLocale());
+ } else if (element instanceof ControlledVocabulary) {
+ replacement = Types.getCodeTitle((ControlledVocabulary) element).toString(getLocale());
}
// No need to check for Numbers or Dates instances, since they are
// properly formatted in the ResourceBundle locale by MessageFormat.
Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import org.opengis.util.CodeList;
-import org.opengis.util.Enumerated;
+import org.opengis.util.ControlledVocabulary;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
import org.opengis.annotation.Specification;
@@ -415,7 +415,7 @@ public abstract strictfp class Annotatio
testingClass = type.getCanonicalName();
UML uml = type.getAnnotation(UML.class);
assertNotNull("Missing @UML annotation.", uml);
- if (!Enumerated.class.isAssignableFrom(type)) {
+ if (!ControlledVocabulary.class.isAssignableFrom(type)) {
for (final Method method : type.getDeclaredMethods()) {
testingMethod = method.getName();
if (!isIgnored(method) && !isExtension(method)) {
@@ -443,7 +443,7 @@ public abstract strictfp class Annotatio
public void testPackageAnnotations() {
final Set<Package> packages = new HashSet<Package>();
for (final Class<?> type : types) {
- if (!Enumerated.class.isAssignableFrom(type)) {
+ if (!ControlledVocabulary.class.isAssignableFrom(type)) {
testingClass = type.getCanonicalName();
final Class<?> impl = getImplementation(type);
if (impl != null) {
@@ -484,7 +484,7 @@ public abstract strictfp class Annotatio
@DependsOnMethod("testInterfaceAnnotations")
public void testImplementationAnnotations() {
for (final Class<?> type : types) {
- if (Enumerated.class.isAssignableFrom(type)) {
+ if (ControlledVocabulary.class.isAssignableFrom(type)) {
// Skip code lists, since they are not the purpose of this test.
continue;
}
@@ -543,7 +543,7 @@ public abstract strictfp class Annotatio
@DependsOnMethod("testImplementationAnnotations")
public void testMethodAnnotations() {
for (final Class<?> type : types) {
- if (Enumerated.class.isAssignableFrom(type)) {
+ if (ControlledVocabulary.class.isAssignableFrom(type)) {
// Skip code lists, since they are not the purpose of this test.
continue;
}
@@ -670,7 +670,7 @@ public abstract strictfp class Annotatio
assertEquals("Wrong @XmlElement.", uml.identifier(), element.name());
}
final String namespace = assertExpectedNamespace(element.namespace(), wrapper.type, uml);
- if (!Enumerated.class.isAssignableFrom(type)) {
+ if (!ControlledVocabulary.class.isAssignableFrom(type)) {
final String expected = getNamespace(getImplementation(type));
if (expected != null) { // 'assertNotNull' is 'testImplementationAnnotations()' job.
assertEquals("Inconsistent @XmlRootElement namespace.", expected, namespace);
Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java [UTF-8] Thu Oct 22 10:09:00 2015
@@ -108,7 +108,7 @@ public final strictfp class TypesTest ex
/**
* Tests the {@link Types#forEnumName(Class, String)} method with an enumeration from the JDK.
- * Such enumerations do not implement the {@link org.opengis.util.Enumerated} interface.
+ * Such enumerations do not implement the {@link org.opengis.util.ControlledVocabulary} interface.
*
* @since 0.5
*/
@@ -123,7 +123,7 @@ public final strictfp class TypesTest ex
/**
* Tests the {@link Types#forEnumName(Class, String)} method with an enumeration from GeoAPI.
- * Such enumerations implement the {@link org.opengis.util.Enumerated} interface.
+ * Such enumerations implement the {@link org.opengis.util.ControlledVocabulary} interface.
*
* @since 0.5
*/
@@ -190,7 +190,7 @@ public final strictfp class TypesTest ex
}
/**
- * Tests the {@link Types#getDescription(Enumerated)} method.
+ * Tests the {@link Types#getDescription(ControlledVocabulary)} method.
*/
@Test
public void testGetCodeDescription() {
@@ -204,7 +204,7 @@ public final strictfp class TypesTest ex
}
/**
- * Tests the examples given in {@link Types#getListName(Enumerated)} javadoc.
+ * Tests the examples given in {@link Types#getListName(ControlledVocabulary)} javadoc.
*/
@Test
public void testGetListName() {
@@ -215,7 +215,7 @@ public final strictfp class TypesTest ex
}
/**
- * Tests the examples given in {@link Types#getCodeName(Enumerated)} javadoc.
+ * Tests the examples given in {@link Types#getCodeName(ControlledVocabulary)} javadoc.
*/
@Test
public void testGetCodeName() {
@@ -226,7 +226,7 @@ public final strictfp class TypesTest ex
}
/**
- * Tests the examples given in {@link Types#getCodeLabel(Enumerated)} javadoc.
+ * Tests the examples given in {@link Types#getCodeLabel(ControlledVocabulary)} javadoc.
*/
@Test
public void testGetCodeLabel() {
@@ -236,7 +236,7 @@ public final strictfp class TypesTest ex
}
/**
- * Tests {@link Types#getCodeTitle(Enumerated)}.
+ * Tests {@link Types#getCodeTitle(ControlledVocabulary)}.
*/
@Test
public void testGetCodeTitle() {
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1709976&r1=1709975&r2=1709976&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Thu Oct 22 10:09:00 2015
@@ -556,7 +556,7 @@ Apache SIS is a free software, Java lang
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.0</version>
+ <version>2.5.4</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>true</excludeDependencies>