Added: incubator/sis/ip-review/rev/06942/ModifiableMetadata.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/06942/ModifiableMetadata.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/06942/ModifiableMetadata.xhtml (added) +++ incubator/sis/ip-review/rev/06942/ModifiableMetadata.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,435 @@ + + + + + ModifiableMetadata changes for revisions 6907:6942 + + + +
+

ModifiableMetadata changes for revisions 6907:6942

+

ModifiableMetadata has been initially committed by other GeoTools contributors. + This code (listed in the table below) was merging two distinct purposes in a single class:

+ +

This approach does not reflect the ISO 19115 structure, since MD_Metadata is not + the base class of all metadata. In the Geotk code, the "implements MetaData" clause has been + removed as well as all related methods: getFileIdentifier(), getLanguage(), + getMetadataStandardName() and getMetadataStandardVersion().

+ +

According Subversion history, this commit is the ModifiableMetadata + (geotk source) + ancestor. However it is more appropriate to consider it as the AbstractMetadata + (geotk source) + ancestor.

+ +

The code in this commit uses Java reflection for getting property values from a runtime choosable String + (as opposed to compile-time fixed method invocation). Geotk has keep the idea, but implemented it in a totally different + way:

+ + +

Command line:

+
svn cat -r6942 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/ModifiableMetadata.java
+ + + + +
Revision 6907Revision 6942
/*
+ *    Geotools2 - OpenSource mapping toolkit
+ *    http://geotools.org
+ *    (C) 2002, Geotools Project Managment Committee (PMC)
+ *
+ *    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.
+ *
+ */
+package org.geotools.metadata.iso19115;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.opengis.catalog.MetadataEntity;
+
+import org.geotools.catalog.XPath;
+import org.opengis.metadata.MetaData;
+
+/**
+ * A superclass for implementing ISO19115 MetaData interfaces and allowing
+ * Expr based query via geotools Metadata.Entity and Metadata.Element.
+ *
+ * A subclass implements *MUST* implement minimum one subinterface of
+ * the ISO MetaData interface provided by GeoAPI.
+ *
+ * ISOMetadata uses BeanInfo style reflection to identify all the attributes
+ * implemented by the subclass as part of a GeoAPI MetaData interface.
+ *
+ * The BeanInfo attributes are used to construct all the Metadata.Entity
+ * and Metadata.Element objects.
+ *
+ * The type of each attribue is used to determine whether the element is a
+ * simple Metadata.Element or an Metadata.Entity.
+ * Attributes that subclass GeoAPI ISO19115 MetaData
+ * are turned into Metadata Entities.
+ *
+ * @author jgarnett
+ * @since 2.1
+ */
+public abstract class AbstractMetaData implements MetadataEntity, MetaData {
+    ISO19115Entity entity;
+
+    /**
+     * @see org.geotools.metadata.Metadata#elements()
+     */
+    public final List elements() {
+    	ISO19115Entity entity = (ISO19115Entity) getEntityType();
+    	List elements = new ArrayList( entity.getElements().size() );
+
+        for (Iterator iter = entity.propertyMap().values().iterator(); iter.hasNext();) {
+            PropertyDescriptor descriptor =(PropertyDescriptor) iter.next();
+            Method read = descriptor.getReadMethod();
+            Method method = (Method) descriptor.getReadMethod();
+            try {
+            	Object value = read.invoke( this, null );
+            	elements.add( value );
+            } catch (Exception e) {
+                throw new RuntimeException("There must be a bug in the EntityImpl class during the introspection.",
+                    e);
+            }
+        }
+        return elements;
+    }
+
+    /**
+     * @see org.geotools.metadata.Metadata#getElement(java.lang.String)
+     */
+    public final Object getElement(String xpath) {
+        List elements = XPath.getValue(xpath, this);
+
+        if (elements.isEmpty()) {
+            return null;
+        }
+
+        if (elements.size() == 1) {
+            return elements.get(0);
+        }
+
+        return elements;
+    }
+
+    /**
+     * @see org.geotools.metadata.Metadata#getElement(org.geotools.metadata.ElementType)
+     */
+    public Object getElement(Element element) {
+        ISO19115Element elemImpl;
+
+        if (element instanceof ISO19115Element) {
+            elemImpl = (ISO19115Element) element;
+        } else {
+            elemImpl = (ISO19115Element) getEntityType().getElement(element.getName());
+        }
+        PropertyDescriptor descriptor = elemImpl.getProperty();
+        Method read = descriptor.getReadMethod();
+        try {
+            return read.invoke( this, null );
+        } catch (Exception e) {
+            throw new RuntimeException("There must be a bug in the EntityImpl class during the introspection.",
+                e);
+        }
+    }
+
+
+    /**
+     * @see org.geotools.metadata.Metadata#getEntity()
+     */
+    public EntityType getEntityType() {
+        if (entity == null) {
+            entity = ISO19115Entity.getEntity(getClass());
+        }
+        return entity;
+    }
+
+    /**
+     * The EntityImpl class uses reflection to examine the structure of a metadata
+     *
+     * @see org.geotools.metadata.Metadata.Entity
+     *
+     * @author $author$
+     * @version $Revision: 1.9 $
+     */
+    private static class ISO19115Entity implements EntityType {
+        static HashMap entityMap = new HashMap();
+
+        /** Map of PropertyDescriptor by name */
+        Map propertyMap;
+
+        private ArrayList elements;
+
+        private ISO19115Entity(Class clazz) {
+            init(clazz);
+        }
+
+        /**
+         * Gets or creates the Enity instance that descibes the Class passed in as an argument
+         *
+         * @param clazz The class of a metadata to be inspected
+         *
+         * @return A Metadata.Entity that descibes the class passed in by the class clazz
+         */
+        public static ISO19115Entity getEntity(Class clazz) {
+            if (!entityMap.containsKey(clazz)) {
+                entityMap.put(clazz, new ISO19115Entity(clazz));
+            }
+            return (ISO19115Entity) entityMap.get(clazz);
+        }
+        /**
+         * Returns Map of attribtues by name for all this class.
+         * <p>
+         * Should only be called against interfaces that extend
+         * the GeoAPI ISO MetaData interface.
+         * </p>
+         * @param type
+         * @return
+         */
+        private final Map introspectISO19115( Class metaDataType ){
+            BeanInfo beanInfo;
+            try {
+                beanInfo = Introspector.getBeanInfo( metaDataType );
+                return toMap( beanInfo.getPropertyDescriptors() );
+            } catch (IntrospectionException e) {
+                throw new RuntimeException(
+                        "Could not inspect "+ metaDataType.getName() +
+                        " for "+this.getClass().getName()+":"+e.getMessage(),
+                        e);
+            }
+        }
+        /**
+         * Convert to Map of PropertyDescriptor by name.
+         * <p>
+         * Not only properties that can be read will be added.
+         */
+        private final Map toMap( PropertyDescriptor descriptors[] ){
+            if( descriptors == null ){
+                return Collections.EMPTY_MAP;
+            }
+            Map map = new HashMap();
+            for( int i=0; i<descriptors.length; i++){
+                PropertyDescriptor descriptor = descriptors[i];
+                if( descriptor.getReadMethod() != null ){
+                    map.put( descriptor.getName(), descriptor );
+                }
+            }
+            return map;
+        }
+        private final boolean isMetaDataInterface( Class type ){
+            if( type == null ){
+                return false;
+            }
+            if ( org.opengis.metadata.MetaData.class == type ){
+                return true;
+            }
+            Class interfaces[] = type.getInterfaces();
+            for( int i=0; i<interfaces.length; i++){
+                if( isMetaDataInterface( interfaces[i] )){
+                    return true;
+                }
+            }
+            return isMetaDataInterface( type.getSuperclass() );
+        }
+        private final Map introspect( Class baseType ){
+            Map map = new TreeMap();
+
+            for( Class type=baseType; type != null; type = type.getSuperclass() ){
+                Class interfaces[] = type.getInterfaces();
+                if( interfaces != null){
+                    for( int i=0; i<interfaces.length; i++){
+                        //System.out.println("\t interface "+interfaces[i] + " "+isMetaDataInterface( interfaces[i] ) );
+                        if( isMetaDataInterface( interfaces[i] ) ){
+                            Map properties = introspectISO19115( interfaces[i] );
+                            map.putAll( properties );
+                        }
+                    }
+                }
+            }
+            return map;
+        }
+        private void init(Class type) {
+            propertyMap = introspect( type );
+
+            elements = new ArrayList( propertyMap.size() );
+            for( Iterator i=propertyMap.values().iterator(); i.hasNext(); ){
+                PropertyDescriptor property = (PropertyDescriptor) i.next();
+                ISO19115Element element = new ISO19115Element( property );
+                elements.add( element );
+            }
+        }
+        private Map propertyMap(){
+            return propertyMap;
+        }
+        private PropertyDescriptor property( String name ){
+            return (PropertyDescriptor) propertyMap.get( name );
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Entity#getElement(java.lang.String)
+         */
+        public Object getElement(String xpath) {
+            List result = XPath.getElement(xpath, this);
+
+            if (result.isEmpty()) {
+                return null;
+            }
+
+            if (result.size() == 1) {
+                return result.get(0);
+            }
+
+            return result;
+        }
+        /**
+         * @see org.geotools.metadata.Metadata.Entity#getElements()
+         */
+        public List getElements() {
+            return elements;
+        }
+
+        /**
+         * @param elementClass
+         * @return Trye if type is a GeoAPI ISO Metadata class
+         */
+        public static boolean isEntity(Class type) {
+            return MetaData.class.isAssignableFrom(type);
+        }
+    }
+
+    /**
+     * A basic implementation of the Metadata.Element class
+     * @see org.geotools.metadata.Metadata.Element
+     *
+     * @author $author$
+     * @version $Revision: 1.9 $
+     */
+    private static class ISO19115Element implements Element {
+        private PropertyDescriptor property;
+        private EntityType entity;
+
+        /**
+         * @param elementClass
+         */
+        public ISO19115Element( PropertyDescriptor property) {
+            this.property = property;
+            Class type = property.getPropertyType();
+            if( ISO19115Entity.isEntity( type )) {
+                entity = ISO19115Entity.getEntity( type );
+            }
+            else {
+            	entity = null;
+            }
+        }
+
+        /**
+         * Returns the java.lang.reflect.Method that can access the element data.
+         */
+        public PropertyDescriptor getProperty() {
+            return property;
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Element#getType()
+         */
+        public Class getType() {
+            return property.getPropertyType();
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Element#getName()
+         */
+        public String getName() {
+            return property.getName();
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Element#isNillable()
+         */
+        public boolean isNillable() {
+            return false;
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Element#isMetadataEntity()
+         */
+        public boolean isMetadataEntity() {
+            return entity != null;
+        }
+
+        /**
+         * @see org.geotools.metadata.Metadata.Element#isMetadataEntity()
+         */
+        public EntityType getEntityType() {
+            return entity;
+        }
+        public String toString(){
+            return property.getName();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.opengis.metadata.MetaData#getFileIdentifier()
+     */
+    public String getFileIdentifier() {
+        String className = getClass().getName();
+        String name = className.substring( className.lastIndexOf(".") );
+        return  name+".java";
+    }
+
+    /* (non-Javadoc)
+     * @see org.opengis.metadata.MetaData#getLanguage()
+     */
+    public Locale getLanguage() {
+        return Locale.getDefault();
+    }
+
+    public String getMetadataStandardName() {
+        return "ISO19115";
+    }
+    public String getMetadataStandardVersion() {
+        return "5.0";
+    }
+}
+
+ + Added: incubator/sis/ip-review/rev/06978/DefaultCitation.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/06978/DefaultCitation.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/06978/DefaultCitation.xhtml (added) +++ incubator/sis/ip-review/rev/06978/DefaultCitation.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,234 @@ + + + + + DefaultCitation changes for revisions 6976:6978 + + + +
+

DefaultCitation changes for revisions 6976:6978

+

This commit adds trivial getter and setter methods for attributes defined by the + ISO 19115 standard. There is no way the method signatures could be different in Geotk, + since this class implements an external interface. The method bodies and annotations + are different in Geotk in their handling of collections (performing copies when necessary), + checks for write permission, synchronization, JAXB annotations and more.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r6976:6978 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationImpl.java
+ + + + + + + + + + +
Revision 6976Revision 6978
// J2SE direct dependencies
+import java.util.Date;
+import java.util.Locale;
+import java.io.Serializable;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Series;
+
+// Geotools dependencies
+import org.geotools.resources.Utilities;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.PresentationForm;
+
+
+/**
// J2SE direct dependencies
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.io.Serializable;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Series;
+
+// Geotools dependencies
+import org.geotools.metadata.iso19115.ListOf;
+import org.geotools.metadata.iso19115.SetOf;
+import org.geotools.resources.Utilities;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.util.InternationalString;
+
+
+/**
public static final Citation GEOTOOLS = new Citation("Geotools");
+
+/**
+ * An immutable empty array of strings.
+ */
+private static final String[] EMPTY = new String[0];
+
+/**
+ * An immutable empty array of responsible party.
+ */
    public static final Citation GEOTOOLS = new Citation("Geotools");
+
+    /**
+     * Construct a citation with the specified title.
+     */
+    public Citation(final String title) {
+        this.title = null; // new InternationalString( title )
+    }
+    private List alternateTitles = new ListOf( InternationalString.class );
+    private Set citedResponsibleParties = new SetOf( ResponsibleParty.class );
+
+    private InternationalString title;
+    private Map dates = new HashMap();
+    private InternationalString edition;
+    private Date editionDate;
+    private Set identifiers = new SetOf( String.class );
+    private Set identifierTypes = new SetOf( String.class );
+
+    private Set presentationForm = new SetOf( PresentationForm.class );
+    private Series series;
+    private InternationalString otherCitationDetails;
+    private InternationalString collectiveTitle;
+    private String ISBN;
+    private String ISSN;
+    public List getAlternateTitles() {
+        return alternateTitles;
+    }
+    public void setAlternateTitles(List alternateTitles) {
+        this.alternateTitles = alternateTitles;
+    }
+    public Set getCitedResponsibleParties() {
+        return citedResponsibleParties;
+    }
+    public void setCitedResponsibleParties(Set citedResponsibleParties) {
+        this.citedResponsibleParties = citedResponsibleParties;
+    }
+    public InternationalString getCollectiveTitle() {
+        return collectiveTitle;
+    }
+    public void setCollectiveTitle(InternationalString collectiveTitle) {
+        this.collectiveTitle = collectiveTitle;
+    }
+    public Map getDates() {
+        return dates;
+    }
+    public void setDates(Map dates) {
+        this.dates = dates;
+    }
+    public InternationalString getEdition() {
+        return edition;
+    }
+    public void setEdition(InternationalString edition) {
+        this.edition = edition;
+    }
+    public Date getEditionDate() {
+        return editionDate;
+    }
+    public void setEditionDate(Date editionDate) {
+        this.editionDate = editionDate;
+    }
+    public Set getIdentifiers() {
+        return identifiers;
+    }
+    public void setIdentifiers(Set identifiers) {
+        this.identifiers.clear();
+        this.identifiers.addAll( identifiers );
+    }
+    public Set getIdentifierTypes() {
+        return identifierTypes;
+    }
+    public void setIdentifierTypes(Set identifierTypes) {
+        this.identifierTypes.clear();
+        this.identifierTypes.addAll(identifierTypes);
+    }
+    public String getISBN() {
+        return ISBN;
+    }
+    public void setISBN(String isbn) {
+        ISBN = isbn;
+    }
+    public String getISSN() {
+        return ISSN;
+    }
+    public void setISSN(String issn) {
+        ISSN = issn;
+    }
+    public InternationalString getOtherCitationDetails() {
+        return otherCitationDetails;
+    }
+    public void setOtherCitationDetails(InternationalString otherCitationDetails) {
+        this.otherCitationDetails = otherCitationDetails;
+    }
+    public Set getPresentationForm() {
+        return presentationForm;
+    }
+    public void setPresentationForm(Set presentationForm) {
+        this.presentationForm.clear();
+        this.presentationForm.addAll( presentationForm );
+    }
+    public Series getSeries() {
+        return series;
+    }
+    public void setSeries(Series series) {
+        this.series = series;
+    }
+    public InternationalString getTitle() {
+        return title;
+    }
+    public void setTitle(InternationalString title) {
+        this.title = title;
+    }
+}
+class Commented {
+    /**
+     * An immutable empty array of strings.
+     */
+    private static final String[] EMPTY = new String[0];
+    /**
+     * An immutable empty array of responsible party.
+     */
 */
+private static final PresentationForm[] EMPTY_PRESENTATION = new PresentationForm[0];
+
+/**
+ * The title.
+ */
+private final String title;
+
+/**
+ * Construct a citation with the specified title.
+ */
+public Citation(final String title) {
+    this.title = title;
+}
+
+/**
+ * Name by which the cited resource is known.
+ *
+ * @param  locale The desired locale for the title to be returned, or <code>null</code>
 */
+private static final PresentationForm[] EMPTY_PRESENTATION = new PresentationForm[0];
+
+private String title;
+/**
+ * Name by which the cited resource is known.
+ *
+ * @param  locale The desired locale for the title to be returned, or <code>null</code>
 */
+public boolean equals(final Object object) {
+    if (object!=null && object.getClass().equals(getClass())) {
+        final Citation that = (Citation) object;
+        return Utilities.equals(this.title, that.title);
+    }
+    return false;
 */
+public boolean equals(final Object object) {
+    if (object!=null && object.getClass().equals(getClass())) {
+        final Commented that = (Commented) object;
+        return Utilities.equals(this.title, that.title);
+    }
+    return false;
+
+ + Added: incubator/sis/ip-review/rev/06978/HEADER.html URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/06978/HEADER.html?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/06978/HEADER.html (added) +++ incubator/sis/ip-review/rev/06978/HEADER.html Mon Sep 17 04:18:09 2012 @@ -0,0 +1,17 @@ + + + + + Revision 6978 + + +
+

Revision 6978

+ + + + +
Author:jgarnett
Date:2004-07-19
Message:use of InternationalString
+
+ + Propchange: incubator/sis/ip-review/rev/06978/HEADER.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sis/ip-review/rev/06978/HEADER.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: incubator/sis/ip-review/rev/07197/HEADER.html URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/07197/HEADER.html?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/07197/HEADER.html (added) +++ incubator/sis/ip-review/rev/07197/HEADER.html Mon Sep 17 04:18:09 2012 @@ -0,0 +1,17 @@ + + + + + Revision 7197 + + +
+

Revision 7197

+ + + + +
Author:jeichar
Date:2004-07-22
Message:MetadataEntity fixed
+
+ + Propchange: incubator/sis/ip-review/rev/07197/HEADER.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sis/ip-review/rev/07197/HEADER.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: incubator/sis/ip-review/rev/07197/ModifiableMetadata.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/07197/ModifiableMetadata.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/07197/ModifiableMetadata.xhtml (added) +++ incubator/sis/ip-review/rev/07197/ModifiableMetadata.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,71 @@ + + + + + ModifiableMetadata changes for revisions 7196:7197 + + + +
+

ModifiableMetadata changes for revisions 7196:7197

+

This commit contains change in code that do not exist anymore in Geotk. + See revision 6942 for more information.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7196:7197 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/ModifiableMetadata.java
+ + + + + + + + +
Revision 7196Revision 7197
import org.opengis.util.Cloneable;
+
+// Geotools dependencies
+import org.geotools.catalog.XPath;
+import org.geotools.resources.Utilities;
+import org.geotools.resources.rsc.Resources;
+import org.geotools.resources.rsc.ResourceKeys;
+
+
+/**
import org.opengis.util.Cloneable;
+
+// Geotools dependencies
+import org.geotools.resources.Utilities;
+import org.geotools.resources.rsc.Resources;
+import org.geotools.resources.rsc.ResourceKeys;
+import org.geotools.xml.XPathFactory;
+
+
+/**
 * @return element value, List of element value, or null if xPath did not match anything.
+ */
+public final Object getElement(final String xpath) {
+    final List elements = XPath.getValue(xpath, this);
+    switch (elements.size()) {
+        case 0:  return null;
+        case 1:  return elements.get(0);
 * @return element value, List of element value, or null if xPath did not match anything.
+ */
+public final Object getElement(final String xpath) {
+    final List elements = XPathFactory.value(xpath, this);
+    switch (elements.size()) {
+        case 0:  return null;
+        case 1:  return elements.get(0);
 * 		A List is many Elements are found to match the xpath.
+ */
+public Object getElement(final String xpath) {
+    final List result = XPath.getElement(xpath, this);
+    switch (result.size()) {
+        case 0:  return null;
+        case 1:  return result.get(0);
 * 		A List is many Elements are found to match the xpath.
+ */
+public Object getElement(final String xpath) {
+    final List result = XPathFactory.find(xpath, this);
+    switch (result.size()) {
+        case 0:  return null;
+        case 1:  return result.get(0);
+
+ + Added: incubator/sis/ip-review/rev/10796/DefaultAddress.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/DefaultAddress.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/DefaultAddress.xhtml (added) +++ incubator/sis/ip-review/rev/10796/DefaultAddress.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,84 @@ + + + + + DefaultAddress changes for revisions 10795:10796 + + + +
+

DefaultAddress changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/AddressImpl.java
+ + + + + + + + +
Revision 10795Revision 10796
/*
+ * 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
/*
+ * 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
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Set;
+import java.util.Iterator;
+import java.util.Collections;
+
+// OpenGIS dependencies
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.util.CheckedHashSet;
+import org.geotools.resources.Utilities;
+
+
+/**
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+import org.geotools.util.CheckedHashSet;
+import org.opengis.util.InternationalString;
+
+
+/**
 *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Touraïvane
+ */
+public class Address extends MetadataEntity
+       implements org.opengis.metadata.citation.Address
 *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Toura�vane
+ */
+public class Address extends MetadataEntity
+       implements org.opengis.metadata.citation.Address
+
+ + Added: incubator/sis/ip-review/rev/10796/DefaultCitation.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/DefaultCitation.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/DefaultCitation.xhtml (added) +++ incubator/sis/ip-review/rev/10796/DefaultCitation.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,97 @@ + + + + + DefaultCitation changes for revisions 10795:10796 + + + +
+

DefaultCitation changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationImpl.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * 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
/*
+ * 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
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.Locale;
+import java.util.Iterator;
+import java.util.Collections;
+import java.io.Serializable;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Series;
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.util.CheckedHashSet;
+import org.geotools.util.CheckedHashMap;
+import org.geotools.util.CheckedArrayList;
+import org.geotools.util.SimpleInternationalString;
+import org.geotools.resources.Utilities;
+
+
+/**
+ * Standardized resource reference.
+ *
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+import org.geotools.util.CheckedArrayList;
+import org.geotools.util.CheckedHashMap;
+import org.geotools.util.CheckedHashSet;
+import org.geotools.util.SimpleInternationalString;
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Series;
+import org.opengis.util.InternationalString;
+
+
+/**
+ * Standardized resource reference.
+ *
+
+ + Added: incubator/sis/ip-review/rev/10796/DefaultContact.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/DefaultContact.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/DefaultContact.xhtml (added) +++ incubator/sis/ip-review/rev/10796/DefaultContact.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,81 @@ + + + + + DefaultContact changes for revisions 10795:10796 + + + +
+

DefaultContact changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ContactImpl.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * 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
/*
+ * 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
package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Address;
+import org.opengis.metadata.citation.OnLineResource;
+import org.opengis.metadata.citation.Telephone;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+
+
+/**
+ * Information required to enable contact with the responsible person and/or organization.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Touraïvane
+ */
+public class Contact extends MetadataEntity
+       implements org.opengis.metadata.citation.Contact
package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+import org.opengis.metadata.citation.Address;
+import org.opengis.metadata.citation.OnLineResource;
+import org.opengis.metadata.citation.Telephone;
+import org.opengis.util.InternationalString;
+
+
+/**
+ * Information required to enable contact with the responsible person and/or organization.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Toura�vane
+ */
+public class Contact extends MetadataEntity
+       implements org.opengis.metadata.citation.Contact
+
+ + Added: incubator/sis/ip-review/rev/10796/DefaultOnlineResource.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/DefaultOnlineResource.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/DefaultOnlineResource.xhtml (added) +++ incubator/sis/ip-review/rev/10796/DefaultOnlineResource.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,88 @@ + + + + + DefaultOnlineResource changes for revisions 10795:10796 + + + +
+

DefaultOnlineResource changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/OnLineResourceImpl.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * 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
/*
+ * 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
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.MalformedURLException;
+import java.io.UnsupportedEncodingException;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.OnLineFunction;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+
+
+/**
+ * Information about on-line sources from which the dataset, specification, or
+ * community profile name and extended metadata elements can be obtained.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Touraïvane
+ */
+public class OnLineResource extends MetadataEntity
+       implements org.opengis.metadata.citation.OnLineResource
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+import org.opengis.metadata.citation.OnLineFunction;
+import org.opengis.util.InternationalString;
+
+
+/**
+ * Information about on-line sources from which the dataset, specification, or
+ * community profile name and extended metadata elements can be obtained.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Toura�vane
+ */
+public class OnLineResource extends MetadataEntity
+       implements org.opengis.metadata.citation.OnLineResource
+
+ + Added: incubator/sis/ip-review/rev/10796/DefaultResponsibleParty.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/DefaultResponsibleParty.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/DefaultResponsibleParty.xhtml (added) +++ incubator/sis/ip-review/rev/10796/DefaultResponsibleParty.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,83 @@ + + + + + DefaultResponsibleParty changes for revisions 10795:10796 + + + +
+

DefaultResponsibleParty changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ResponsiblePartyImpl.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * 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
/*
+ * 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
package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Role;
+import org.opengis.metadata.citation.Contact;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies
+import org.geotools.util.SimpleInternationalString;
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+
+
+/**
+ * Identification of, and means of communication with, person(s) and
+ * organizations associated with the dataset.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Touraïvane
+ */
+public class ResponsibleParty extends MetadataEntity
+       implements org.opengis.metadata.citation.ResponsibleParty
package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.resources.Utilities;
+import org.geotools.util.SimpleInternationalString;
+import org.opengis.metadata.citation.Contact;
+import org.opengis.metadata.citation.Role;
+import org.opengis.util.InternationalString;
+
+
+/**
+ * Identification of, and means of communication with, person(s) and
+ * organizations associated with the dataset.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+ * @author Toura�vane
+ */
+public class ResponsibleParty extends MetadataEntity
+       implements org.opengis.metadata.citation.ResponsibleParty
+
+ + Added: incubator/sis/ip-review/rev/10796/HEADER.html URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/HEADER.html?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/HEADER.html (added) +++ incubator/sis/ip-review/rev/10796/HEADER.html Mon Sep 17 04:18:09 2012 @@ -0,0 +1,17 @@ + + + + + Revision 10796 + + +
+

Revision 10796

+ + + + +
Author:dzwiers
Date:2005-01-28
Message:imports cleaned
+
+ + Propchange: incubator/sis/ip-review/rev/10796/HEADER.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sis/ip-review/rev/10796/HEADER.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: incubator/sis/ip-review/rev/10796/IndexedResourceBundle.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/IndexedResourceBundle.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/IndexedResourceBundle.xhtml (added) +++ incubator/sis/ip-review/rev/10796/IndexedResourceBundle.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,84 @@ + + + + + IndexedResourceBundle changes for revisions 10795:10796 + + + +
+

IndexedResourceBundle changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/IndexedResourceBundle.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le D�veloppement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
package org.geotools.resources;
+
+// Utilities
+import java.util.Locale;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import java.util.MissingResourceException;
+
+// Text format
+import java.text.MessageFormat;
+
+// Input / output
+import java.io.Writer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+
+// Logging
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.LogRecord;
+
+
+/**
package org.geotools.resources;
+
+// Utilities
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.text.MessageFormat;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.NoSuchElementException;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+
+/**
+
+ + Added: incubator/sis/ip-review/rev/10796/IndexedResourceCompiler.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/IndexedResourceCompiler.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/IndexedResourceCompiler.xhtml (added) +++ incubator/sis/ip-review/rev/10796/IndexedResourceCompiler.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,98 @@ + + + + + IndexedResourceCompiler changes for revisions 10795:10796 + + + +
+

IndexedResourceCompiler changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/IndexedResourceCompiler.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le D�veloppement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
package org.geotools.resources;
+
+// Collections
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Collections;
+import java.util.Arrays;
+
+// Input/output
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.DataOutputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.Writer;
+
+// Miscellaneous
+import java.util.Comparator;
+import java.util.StringTokenizer;
+import java.text.MessageFormat;
+import java.lang.reflect.Field;
+
+
+/**
package org.geotools.resources;
+
+// Collections
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+
+/**
+
+ + Added: incubator/sis/ip-review/rev/10796/Utilities.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/10796/Utilities.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/10796/Utilities.xhtml (added) +++ incubator/sis/ip-review/rev/10796/Utilities.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,56 @@ + + + + + Utilities changes for revisions 10795:10796 + + + +
+

Utilities changes for revisions 10795:10796

+

Changes in this commit seem to be the result of some "auto reformat" tool execution. +The Java - GeoAPI - GeoTools import ordering is altered, +imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. +This commit has been reverted, except for the removal of really unused imports which are keep removed.

+

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/util/Utilities.java
+ + + + + + +
Revision 10795Revision 10796
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+ * (C) 2001, Institut de Recherche pour le D�veloppement
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
// Collections and arrays
+import java.util.Arrays;
+
+// Logging
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.LogRecord;
+
+
+/**
// Collections and arrays
+import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+
+/**
+
+ + Added: incubator/sis/ip-review/rev/11096/DefaultCitation.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/11096/DefaultCitation.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/11096/DefaultCitation.xhtml (added) +++ incubator/sis/ip-review/rev/11096/DefaultCitation.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,198 @@ + + + + + Citations changes for revisions 11095:11096 + + + +
+

Citations changes for revisions 11095:11096

+

Addition of pre-defined constants. In Geotk, those constants are not defined anymore in the +DefaultCitation class. They are defined in the Citations class instead. +For the Apache SIS project, the plan is to replace the programmatic construction of those constants +by entries in an embedded database. The metadata-sql module can handle this task.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r11095:11096 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationImpl.java
+ + + + + + + + + + +
Revision 11095Revision 11096
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
import org.geotools.util.CheckedHashSet;
+import org.geotools.util.SimpleInternationalString;
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Series;
+import org.opengis.util.InternationalString;
import org.geotools.util.CheckedHashSet;
+import org.geotools.util.SimpleInternationalString;
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.citation.OnLineFunction;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Role;
+import org.opengis.metadata.citation.Series;
+import org.opengis.util.InternationalString;
    OPEN_GIS.setPresentationForm(Collections.singleton(PresentationForm.DOCUMENT_DIGITAL));
+    OPEN_GIS.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("OGC")));
+    OPEN_GIS.setCitedResponsibleParties(Collections.singleton(
+             org.geotools.metadata.citation.ResponsibleParty.OPEN_GIS));
+    OPEN_GIS.freeze();
+}
+
+/**
+ * The <A HREF="http://www.epsg.org">European Petroleum Survey Group</A> authority.
+ *
+ * @see org.geotools.metadata.citation.ResponsibleParty#EPSG
+ */
+public static final Citation EPSG = new Citation("European Petroleum Survey Group");
+static {
    OPEN_GIS.setPresentationForm(Collections.singleton(PresentationForm.DOCUMENT_DIGITAL));
+    OPEN_GIS.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("OGC")));
+    OPEN_GIS.setCitedResponsibleParties(Collections.singleton(
+             org.geotools.metadata.citation.ResponsibleParty.OGC));
+    OPEN_GIS.freeze();
+}
+
+private static ResponsibleParty ogc( Role role, OnLineFunction function, String url ){
+    try {
+        return org.geotools.metadata.citation.ResponsibleParty.ogc( role, function, new URL( url ) );
+    }
+    catch( MalformedURLException badContact ){
+        return org.geotools.metadata.citation.ResponsibleParty.OGC;
+    }
+}
+/**
+ * The <A HREF="http://www.opengis.org/docs/01-068r3.pdf">WMS 1.1.1</A>
+ * (01-068r3) "Automatic Projections" Authority.
+ * <p>
+ * Here is the assumptions used by the CRSAuthorityFactory to locate an
+ * authority on AUTO data:
+ * <ul>
+ * <li>getTitle() returns something human readable
+ * <li>getIdentifiers().contains( "AUTO" )
+ * </ul>
+ * </p>
+ * <p>
+ * Warning: different from AUTO2 used for WMS 1.3.0.
+ * </p>
+ * @see http://www.opengeospatial.org/
+ * @see http://www.opengis.org/docs/01-068r3.pdf
+ * @see org.geotools.metadata.citation.ResponsibleParty#OGC
+ */
+public static final Citation AUTO = new Citation("Automatic Projections");
+static { // Sanity check ensure that all @see tags are actually available in the metadata
+    try {
+        AUTO.setPresentationForm(Collections.singleton(PresentationForm.MODEL_DIGITAL));
+
+        List titles = new ArrayList();
+        titles.add( new SimpleInternationalString("AUTO"));
+        titles.add( new SimpleInternationalString("WMS 1.1.1"));
+        titles.add( new SimpleInternationalString("OGC 01-068r2"));
+        AUTO.setAlternateTitles( titles );
+
+        Set parties = new HashSet();
+        parties.add( ogc( Role.POINT_OF_CONTACT, OnLineFunction.INFORMATION, "http://www.opengeospatial.org/" ));
+        parties.add( ogc( Role.OWNER, OnLineFunction.INFORMATION, "http://www.opengis.org/docs/01-068r3.pdf" ));
+        AUTO.setCitedResponsibleParties( parties );
+
+        AUTO.setIdentifiers( Collections.singleton("AUTO") );
+        AUTO.freeze();
+    }
+    catch( Throwable t ){
+        t.printStackTrace();
+    }
+}
+
+/**
+ * The <A HREF="http://portal.opengis.org/files/?artifact_id=5316">WMS 1.3.0</A>
+ * (01-068r3) "Automatic Projections" Authority.
+ * <p>
+ * Here is the assumptions used by the CRSAuthorityFactory to locate an
+ * authority on AUTO2 data:
+ * <ul>
+ * <li>getTitle() returns something human readable
+ * <li>getIdentifiers().contains( "AUTO2" )
+ * </ul>
+ * </p>
+ * <p>
+ * Warning: different from AUTO used for WMS 1.1.1. and earlier.
+ * </p>
+ * @see http://portal.opengis.org/files/?artifact_id=5316
+ * @see org.geotools.metadata.citation.ResponsibleParty#OGC
+ */
+public static final Citation AUTO2 = new Citation("Automatic Projections");
+static {
+    try {
+        AUTO2.setPresentationForm(Collections.singleton(PresentationForm.MODEL_DIGITAL));
+
+        List titles = new ArrayList();
+        titles.add( new SimpleInternationalString("AUTO2"));
+        titles.add( new SimpleInternationalString("WMS 1.3.0"));
+        titles.add( new SimpleInternationalString("OGC 04-024"));
+        AUTO2.setAlternateTitles( titles );
+
+        Set parties = new HashSet();
+        parties.add( ogc( Role.POINT_OF_CONTACT, OnLineFunction.INFORMATION, "http://www.opengeospatial.org/" ));
+        parties.add( ogc( Role.OWNER, OnLineFunction.INFORMATION, "http://portal.opengis.org/files/?artifact_id=5316" ));
+        AUTO2.setCitedResponsibleParties( parties );
+
+        AUTO2.setIdentifiers( Collections.singleton("AUTO2") );
+        AUTO2.freeze();
+    }
+    catch( Throwable t ){
+        t.printStackTrace();
+    }
+}
+
+/**
+ * The <A HREF="http://www.epsg.org">European Petroleum Survey Group</A> authority.
+ * <p>
+ * Here is the assumptions used by the CRSAuthorityFactory to locate an
+ * authority on EPSG data:
+ * <ul>
+ * <li>getTitle() returns something human readable
+ * <li>getIdentifiers().contains( "EPSG" )
+ * </ul>
+ * </p>
+ * @see org.geotools.metadata.citation.ResponsibleParty#OGC
+ */
+public static final Citation EPSG = new Citation("European Petroleum Survey Group");
+static {
    EPSG.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("EPSG")));
+    EPSG.setCitedResponsibleParties(Collections.singleton(
+         org.geotools.metadata.citation.ResponsibleParty.EPSG));
+    EPSG.freeze();
+}
    EPSG.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("EPSG")));
+    EPSG.setCitedResponsibleParties(Collections.singleton(
+         org.geotools.metadata.citation.ResponsibleParty.EPSG));
+    EPSG.setIdentifiers( Collections.singleton("EPSG") );
+    EPSG.freeze();
+}
+
+ + Added: incubator/sis/ip-review/rev/11096/DefaultContact.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/11096/DefaultContact.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/11096/DefaultContact.xhtml (added) +++ incubator/sis/ip-review/rev/11096/DefaultContact.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,60 @@ + + + + + DefaultContact changes for revisions 11095:11096 + + + +
+

DefaultContact changes for revisions 11095:11096

+

Addition of pre-defined constants. Those constants will be replaced by entries in an embedded +database for the Apache SIS project. The metadata-sql module can handle this task.

+

The comment in the empty constructor has been removed.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r11095:11096 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ContactImpl.java
+ + + + + + +
Revision 11095Revision 11096
 *
+ * @see org.geotools.metadata.citation.OnLineResource#OPEN_GIS
+ */
+public static final Contact OPEN_GIS = new Contact();
+static {
+    OPEN_GIS.setOnLineResource(org.geotools.metadata.citation.OnLineResource.OPEN_GIS);
 *
+ * @see org.geotools.metadata.citation.OnLineResource#OPEN_GIS
+ */
+public static final Contact OGC = new Contact();
+static {
+    OGC.setOnLineResource(org.geotools.metadata.citation.OnLineResource.OGC );
+    OGC.freeze();
+}
+/**
+ * Contact informations for the <A HREF="http://www.opengis.org">OpenGIS consortium</A>.
+ *
+ * @see org.geotools.metadata.citation.OnLineResource#OPEN_GIS
+ */
+public static final Contact OPEN_GIS = new Contact();
+static {
+    OPEN_GIS.setOnLineResource(org.geotools.metadata.citation.OnLineResource.OPEN_GIS);
 * Constructs an initially empty contact.
+ */
+public Contact() {
+}
+
+/**
 * Constructs an initially empty contact.
+ */
+public Contact() {
+    // empty constructor, please use set methods and call
+    // freeze before returning this instance to client code
+}
+
+/**
+
+ + Added: incubator/sis/ip-review/rev/11096/DefaultOnlineResource.xhtml URL: http://svn.apache.org/viewvc/incubator/sis/ip-review/rev/11096/DefaultOnlineResource.xhtml?rev=1386467&view=auto ============================================================================== --- incubator/sis/ip-review/rev/11096/DefaultOnlineResource.xhtml (added) +++ incubator/sis/ip-review/rev/11096/DefaultOnlineResource.xhtml Mon Sep 17 04:18:09 2012 @@ -0,0 +1,80 @@ + + + + + DefaultOnlineResource changes for revisions 11095:11096 + + + +
+

DefaultOnlineResource changes for revisions 11095:11096

+

Addition of pre-defined constants. Those constants will be replaced by entries in an embedded +database for the Apache SIS project. The metadata-sql module can handle this task.

+ +

Command line:

+
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r11095:11096 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/OnLineResourceImpl.java
+ + + + + + + + +
Revision 11095Revision 11096
private static final long serialVersionUID = 5412370008274334799L;
+
+/**
+ * The online resources for the <A HREF="http://www.opengis.org">OpenGIS consortium</A>.
+ */
+public static final OnLineResource OPEN_GIS = new OnLineResource();
private static final long serialVersionUID = 5412370008274334799L;
+
+/**
+ * The online resources for the <A HREF="http://www.opengis.org">Open Geospatial Consortium</A>.
+ * @see OPEN_GIS
+ */
+public static final OnLineResource OGC = new OnLineResource();
+
+/**
+ * The online resources for the <A HREF="http://www.opengis.org">OpenGIS consortium</A>.
+ */
+public static final OnLineResource OPEN_GIS = new OnLineResource();
public static final OnLineResource GEOTOOLS = new OnLineResource();
+static {
+    try {
+        OPEN_GIS.setLinkage(new URL("http://www.opengis.org"              ));
+        EPSG    .setLinkage(new URL("http://www.epsg.org"                 ));
+        GEOTIFF .setLinkage(new URL("http://www.remotesensing.org/geotiff"));
public static final OnLineResource GEOTOOLS = new OnLineResource();
+static {
+    try {
+        OGC.     setLinkage(new URL("http://www.opengeospatial.org/"      ));
+        OPEN_GIS.setLinkage(new URL("http://www.opengis.org"              ));
+        EPSG    .setLinkage(new URL("http://www.epsg.org"                 ));
+        GEOTIFF .setLinkage(new URL("http://www.remotesensing.org/geotiff"));
    // Should never happen.
+    throw new ExceptionInInitializerError(exception);
+}
+OPEN_GIS.setFunction(OnLineFunction.DOWNLOAD);
+EPSG    .setFunction(OnLineFunction.DOWNLOAD);
+GEOTIFF .setFunction(OnLineFunction.DOWNLOAD);
+ESRI    .setFunction(OnLineFunction.INFORMATION);
+GEOTOOLS.setFunction(OnLineFunction.DOWNLOAD);
+
+OPEN_GIS.freeze();
+EPSG    .freeze();
+GEOTIFF .freeze();
    // Should never happen.
+    throw new ExceptionInInitializerError(exception);
+}
+OGC.     setFunction(OnLineFunction.INFORMATION);
+OPEN_GIS.setFunction(OnLineFunction.DOWNLOAD);
+EPSG    .setFunction(OnLineFunction.DOWNLOAD);
+GEOTIFF .setFunction(OnLineFunction.DOWNLOAD);
+ESRI    .setFunction(OnLineFunction.INFORMATION);
+GEOTOOLS.setFunction(OnLineFunction.DOWNLOAD);
+
+OGC     .freeze();
+OPEN_GIS.freeze();
+EPSG    .freeze();
+GEOTIFF .freeze();
+
+ +