NamedIdentifier changes for revisions 20815:20874

Changes in GeoTools header. The removal of the "or (at your option) any later version" clause must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. This header does not apply to Apache SIS, since the above-cited contributions are omitted.

This commit contains also implementations for new methods added in the GeoAPI 2.1 interface. Removing this commit causes javac to report compilation errors, which are fixed by letting the IDE generating skeleton implementations of those methods. After the IDE generated skeletons, method bodies are straightforward replication of the implementations that existed for the GeoAPI 2.0 methods.

Command line:

svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20815:20874 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/NamedIdentifier.java
Revision 20815Revision 20874
/*
 * Geotools 2 - OpenSource mapping toolkit
 * (C) 2004, Geotools Project Managment Committee (PMC)
 * (C) 2004, Institut de Recherche pour le Développement
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public
 *    License as published by the Free Software Foundation; either
 *    version 2.1 of the License, or (at your option) any later version.
 *
 *    This library is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
/*
 *    GeoTools - OpenSource mapping toolkit
 *    http://geotools.org
 *    (C) 2004-2006, GeoTools Project Managment Committee (PMC)
 * (C) 2004, Institut de Recherche pour le Développement
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public
 *    License as published by the Free Software Foundation;
 *    version 2.1 of the License.
 *
 *    This library is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
*    This package contains documentation from OpenGIS specifications.
*    OpenGIS consortium's work is fully acknowledged here.
*/
 
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
*    Lesser General Public License for more details.
*
*    This package contains documentation from OpenGIS specifications.
*    OpenGIS consortium's work is fully acknowledged here.
*/
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.opengis.util.LocalName;
import org.opengis.util.ScopedName;

// Geotools dependencies
 
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.opengis.util.LocalName;
import org.opengis.util.NameSpace;
import org.opengis.util.ScopedName;

// Geotools dependencies
/**
 * Returns the scope (name space) of this generic name. If this name has no scope
 * (e.g. is the root), then this method returns {@code null}.
 */
public GenericName getScope() {
    return getName().getScope();
 
/**
 * Returns the scope (name space) of this generic name. If this name has no scope
 * (e.g. is the root), then this method returns {@code null}.
 *
 * @deprecated Repalced by scope()
 */
public GenericName getScope() {
    return getName().getScope();
        }
        return hash;
    }
}
 
        }
        return hash;
    }

    /**
     * @since GeoAPI 2.1
     */
        public NameSpace scope() {
                return getName().scope();
}
        /**
         * @since GeoAPI 2.1
         */
        public int depth() {
                return getName().depth();
        }
        /** @since GeoAPI 2.1 */
        public LocalName name() {
                return getName().name();
        }
        /** @since GeoAPI 2.1 */
        public GenericName toFullyQualifiedName() {
                return getName().toFullyQualifiedName();
        }
        /** @since GeoAPI 2.1 */
        public ScopedName push(GenericName scope) {
                return getName().push( scope );
        }
}