Since the getCodeSpace()
method has been added in the GeoAPI interface,
reverting this commit causes a compilation error which can be fixed only by adding back
getCodeSpace()
in this class. Implementation of that method is a straightforward
copy of the getCode()
field and method body with only the name changed.
The (String)
cast has been reverted.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24867:24990 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/NamedIdentifier.java
Revision 24867 | Revision 24990 |
---|---|
import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.parameter.InvalidParameterValueException; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; import org.opengis.util.LocalName; |
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.parameter.InvalidParameterValueException;
import org.opengis.referencing.ReferenceIdentifier;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.opengis.util.LocalName; |
* @version $Id$
* @author Martin Desruisseaux
*/
public class NamedIdentifier implements Identifier, GenericName, Serializable {
/**
* Serial number for interoperability with different versions.
*/ |
* @version $Id$
* @author Martin Desruisseaux
*/
public class NamedIdentifier implements ReferenceIdentifier, GenericName, Serializable {
/**
* Serial number for interoperability with different versions.
*/ |
private final String code; /** * Organization or party responsible for definition and maintenance of the * code space or code. */ |
private final String code; /** * Name or identifier of the person or organization responsible for namespace. */ private final String codespace; /** * Organization or party responsible for definition and maintenance of the * code space or code. */ |
NamedIdentifier(final Map properties, final boolean standalone) throws IllegalArgumentException { ensureNonNull("properties", properties); Object code = null; Object version = null; Object authority = null; Object remarks = null; |
NamedIdentifier(final Map properties, final boolean standalone) throws IllegalArgumentException {
ensureNonNull("properties", properties);
Object code = null;
Object codespace = null;
Object version = null;
Object authority = null;
Object remarks = null; |
}
case 351608024: {
if (key.equals(VERSION_KEY)) {
version = value;
continue;
}
break; |
}
case 351608024: {
if (key.equals(VERSION_KEY)) {
version = (String) value;
continue;
}
break; |
try { key= CODE_KEY; this.code = (String) (value=code); key= VERSION_KEY; this.version = (String) (value=version); key= AUTHORITY_KEY; this.authority = (Citation) (value=authority); key= REMARKS_KEY; this.remarks = (InternationalString) (value=remarks); } catch (ClassCastException exception) { |
try {
key= CODE_KEY; this.code = (String) (value=code);
key= VERSION_KEY; this.version = (String) (value=version);
key= CODESPACE_KEY; this.codespace = (String) (value=codespace);
key= AUTHORITY_KEY; this.authority = (Citation) (value=authority);
key= REMARKS_KEY; this.remarks = (InternationalString) (value=remarks);
} catch (ClassCastException exception) { |
} /** * Organization or party responsible for definition and maintenance of the * {@linkplain #getCode code}. * |
} /** * Name or identifier of the person or organization responsible for namespace. * * @return The codespace, or {@code null} if not available. */ public String getCodeSpace() { return codespace; } /** * Organization or party responsible for definition and maintenance of the * {@linkplain #getCode code}. * |