Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -30,7 +30,7 @@ import org.opengis.parameter.ParameterDe import org.opengis.parameter.GeneralParameterDescriptor; import org.opengis.parameter.InvalidParameterNameException; import org.opengis.parameter.InvalidParameterCardinalityException; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.Identifier; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.resources.Errors; @@ -193,7 +193,7 @@ final class ParameterValueList extends A * The intend is to allow users to set its own parameters by a call to group.values().addAll(myParam). * Otherwise the given parameter will be added, in which case we need to check the cardinality. */ - final ReferenceIdentifier name = desc.getName(); + final Identifier name = desc.getName(); int count = 0; for (int i=0; i<size; i++) { final GeneralParameterValue value = values[i]; @@ -236,7 +236,7 @@ final class ParameterValueList extends A * For a more accurate error message, check if the operation failed because the * parameter name was not found, or the parameter descriptor does not matches. */ - final ReferenceIdentifier name = desc.getName(); + final Identifier name = desc.getName(); for (final GeneralParameterDescriptor descriptor : descriptors) { if (name.equals(descriptor.getName())) { throw new IllegalArgumentException(Errors.format( @@ -254,7 +254,7 @@ final class ParameterValueList extends A * then this method throws an {@link InvalidParameterCardinalityException}. */ private void ensureCanAdd(final GeneralParameterDescriptor desc) { - final ReferenceIdentifier name = desc.getName(); + final Identifier name = desc.getName(); int count = 0; for (int i=0; i<size; i++) { if (name.equals(values[i].getDescriptor().getName())) { @@ -276,7 +276,7 @@ final class ParameterValueList extends A private void ensureCanRemove(final GeneralParameterDescriptor desc) { final int min = desc.getMinimumOccurs(); if (min != 0) { // Optimization for a common case. - final ReferenceIdentifier name = desc.getName(); + final Identifier name = desc.getName(); int count = 0; for (int i=0; i<size; i++) { if (name.equals(values[i].getDescriptor().getName())) {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -32,7 +32,7 @@ import org.opengis.parameter.GeneralPara import org.opengis.parameter.GeneralParameterDescriptor; import org.opengis.parameter.ParameterNotFoundException; import org.opengis.parameter.InvalidParameterNameException; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.Identifier; import org.opengis.referencing.operation.Matrix; import org.apache.sis.referencing.IdentifiedObjects; import org.apache.sis.referencing.operation.matrix.Matrices; @@ -138,10 +138,10 @@ public class TensorParameters<E> impleme final Integer defaultSize = 3; final ParameterDescriptor<Integer> numRow, numCol; final Map<String,Object> properties = new HashMap<>(4); - properties.put(ReferenceIdentifier.AUTHORITY_KEY, Citations.OGC); - properties.put(ReferenceIdentifier.CODE_KEY, "num_row"); + properties.put(Identifier.AUTHORITY_KEY, Citations.OGC); + properties.put(Identifier.CODE_KEY, "num_row"); numRow = new DefaultParameterDescriptor<>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize); - properties.put(ReferenceIdentifier.CODE_KEY, "num_col"); + properties.put(Identifier.CODE_KEY, "num_col"); numCol = new DefaultParameterDescriptor<>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize); WKT1 = new TensorParameters<>(Double.class, "elt_", "_", numRow, numCol); } @@ -377,8 +377,8 @@ public class TensorParameters<E> impleme } } final Map<String,Object> properties = new HashMap<>(4); - properties.put(ReferenceIdentifier.CODE_KEY, indicesToName(indices)); - properties.put(ReferenceIdentifier.AUTHORITY_KEY, dimensions[0].getName().getAuthority()); + properties.put(Identifier.CODE_KEY, indicesToName(indices)); + properties.put(Identifier.AUTHORITY_KEY, dimensions[0].getName().getAuthority()); return new DefaultParameterDescriptor<>(properties, 0, 1, elementType, null, null, isDiagonal ? one : zero); } @@ -548,7 +548,7 @@ public class TensorParameters<E> impleme * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link DefaultParameterDescriptorGroup#getName()}</td> * </tr> * <tr> @@ -558,7 +558,7 @@ public class TensorParameters<E> impleme * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link DefaultParameterDescriptorGroup#getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -33,11 +33,11 @@ import javax.xml.bind.annotation.adapter import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; +import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.referencing.ObjectFactory; import org.opengis.referencing.AuthorityFactory; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.metadata.ReferencingUtilities; import org.apache.sis.internal.jaxb.referencing.Code; import org.apache.sis.internal.util.Numerics; @@ -108,7 +108,7 @@ import java.util.Objects; * </ul> * * {@section Immutability and thread safety} - * This base class is immutable if the {@link Citation}, {@link ReferenceIdentifier}, {@link GenericName} and + * This base class is immutable if the {@link Citation}, {@link Identifier}, {@link GenericName} and * {@link InternationalString} instances given to the constructor are also immutable. Most SIS subclasses and * related classes are immutable under similar conditions. This means that unless otherwise noted in the javadoc, * {@code IdentifiedObject} instances created using only SIS factories and static constants can be shared by many @@ -116,7 +116,7 @@ import java.util.Objects; * * @author Martin Desruisseaux (IRD, Geomatys) * @since 0.4 (derived from geotk-1.2) - * @version 0.4 + * @version 0.5 * @module */ @XmlType(name="IdentifiedObjectType", propOrder={ @@ -156,12 +156,12 @@ public class AbstractIdentifiedObject ex * The name for this object or code. Shall never be {@code null}. * * <p><b>Consider this field as final!</b> - * This field is modified only at unmarshalling time by {@link #addName(ReferenceIdentifier)}.</p> + * This field is modified only at unmarshalling time by {@link #addName(Identifier)}.</p> * * @see #getName() * @see #getNames() */ - private ReferenceIdentifier name; + private Identifier name; /** * An alternative name by which this object is identified, or {@code null} if none. @@ -169,7 +169,7 @@ public class AbstractIdentifiedObject ex * we may get both on unmarshalling. * * <p><b>Consider this field as final!</b> - * This field is modified only at unmarshalling time by {@link #addName(ReferenceIdentifier)}.</p> + * This field is modified only at unmarshalling time by {@link #addName(Identifier)}.</p> */ private Collection<GenericName> alias; @@ -183,7 +183,7 @@ public class AbstractIdentifiedObject ex * @see #getIdentifiers() * @see #getIdentifier() */ - private Set<ReferenceIdentifier> identifiers; + private Set<Identifier> identifiers; /** * Comments on or information about this object, or {@code null} if none. @@ -216,7 +216,7 @@ public class AbstractIdentifiedObject ex * Other properties listed in the table below are optional. * In particular, {@code "authority"}, {@code "code"}, {@code "codespace"} and {@code "version"} * are convenience properties for building a name, and are ignored if the {@code "name"} property - * is already a {@link ReferenceIdentifier} object instead than a {@link String}. + * is already a {@link Identifier} object instead than a {@link String}. * * <table class="sis"> * <caption>Recognized properties (non exhaustive list)</caption> @@ -227,7 +227,7 @@ public class AbstractIdentifiedObject ex * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -241,23 +241,28 @@ public class AbstractIdentifiedObject ex * <td>{@link NamedIdentifier#getCode()} on the {@linkplain #getName() name}</td> * </tr> * <tr> - * <td>{@value org.opengis.referencing.ReferenceIdentifier#CODESPACE_KEY}</td> + * <td>{@value org.opengis.metadata.Identifier#CODESPACE_KEY}</td> * <td>{@link String}</td> * <td>{@link NamedIdentifier#getCodeSpace()} on the {@linkplain #getName() name}</td> * </tr> * <tr> - * <td>{@value org.opengis.referencing.ReferenceIdentifier#VERSION_KEY}</td> + * <td>{@value org.opengis.metadata.Identifier#VERSION_KEY}</td> * <td>{@link String}</td> * <td>{@link NamedIdentifier#getVersion()} on the {@linkplain #getName() name}</td> * </tr> * <tr> + * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td> + * <td>{@link String}</td> + * <td>{@link NamedIdentifier#getDescription()} on the {@linkplain #getName() name}</td> + * </tr> + * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td> * <td>{@link GenericName} or {@link CharSequence} (optionally as array)</td> * <td>{@link #getAlias()}</td> * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> @@ -293,18 +298,18 @@ public class AbstractIdentifiedObject ex public AbstractIdentifiedObject(final Map<String,?> properties) throws IllegalArgumentException { ensureNonNull("properties", properties); - // ------------------------------------- - // "name": String or ReferenceIdentifier - // ------------------------------------- + // ---------------------------- + // "name": String or Identifier + // ---------------------------- Object value = properties.get(NAME_KEY); if (value == null || value instanceof String) { - if (value == null && properties.get(ReferenceIdentifier.CODE_KEY) == null) { + if (value == null && properties.get(Identifier.CODE_KEY) == null) { throw new IllegalArgumentException(Errors.getResources(properties) .getString(Errors.Keys.MissingValueForProperty_1, NAME_KEY)); } name = new NamedIdentifier(PropertiesConverter.convert(properties)); - } else if (value instanceof ReferenceIdentifier) { - name = (ReferenceIdentifier) value; + } else if (value instanceof Identifier) { + name = (Identifier) value; } else { throw illegalPropertyType(properties, NAME_KEY, value); } @@ -326,16 +331,16 @@ public class AbstractIdentifiedObject ex } alias = immutableSet(true, names); - // ----------------------------------------------------------- - // "identifiers": ReferenceIdentifier or ReferenceIdentifier[] - // ----------------------------------------------------------- + // ----------------------------------------- + // "identifiers": Identifier or Identifier[] + // ----------------------------------------- value = properties.get(IDENTIFIERS_KEY); if (value == null) { identifiers = null; - } else if (value instanceof ReferenceIdentifier) { - identifiers = Collections.singleton((ReferenceIdentifier) value); - } else if (value instanceof ReferenceIdentifier[]) { - identifiers = immutableSet(true, (ReferenceIdentifier[]) value); + } else if (value instanceof Identifier) { + identifiers = Collections.singleton((Identifier) value); + } else if (value instanceof Identifier[]) { + identifiers = immutableSet(true, (Identifier[]) value); } else { throw illegalPropertyType(properties, IDENTIFIERS_KEY, value); } @@ -459,7 +464,7 @@ public class AbstractIdentifiedObject ex * if we found no suitable ID, then we will use the primary name as a last resort. */ if (identifiers != null) { - for (final ReferenceIdentifier identifier : identifiers) { + for (final Identifier identifier : identifiers) { if (appendUnicodeIdentifier(id, '-', identifier.getCodeSpace(), ":", true) | // Really |, not || appendUnicodeIdentifier(id, '-', ReferencingUtilities.toURNType(getClass()), ":", false) | appendUnicodeIdentifier(id, '-', identifier.getCode(), ":", true)) @@ -482,7 +487,7 @@ public class AbstractIdentifiedObject ex } /** - * Returns a single element from the {@code Set<ReferenceIdentifier>} collection, or {@code null} if none. + * Returns a single element from the {@code Set<Identifier>} collection, or {@code null} if none. * We have to define this method because ISO 19111 defines the {@code identifiers} property as a collection * while GML 3.2 defines it as a singleton. * @@ -503,7 +508,7 @@ public class AbstractIdentifiedObject ex */ private void setIdentifier(final Code identifier) { if (identifier != null) { - final ReferenceIdentifier id = identifier.getIdentifier(); + final Identifier id = identifier.getIdentifier(); if (id != null && canSetProperty("identifier", identifiers != null)) { identifiers = Collections.singleton(id); } @@ -511,12 +516,12 @@ public class AbstractIdentifiedObject ex } /** - * A writable view over the {@linkplain AbstractIdentifiedObject#getName() name} of the enclosing object followed by - * all {@linkplain AbstractIdentifiedObject#getAlias() aliases} which are instance of {@link ReferenceIdentifier}. + * A writable view over the {@linkplain AbstractIdentifiedObject#getName() name} of the enclosing object followed + * by all {@linkplain AbstractIdentifiedObject#getAlias() aliases} which are instance of {@link Identifier}. * Used by JAXB only at (un)marshalling time because GML merges the name and aliases in a single {@code <gml:name>} * property. */ - private final class Names extends AbstractCollection<ReferenceIdentifier> { + private final class Names extends AbstractCollection<Identifier> { /** * Invoked by JAXB before to write in the collection at unmarshalling time. * Do nothing since our object is already empty. @@ -526,7 +531,7 @@ public class AbstractIdentifiedObject ex } /** - * Returns the number of name and aliases that are instance of {@link ReferenceIdentifier}. + * Returns the number of name and aliases that are instance of {@link Identifier}. */ @Override public int size() { @@ -534,10 +539,10 @@ public class AbstractIdentifiedObject ex } /** - * Returns an iterator over the name and aliases that are instance of {@link ReferenceIdentifier}. + * Returns an iterator over the name and aliases that are instance of {@link Identifier}. */ @Override - public Iterator<ReferenceIdentifier> iterator() { + public Iterator<Identifier> iterator() { return new NameIterator(AbstractIdentifiedObject.this); } @@ -551,17 +556,17 @@ public class AbstractIdentifiedObject ex * See <a href="https://java.net/jira/browse/JAXB-488";>JAXB-488</a> for more information.</p> */ @Override - public boolean add(final ReferenceIdentifier id) { + public boolean add(final Identifier id) { addName(id); return true; } } /** - * Implementation of {@link Names#add(ReferenceIdentifier)}, defined in the enclosing class + * Implementation of {@link Names#add(Identifier)}, defined in the enclosing class * for access to private fields without compiler-generated bridge methods. */ - final void addName(final ReferenceIdentifier id) { + final void addName(final Identifier id) { if (name == null) { name = id; } else { @@ -596,7 +601,7 @@ public class AbstractIdentifiedObject ex } /** - * Returns the {@link #name} and all aliases which are also instance of {@lik ReferenceIdentifier}. + * Returns the {@link #name} and all aliases which are also instance of {@link Identifier}. * The later happen often in SIS implementation since many aliases are instance of {@link NamedIdentifier}. * * <p>The returned collection is <cite>live</cite>: adding elements in that collection will modify this @@ -613,7 +618,7 @@ public class AbstractIdentifiedObject ex * @see <a href="https://java.net/jira/browse/JAXB-488";>JAXB-488</a> */ @XmlElement(name = "name", required = true) - final Collection<ReferenceIdentifier> getNames() { + final Collection<Identifier> getNames() { return new Names(); } @@ -625,7 +630,7 @@ public class AbstractIdentifiedObject ex * @see IdentifiedObjects#getName(IdentifiedObject, Citation) */ @Override - public ReferenceIdentifier getName() { + public Identifier getName() { return name; } @@ -650,7 +655,7 @@ public class AbstractIdentifiedObject ex * @see IdentifiedObjects#getIdentifier(IdentifiedObject, Citation) */ @Override - public Set<ReferenceIdentifier> getIdentifiers() { + public Set<Identifier> getIdentifiers() { return nonNull(identifiers); // Needs to be null-safe because we may have a null value on unmarshalling. } @@ -690,7 +695,7 @@ public class AbstractIdentifiedObject ex } } boolean isDeprecated = false; - for (final ReferenceIdentifier identifier : nonNull(identifiers)) { + for (final Identifier identifier : nonNull(identifiers)) { if (identifier instanceof Deprecable) { if (!((Deprecable) identifier).isDeprecated()) { return false; Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlTran import org.opengis.util.GenericName; import org.opengis.util.InternationalString; import org.opengis.referencing.ReferenceSystem; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.Identifier; import org.opengis.metadata.extent.Extent; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.iso.Types; @@ -126,7 +126,7 @@ public class AbstractReferenceSystem ext * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -136,7 +136,7 @@ public class AbstractReferenceSystem ext * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -25,9 +25,9 @@ import java.lang.reflect.ParameterizedTy import org.opengis.util.NameSpace; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; +import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.metadata.iso.ImmutableIdentifier; import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.util.resources.Errors; @@ -146,7 +146,7 @@ import java.util.Objects; * * @author Martin Desruisseaux (Geomatys) * @since 0.4 - * @version 0.4 + * @version 0.5 * @module */ public abstract class Builder<B extends Builder<B>> { @@ -175,7 +175,7 @@ public abstract class Builder<B extends /** * A temporary list for identifiers, before to assign them to the {@link #properties}. */ - private final List<ReferenceIdentifier> identifiers; + private final List<Identifier> identifiers; /** * The codespace as a {@code NameSpace} object, or {@code null} if not yet created. @@ -226,8 +226,8 @@ public abstract class Builder<B extends /** * Sets the property value for the given key, if a change is still possible. The check for change permission - * is needed for all keys defined in the {@link ReferenceIdentifier} interface. This check is not needed for - * other keys, so callers do not need to invoke this method for other keys. + * is needed for all keys defined in the {@link Identifier} interface. This check is not needed for other keys, + * so callers do not need to invoke this method for other keys. * * @param key The key of the property to set. * @param value The value to set. @@ -250,7 +250,7 @@ public abstract class Builder<B extends */ private NameSpace namespace() { if (namespace == null) { - final String codespace = (String) properties.get(ReferenceIdentifier.CODESPACE_KEY); + final String codespace = (String) properties.get(Identifier.CODESPACE_KEY); if (codespace != null) { namespace = NAMES.createNameSpace(NAMES.createLocalName(null, codespace), null); } @@ -259,7 +259,7 @@ public abstract class Builder<B extends } /** - * Sets the {@code ReferenceIdentifier} authority and code space. This method is typically invoked only once, + * Sets the {@code Identifier} authority and code space. This method is typically invoked only once, * since a compound object often uses the same code space for all individual components. * * <p><b>Condition:</b> @@ -277,15 +277,15 @@ public abstract class Builder<B extends * once since builder construction or since the last call to a {@code createXXX(…)} method. */ public B setCodeSpace(final Citation authority, final String codespace) { - if (!setProperty(ReferenceIdentifier.CODESPACE_KEY, codespace)) { + if (!setProperty(Identifier.CODESPACE_KEY, codespace)) { namespace = null; } - setProperty(ReferenceIdentifier.AUTHORITY_KEY, authority); + setProperty(Identifier.AUTHORITY_KEY, authority); return self(); } /** - * Sets the {@code ReferenceIdentifier} version of object definitions. This method is typically invoked only once, + * Sets the {@code Identifier} version of object definitions. This method is typically invoked only once, * since a compound object often uses the same version for all individual components. * * <p><b>Condition:</b> @@ -302,15 +302,15 @@ public abstract class Builder<B extends * once since builder construction or since the last call to a {@code createXXX(…)} method. */ public B setVersion(final String version) { - setProperty(ReferenceIdentifier.VERSION_KEY, version); + setProperty(Identifier.VERSION_KEY, version); return self(); } /** * Adds an {@code IdentifiedObject} name given by a {@code String} or {@code InternationalString}. * The given string will be combined with the authority, {@link #setCodeSpace(Citation, String) code space} - * and {@link #setVersion(String) version} information for creating the {@link ReferenceIdentifier} or - * {@link GenericName} object. + * and {@link #setVersion(String) version} information for creating the {@link Identifier} or {@link GenericName} + * object. * * {@section Name and aliases} * This method can be invoked many times. The first invocation sets the @@ -394,7 +394,7 @@ public abstract class Builder<B extends * @param name The {@code IdentifiedObject} name as an identifier. * @return {@code this}, for method call chaining. */ - public B addName(final ReferenceIdentifier name) { + public B addName(final Identifier name) { ensureNonNull("name", name); final Object old = properties.put(IdentifiedObject.NAME_KEY, name); if (old != null) { @@ -434,7 +434,7 @@ public abstract class Builder<B extends /** * Adds an {@code IdentifiedObject} identifier given by a {@code String}. * The given string will be combined with the authority, {@link #setCodeSpace(Citation, String) code space} - * and {@link #setVersion(String) version} information for creating the {@link ReferenceIdentifier} object. + * and {@link #setVersion(String) version} information for creating the {@link Identifier} object. * * <p><b>Lifetime:</b> * all identifiers are cleared after a {@code createXXX(…)} method has been invoked.</p> @@ -444,8 +444,8 @@ public abstract class Builder<B extends */ public B addIdentifier(final String identifier) { ensureNonNull("identifier", identifier); - identifiers.add(new ImmutableIdentifier((Citation) properties.get(ReferenceIdentifier.AUTHORITY_KEY), - (String) properties.get(ReferenceIdentifier.CODESPACE_KEY), identifier)); + identifiers.add(new ImmutableIdentifier((Citation) properties.get(Identifier.AUTHORITY_KEY), + (String) properties.get(Identifier.CODESPACE_KEY), identifier)); return self(); } @@ -480,13 +480,29 @@ public abstract class Builder<B extends * @param identifier The {@code IdentifiedObject} identifier. * @return {@code this}, for method call chaining. */ - public B addIdentifier(final ReferenceIdentifier identifier) { + public B addIdentifier(final Identifier identifier) { ensureNonNull("identifier", identifier); identifiers.add(identifier); return self(); } /** + * Sets the parameter description as a {@code String} or {@code InternationalString} instance. + * Calls to this method overwrite any previous value. + * + * <p><b>Lifetime:</b> + * previous descriptions are discarded by calls to {@code setDescription(…)}. + * Descriptions are cleared after a {@code createXXX(…)} method has been invoked.</p> + * + * @param description The description, or {@code null} if none. + * @return {@code this}, for method call chaining. + */ + public B setDescription(final CharSequence description) { + properties.put(Identifier.DESCRIPTION_KEY, description); + return self(); + } + + /** * Sets remarks as a {@code String} or {@code InternationalString} instance. * Calls to this method overwrite any previous value. * @@ -529,8 +545,8 @@ public abstract class Builder<B extends * @see #properties */ protected void onCreate(final boolean cleanup) { - properties.put(IdentifiedObject.ALIAS_KEY, cleanup ? null : aliases .toArray(new GenericName [aliases .size()])); - properties.put(IdentifiedObject.IDENTIFIERS_KEY, cleanup ? null : identifiers.toArray(new ReferenceIdentifier[identifiers.size()])); + properties.put(IdentifiedObject.ALIAS_KEY, cleanup ? null : aliases .toArray(new GenericName[aliases .size()])); + properties.put(IdentifiedObject.IDENTIFIERS_KEY, cleanup ? null : identifiers.toArray(new Identifier [identifiers.size()])); if (cleanup) { properties .put(IdentifiedObject.NAME_KEY, null); properties .remove(IdentifiedObject.REMARKS_KEY); Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -27,7 +27,6 @@ import org.opengis.util.GenericName; import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ReferenceIdentifier; import org.opengis.referencing.operation.CoordinateOperation; import org.apache.sis.util.Static; @@ -47,7 +46,7 @@ import static org.apache.sis.internal.ut * @author Martin Desruisseaux (IRD, Geomatys) * @author Guilhem Legal (Geomatys) * @since 0.4 (derived from geotk-1.2) - * @version 0.4 + * @version 0.5 * @module * * @see CRS @@ -119,12 +118,12 @@ public final class IdentifiedObjects ext * then all {@linkplain AbstractIdentifiedObject#getAlias() aliases} in their iteration order. * * <ul> - * <li><p>If the name or alias implements the {@link ReferenceIdentifier} interface, - * then this method compares the {@linkplain ReferenceIdentifier#getAuthority() + * <li><p>If the name or alias implements the {@link Identifier} interface, + * then this method compares the {@linkplain Identifier#getAuthority() * identifier authority} against the specified citation using the * {@link Citations#identifierMatches(Citation, Citation)} method. * If a matching is found, then this method returns the - * {@linkplain ReferenceIdentifier#getCode() identifier code} of that object.</p></li> + * {@linkplain Identifier#getCode() identifier code} of that object.</p></li> * * <li><p>Otherwise, if the alias implements the {@link GenericName} interface, then this method * compares the {@linkplain GenericName#scope() name scope} against the specified citation @@ -133,13 +132,13 @@ public final class IdentifiedObjects ext * {@linkplain GenericName#tip() name tip} of that object.</p></li> * </ul> * - * Note that alias may implement both the {@link ReferenceIdentifier} and {@link GenericName} + * Note that alias may implement both the {@link Identifier} and {@link GenericName} * interfaces (for example {@link NamedIdentifier}). In such cases, the identifier view has * precedence. * * @param object The object to get the name from, or {@code null}. * @param authority The authority for the name to return, or {@code null} for any authority. - * @return The object's name (either an {@linkplain ReferenceIdentifier#getCode() identifier code} + * @return The object's name (either an {@linkplain Identifier#getCode() identifier code} * or a {@linkplain GenericName#tip() name tip}), or {@code null} if no name matching the * specified authority has been found. * @@ -157,7 +156,7 @@ public final class IdentifiedObjects ext * @param object The object to get the name from, or {@code null}. * @param authority The authority for the name to return, or {@code null} for any authority. * @param addTo If non-null, the collection where to add all names found. - * @return The object's name (either an {@linkplain ReferenceIdentifier#getCode() identifier code} + * @return The object's name (either an {@linkplain Identifier#getCode() identifier code} * or a {@linkplain GenericName#tip() name tip}), or {@code null} if no name matching the * specified authority has been found. */ @@ -253,11 +252,11 @@ public final class IdentifiedObjects ext * * @see AbstractIdentifiedObject#getIdentifier() */ - public static ReferenceIdentifier getIdentifier(final IdentifiedObject object, final Citation authority) { + public static Identifier getIdentifier(final IdentifiedObject object, final Citation authority) { if (object != null) { - final Iterator<ReferenceIdentifier> it = iterator(object.getIdentifiers()); + final Iterator<Identifier> it = iterator(object.getIdentifiers()); if (it != null) while (it.hasNext()) { - final ReferenceIdentifier identifier = it.next(); + final Identifier identifier = it.next(); if (identifier != null) { // Paranoiac check. if (authority == null || identifierMatches(authority, identifier.getAuthority())) { return identifier; @@ -291,7 +290,7 @@ public final class IdentifiedObjects ext */ public static String getIdentifierOrName(final IdentifiedObject object) { if (object != null) { - final Iterator<ReferenceIdentifier> it = iterator(object.getIdentifiers()); + final Iterator<Identifier> it = iterator(object.getIdentifiers()); if (it != null) while (it.hasNext()) { final String code = toString(it.next()); if (code != null) { // Paranoiac check. @@ -322,7 +321,7 @@ public final class IdentifiedObjects ext */ public static String getUnicodeIdentifier(final IdentifiedObject object) { if (object != null) { - ReferenceIdentifier identifier = object.getName(); + Identifier identifier = object.getName(); if (identifier != null) { // Paranoiac check. final String code = identifier.getCode(); if (CharSequences.isUnicodeIdentifier(code)) { @@ -339,7 +338,7 @@ public final class IdentifiedObjects ext } } } - final Iterator<ReferenceIdentifier> id = iterator(object.getIdentifiers()); + final Iterator<Identifier> id = iterator(object.getIdentifiers()); if (id != null) while (id.hasNext()) { identifier = id.next(); if (identifier != null) { // Paranoiac check. @@ -413,7 +412,7 @@ public final class IdentifiedObjects ext CharSequence name) { name = CharSequences.toASCII(name); - final ReferenceIdentifier id = object.getName(); + final Identifier id = object.getName(); if (id != null) { // Paranoiac check. final CharSequence code = CharSequences.toASCII(id.getCode()); if (code != null) { // Paranoiac check. @@ -448,7 +447,7 @@ public final class IdentifiedObjects ext * <ul> * <li>If the given identifier implements the {@link GenericName} interface, * then this method delegates to the {@link GenericName#toString()} method.</li> - * <li>Otherwise if the given identifier has a {@linkplain ReferenceIdentifier#getCodeSpace() code space}, + * <li>Otherwise if the given identifier has a {@linkplain Identifier#getCodeSpace() code space}, * then formats the identifier as "{@code codespace:code}".</li> * <li>Otherwise if the given identifier has an {@linkplain Identifier#getAuthority() authority}, * then formats the identifier as "{@code authority:code}".</li> @@ -456,7 +455,7 @@ public final class IdentifiedObjects ext * </ul> * * This method is provided because the {@link GenericName#toString()} behavior is specified by its javadoc, - * while {@link ReferenceIdentifier} has no such contract. For example like most ISO 19115 objects in SIS, + * while {@link Identifier} has no such contract. For example like most ISO 19115 objects in SIS, * the {@link org.apache.sis.metadata.iso.DefaultIdentifier} implementation is formatted as a tree. * This static method can be used when a "name-like" representation is needed for any implementation. * @@ -475,10 +474,8 @@ public final class IdentifiedObjects ext return identifier.toString(); } final String code = identifier.getCode(); - final String cs; - if (identifier instanceof ReferenceIdentifier) { - cs = ((ReferenceIdentifier) identifier).getCodeSpace(); - } else { + String cs = identifier.getCodeSpace(); + if (cs == null) { cs = org.apache.sis.internal.util.Citations.getIdentifier(identifier.getAuthority()); } if (cs != null && !cs.isEmpty()) { Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NameIterator.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NameIterator.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NameIterator.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NameIterator.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -18,13 +18,13 @@ package org.apache.sis.referencing; import java.util.Iterator; import org.opengis.util.GenericName; +import org.opengis.metadata.Identifier; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ReferenceIdentifier; /** * An iterator over the {@linkplain IdentifiedObject#getName() name} of an identified object followed by - * {@linkplain IdentifiedObject#getAlias() aliases} which are instance of {@link ReferenceIdentifier}. + * {@linkplain IdentifiedObject#getAlias() aliases} which are instance of {@link Identifier}. * This iterator is used for {@link AbstractIdentifiedObject} marshalling because GML merges the name and * aliases in a single {@code <gml:name>} property. * @@ -33,14 +33,14 @@ import org.opengis.referencing.Reference * * @author Martin Desruisseaux (Geomatys) * @since 0.4 - * @version 0.4 + * @version 0.5 * @module */ -final class NameIterator implements Iterator<ReferenceIdentifier> { +final class NameIterator implements Iterator<Identifier> { /** * The next element to return, or {@code null} if we reached the end of iteration. */ - private ReferenceIdentifier next; + private Identifier next; /** * An iterator over the aliases. @@ -73,12 +73,12 @@ final class NameIterator implements Iter * will be used only by JAXB, which is presumed checking for {@link #hasNext()} correctly. */ @Override - public ReferenceIdentifier next() { - final ReferenceIdentifier n = next; + public Identifier next() { + final Identifier n = next; while (alias.hasNext()) { final GenericName c = alias.next(); - if (c instanceof ReferenceIdentifier) { - next = (ReferenceIdentifier) c; + if (c instanceof Identifier) { + next = (Identifier) c; return n; } } Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -30,7 +30,6 @@ import org.opengis.util.NameFactory; import org.opengis.util.InternationalString; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.Identifier; -import org.opengis.referencing.ReferenceIdentifier; import org.opengis.parameter.InvalidParameterValueException; import org.apache.sis.internal.metadata.NameToIdentifier; import org.apache.sis.internal.system.DefaultFactories; @@ -43,7 +42,7 @@ import java.util.Objects; /** - * An identification of a CRS object which is both a {@link ReferenceIdentifier} and a {@link GenericName}. + * An identification of a CRS object which is both a {@link Identifier} and a {@link GenericName}. * This class implements both interfaces in order to allow usage of the same instance either as an object * {@linkplain AbstractIdentifiedObject#getName() name} or {@linkplain AbstractIdentifiedObject#getAlias() alias}. * This flexibility make easier to uses object's names in two different models: @@ -57,10 +56,10 @@ import java.util.Objects; * * By using this {@code NamedIdentifier} class, users can declare supplemental object's names as * {@linkplain AbstractIdentifiedObject#getAlias() aliases} and have those names used in contexts - * where {@code ReferenceIdentifier} instances are required, like GML marshalling time. + * where {@code Identifier} instances are required, like GML marshalling time. * * {@section Name ↔ Identifier mapping} - * The {@code GenericName} attributes will be inferred from {@code ReferenceIdentifier} attributes as below: + * The {@code GenericName} attributes will be inferred from {@code Identifier} attributes as below: * * <ul> * <li><b>{@linkplain #tip() Tip}:</b> derived from the identifier {@linkplain #getCode() code}.</li> @@ -88,7 +87,7 @@ import java.util.Objects; * * @author Martin Desruisseaux (IRD, Geomatys) * @since 0.4 (derived from geotk-2.0) - * @version 0.4 + * @version 0.5 * @module */ public class NamedIdentifier extends ImmutableIdentifier implements GenericName { @@ -125,7 +124,7 @@ public class NamedIdentifier extends Imm * * @param identifier The identifier to copy. */ - public NamedIdentifier(final ReferenceIdentifier identifier) { + public NamedIdentifier(final Identifier identifier) { super(identifier); if (identifier instanceof GenericName) { name = (GenericName) identifier; @@ -141,7 +140,7 @@ public class NamedIdentifier extends Imm * @param name The name to wrap. */ public NamedIdentifier(final GenericName name) { - super(name instanceof ReferenceIdentifier ? (ReferenceIdentifier) name : new NameToIdentifier(name)); + super(name instanceof Identifier ? (Identifier) name : new NameToIdentifier(name)); this.name = name; isNameSupplied = true; } Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.io.Serializable; import org.opengis.util.GenericName; +import org.opengis.metadata.Identifier; import org.opengis.referencing.datum.Datum; import org.opengis.referencing.ReferenceSystem; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ReferenceIdentifier; import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.metadata.quality.PositionalAccuracy; @@ -126,11 +126,11 @@ final class Properties extends AbstractM return object.getName(); } case 1: { - final Collection<ReferenceIdentifier> c = object.getIdentifiers(); + final Collection<Identifier> c = object.getIdentifiers(); if (c != null) { final int size = c.size(); if (size != 0) { - return c.toArray(new ReferenceIdentifier[size]); + return c.toArray(new Identifier[size]); } } break; Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -134,7 +134,7 @@ public class AbstractCRS extends Abstrac * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -144,7 +144,7 @@ public class AbstractCRS extends Abstrac * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -130,7 +130,7 @@ public class DefaultCompoundCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -140,7 +140,7 @@ public class DefaultCompoundCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -112,7 +112,7 @@ public class DefaultEngineeringCRS exten * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -122,7 +122,7 @@ public class DefaultEngineeringCRS exten * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -89,7 +89,7 @@ public class DefaultGeocentricCRS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -99,7 +99,7 @@ public class DefaultGeocentricCRS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -20,14 +20,14 @@ import java.util.Map; import java.util.HashMap; import java.util.Arrays; import javax.xml.bind.annotation.XmlTransient; -import org.apache.sis.metadata.iso.citation.Citations; -import org.apache.sis.metadata.iso.ImmutableIdentifier; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.Identifier; import org.opengis.referencing.datum.GeodeticDatum; import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.cs.EllipsoidalCS; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.CoordinateSystemAxis; +import org.apache.sis.metadata.iso.citation.Citations; +import org.apache.sis.metadata.iso.ImmutableIdentifier; import org.apache.sis.referencing.cs.AxesConvention; import org.apache.sis.referencing.AbstractReferenceSystem; import org.apache.sis.io.wkt.Formatter; @@ -99,7 +99,7 @@ public class DefaultGeographicCRS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -109,7 +109,7 @@ public class DefaultGeographicCRS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> @@ -232,7 +232,7 @@ public class DefaultGeographicCRS extend if (axis.getMinimumValue() == Longitude.MIN_VALUE && axis.getMaximumValue() == Longitude.MAX_VALUE) // For excluding the AxesConvention.POSITIVE_RANGE case. { - for (final ReferenceIdentifier identifier : super.getIdentifiers()) { + for (final Identifier identifier : super.getIdentifiers()) { if (EPSG.equals(identifier.getCodeSpace())) try { final int i = Arrays.binarySearch(EPSG_CODES, Short.parseShort(identifier.getCode())); if (i >= 0) { Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -94,7 +94,7 @@ public class DefaultImageCRS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -104,7 +104,7 @@ public class DefaultImageCRS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -115,7 +115,7 @@ public class DefaultTemporalCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -125,7 +125,7 @@ public class DefaultTemporalCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -94,7 +94,7 @@ public class DefaultVerticalCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -104,7 +104,7 @@ public class DefaultVerticalCRS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlType import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import org.opengis.util.GenericName; import org.opengis.util.InternationalString; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.util.GenericName; +import org.opengis.metadata.Identifier; import org.opengis.referencing.cs.AxisDirection; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.CoordinateSystemAxis; @@ -139,7 +139,7 @@ public class AbstractCS extends Abstract * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -149,7 +149,7 @@ public class AbstractCS extends Abstract * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> @@ -169,7 +169,7 @@ public class AbstractCS extends Abstract for (int i=0; i<axes.length; i++) { final CoordinateSystemAxis axis = axes[i]; ensureNonNullElement("axes", i, axis); - final ReferenceIdentifier name = axis.getName(); + final Identifier name = axis.getName(); ensureNonNullElement("axes[#].name", i, name); final AxisDirection direction = axis.getDirection(); ensureNonNullElement("axes[#].direction", i, direction); Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -94,7 +94,7 @@ public class DefaultAffineCS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -104,7 +104,7 @@ public class DefaultAffineCS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -100,7 +100,7 @@ public class DefaultCartesianCS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -110,7 +110,7 @@ public class DefaultCartesianCS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -81,7 +81,7 @@ public class DefaultCompoundCS extends A * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -91,7 +91,7 @@ public class DefaultCompoundCS extends A * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlAttr import javax.xml.bind.annotation.XmlRootElement; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; -import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.Identifier; import org.opengis.referencing.crs.GeodeticCRS; import org.opengis.referencing.cs.RangeMeaning; import org.opengis.referencing.cs.AxisDirection; @@ -253,7 +253,7 @@ public class DefaultCoordinateSystemAxis * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -263,7 +263,7 @@ public class DefaultCoordinateSystemAxis * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> @@ -458,7 +458,7 @@ public class DefaultCoordinateSystemAxis */ private void setMinimum(final Double value) { if (value != null && canSetProperty("minimumValue", minimumValue != NEGATIVE_INFINITY)) { - final double min = value.doubleValue(); + final double min = value; // Apply unboxing. if (min < maximumValue) { minimumValue = min; } else { @@ -492,7 +492,7 @@ public class DefaultCoordinateSystemAxis */ private void setMaximum(final Double value) { if (value != null && canSetProperty("maximumValue", maximumValue != POSITIVE_INFINITY)) { - final double max = value.doubleValue(); + final double max = value; // Apply unboxing. if (max > minimumValue) { maximumValue = max; } else { @@ -664,7 +664,7 @@ public class DefaultCoordinateSystemAxis { return false; } - ReferenceIdentifier name = that.getName(); + Identifier name = that.getName(); if (name != UNNAMED) { /* * Checking the abbreviation is not sufficient. For example the polar angle and the Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -94,7 +94,7 @@ public class DefaultCylindricalCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -104,7 +104,7 @@ public class DefaultCylindricalCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -92,7 +92,7 @@ public class DefaultEllipsoidalCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -102,7 +102,7 @@ public class DefaultEllipsoidalCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -93,7 +93,7 @@ public class DefaultLinearCS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -103,7 +103,7 @@ public class DefaultLinearCS extends Abs * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -92,7 +92,7 @@ public class DefaultPolarCS extends Abst * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -102,7 +102,7 @@ public class DefaultPolarCS extends Abst * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -96,7 +96,7 @@ public class DefaultSphericalCS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -106,7 +106,7 @@ public class DefaultSphericalCS extends * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -95,7 +95,7 @@ public class DefaultTimeCS extends Abstr * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -105,7 +105,7 @@ public class DefaultTimeCS extends Abstr * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -87,7 +87,7 @@ public class DefaultUserDefinedCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -97,7 +97,7 @@ public class DefaultUserDefinedCS extend * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -105,7 +105,7 @@ public class DefaultVerticalCS extends A * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td> + * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -115,7 +115,7 @@ public class DefaultVerticalCS extends A * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td> + * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlRoot import javax.xml.bind.annotation.XmlSeeAlso; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; +import org.opengis.metadata.Identifier; import org.opengis.metadata.extent.Extent; import org.opengis.referencing.datum.Datum; -import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.referencing.AbstractIdentifiedObject; import org.apache.sis.referencing.IdentifiedObjects; import org.apache.sis.util.iso.Types; @@ -171,7 +171,7 @@ public class AbstractDatum extends Abstr * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -181,7 +181,7 @@ public class AbstractDatum extends Abstr * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr> Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1629470&r1=1629469&r2=1629470&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Sun Oct 5 06:10:08 2014 @@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlElem import javax.xml.bind.annotation.XmlRootElement; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; +import org.opengis.metadata.Identifier; import org.opengis.referencing.datum.Ellipsoid; -import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.geometry.DirectPosition2D; import org.apache.sis.internal.util.Numerics; import org.apache.sis.internal.jaxb.Context; @@ -207,7 +207,7 @@ public class DefaultEllipsoid extends Ab * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td> - * <td>{@link ReferenceIdentifier} or {@link String}</td> + * <td>{@link Identifier} or {@link String}</td> * <td>{@link #getName()}</td> * </tr> * <tr> @@ -217,7 +217,7 @@ public class DefaultEllipsoid extends Ab * </tr> * <tr> * <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td> - * <td>{@link ReferenceIdentifier} (optionally as array)</td> + * <td>{@link Identifier} (optionally as array)</td> * <td>{@link #getIdentifiers()}</td> * </tr> * <tr>
