sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1386467 [3/5] - in /incubator/sis/ip-review: ./ rev/ rev/00486/ rev/06050/ rev/06410/ rev/06942/ rev/06978/ rev/07197/ rev/10796/ rev/11096/ rev/20598/ rev/20874/ rev/24820/ rev/24868/ rev/24990/ rev/28159/ rev/30421/
Date Mon, 17 Sep 2012 04:18:12 GMT
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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>ModifiableMetadata changes for revisions 6907:6942</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>ModifiableMetadata changes for revisions 6907:6942</h1>
+      <p><code>ModifiableMetadata</code> has been initially committed by other GeoTools contributors.
+      This code (listed in the table below) was merging two distinct purposes in a single class:</p>
+      <ul>
+        <li>Provide a base class for all ISO 19115 classes.</li>
+        <li>Implements the ISO 19115 <code>MD_Metadata</code> interface.</li>
+      </ul>
+      <p>This approach does not reflect the ISO 19115 structure, since <code>MD_Metadata</code> is <em>not</em>
+      the base class of all metadata. In the Geotk code, the "<code>implements MetaData</code>" clause has been
+      removed as well as all related methods: <code>getFileIdentifier()</code>, <code>getLanguage()</code>,
+      <code>getMetadataStandardName()</code> and <code>getMetadataStandardVersion()</code>.</p>
+
+      <p>According Subversion history, this commit is the <code>ModifiableMetadata</code>
+      <font size="-2">(<a href="https://hg.geotoolkit.org/geotoolkit/files/ddafcca2bcd38fbd42cfa5019817a786fa88e6c1/modules/metadata/geotk-metadata/src/main/java/org/geotoolkit/metadata/ModifiableMetadata.java">geotk source</a>)</font>
+      ancestor. However it is more appropriate to consider it as the <code>AbstractMetadata</code>
+      <font size="-2">(<a href="https://hg.geotoolkit.org/geotoolkit/files/ddafcca2bcd38fbd42cfa5019817a786fa88e6c1/modules/metadata/geotk-metadata/src/main/java/org/geotoolkit/metadata/AbstractMetadata.java">geotk source</a>)</font>
+      ancestor.</p>
+
+      <p>The code in this commit uses Java reflection for getting property values from a runtime choosable <code>String</code>
+      (as opposed to compile-time fixed method invocation). Geotk has keep the idea, but implemented it in a totally different
+      way:</p>
+      <ul>
+        <li>The <code>elements()</code> method in this commit <em>copies</em> all values in a <code>java.util.ArrayList</code>.
+        Geotk provides a dynamic <code>java.util.Map</code> instead, which is a <em>view</em> (not a copy) of the metadata object:
+        calls to <code>Map.get(Object)</code> are lazily delegated to the bean property getter.</li>
+
+        <li>The <code>getElement(String)</code> method does not exist anymore in Geotk since its work is performed
+        by the above-cited <code>java.util.Map</code> view.</li>
+
+        <li>The <code>ISO19115Entity</code> internal class in this commit performs a work similar to the <code>PropertyAccessor</code>
+        <font size="-2">(<a href="https://hg.geotoolkit.org/geotoolkit/files/ddafcca2bcd38fbd42cfa5019817a786fa88e6c1/modules/metadata/geotk-metadata/src/main/java/org/geotoolkit/metadata/PropertyAccessor.java">geotk source</a>)</font>
+        package-private class. However <code>ISO19115Entity</code> relies
+        on <code>java.beans.Introspector</code>, while <code>PropertyAccessor</code> performs its own work in
+        a more sophisticated way.</li>
+      </ul>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn cat -r6942 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/ModifiableMetadata.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 6907</th><th>Revision 6942</th></tr>
+<tr><td></td>
+<td><pre><span class="add">/*
+ *    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.
+         * &lt;p&gt;
+         * Should only be called against interfaces that extend
+         * the GeoAPI ISO MetaData interface.
+         * &lt;/p&gt;
+         * @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.
+         * &lt;p&gt;
+         * 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&lt;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&lt;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&lt;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";
+    }
+}</span></pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultCitation changes for revisions 6976:6978</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultCitation changes for revisions 6976:6978</h1>
+      <p>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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 6976</th><th>Revision 6978</th></tr>
+<tr><td><pre>// 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;
+
+
+/**</pre></td>
+<td><pre>// J2SE direct dependencies
+import java.util.Date;
+<span class="add">import java.util.HashMap;</span>
+<span class="add">import java.util.List;</span>
+import java.util.Locale;
+<span class="add">import java.util.Map;</span>
+<span class="add">import java.util.Set;</span>
+import java.io.Serializable;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Series;
+
+// Geotools dependencies
+<span class="add">import org.geotools.metadata.iso19115.ListOf;</span>
+<span class="add">import org.geotools.metadata.iso19115.SetOf;</span>
+import org.geotools.resources.Utilities;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.PresentationForm;
+<span class="add">import org.opengis.util.InternationalString;</span>
+
+
+/**</pre></td></tr>
+<tr><td><pre>public static final Citation GEOTOOLS = new Citation("Geotools");
+
+/**
+ * An immutable empty array of strings.
+ */
+private static final String[] EMPTY = new String[0];
+<span class="del"></span>
+/**
+ * An immutable empty array of responsible party.
+ */</pre></td>
+<td><pre>    public static final Citation GEOTOOLS = new Citation("Geotools");
+
+    /**
+<span class="add">     * Construct a citation with the specified title.</span>
+<span class="add">     */</span>
+<span class="add">    public Citation(final String title) {</span>
+<span class="add">        this.title = null; // new InternationalString( title )</span>
+<span class="add">    }</span>
+<span class="add">    private List alternateTitles = new ListOf( InternationalString.class );</span>
+<span class="add">    private Set citedResponsibleParties = new SetOf( ResponsibleParty.class );</span>
+<span class="add"></span>
+<span class="add">    private InternationalString title;</span>
+<span class="add">    private Map dates = new HashMap();</span>
+<span class="add">    private InternationalString edition;</span>
+<span class="add">    private Date editionDate;</span>
+<span class="add">    private Set identifiers = new SetOf( String.class );</span>
+<span class="add">    private Set identifierTypes = new SetOf( String.class );</span>
+<span class="add"></span>
+<span class="add">    private Set presentationForm = new SetOf( PresentationForm.class );</span>
+<span class="add">    private Series series;</span>
+<span class="add">    private InternationalString otherCitationDetails;</span>
+<span class="add">    private InternationalString collectiveTitle;</span>
+<span class="add">    private String ISBN;</span>
+<span class="add">    private String ISSN;</span>
+<span class="add">    public List getAlternateTitles() {</span>
+<span class="add">        return alternateTitles;</span>
+<span class="add">    }</span>
+<span class="add">    public void setAlternateTitles(List alternateTitles) {</span>
+<span class="add">        this.alternateTitles = alternateTitles;</span>
+<span class="add">    }</span>
+<span class="add">    public Set getCitedResponsibleParties() {</span>
+<span class="add">        return citedResponsibleParties;</span>
+<span class="add">    }</span>
+<span class="add">    public void setCitedResponsibleParties(Set citedResponsibleParties) {</span>
+<span class="add">        this.citedResponsibleParties = citedResponsibleParties;</span>
+<span class="add">    }</span>
+<span class="add">    public InternationalString getCollectiveTitle() {</span>
+<span class="add">        return collectiveTitle;</span>
+<span class="add">    }</span>
+<span class="add">    public void setCollectiveTitle(InternationalString collectiveTitle) {</span>
+<span class="add">        this.collectiveTitle = collectiveTitle;</span>
+<span class="add">    }</span>
+<span class="add">    public Map getDates() {</span>
+<span class="add">        return dates;</span>
+<span class="add">    }</span>
+<span class="add">    public void setDates(Map dates) {</span>
+<span class="add">        this.dates = dates;</span>
+<span class="add">    }</span>
+<span class="add">    public InternationalString getEdition() {</span>
+<span class="add">        return edition;</span>
+<span class="add">    }</span>
+<span class="add">    public void setEdition(InternationalString edition) {</span>
+<span class="add">        this.edition = edition;</span>
+<span class="add">    }</span>
+<span class="add">    public Date getEditionDate() {</span>
+<span class="add">        return editionDate;</span>
+<span class="add">    }</span>
+<span class="add">    public void setEditionDate(Date editionDate) {</span>
+<span class="add">        this.editionDate = editionDate;</span>
+<span class="add">    }</span>
+<span class="add">    public Set getIdentifiers() {</span>
+<span class="add">        return identifiers;</span>
+<span class="add">    }</span>
+<span class="add">    public void setIdentifiers(Set identifiers) {</span>
+<span class="add">        this.identifiers.clear();</span>
+<span class="add">        this.identifiers.addAll( identifiers );</span>
+<span class="add">    }</span>
+<span class="add">    public Set getIdentifierTypes() {</span>
+<span class="add">        return identifierTypes;</span>
+<span class="add">    }</span>
+<span class="add">    public void setIdentifierTypes(Set identifierTypes) {</span>
+<span class="add">        this.identifierTypes.clear();</span>
+<span class="add">        this.identifierTypes.addAll(identifierTypes);</span>
+<span class="add">    }</span>
+<span class="add">    public String getISBN() {</span>
+<span class="add">        return ISBN;</span>
+<span class="add">    }</span>
+<span class="add">    public void setISBN(String isbn) {</span>
+<span class="add">        ISBN = isbn;</span>
+<span class="add">    }</span>
+<span class="add">    public String getISSN() {</span>
+<span class="add">        return ISSN;</span>
+<span class="add">    }</span>
+<span class="add">    public void setISSN(String issn) {</span>
+<span class="add">        ISSN = issn;</span>
+<span class="add">    }</span>
+<span class="add">    public InternationalString getOtherCitationDetails() {</span>
+<span class="add">        return otherCitationDetails;</span>
+<span class="add">    }</span>
+<span class="add">    public void setOtherCitationDetails(InternationalString otherCitationDetails) {</span>
+<span class="add">        this.otherCitationDetails = otherCitationDetails;</span>
+<span class="add">    }</span>
+<span class="add">    public Set getPresentationForm() {</span>
+<span class="add">        return presentationForm;</span>
+<span class="add">    }</span>
+<span class="add">    public void setPresentationForm(Set presentationForm) {</span>
+<span class="add">        this.presentationForm.clear();</span>
+<span class="add">        this.presentationForm.addAll( presentationForm );</span>
+<span class="add">    }</span>
+<span class="add">    public Series getSeries() {</span>
+<span class="add">        return series;</span>
+<span class="add">    }</span>
+<span class="add">    public void setSeries(Series series) {</span>
+<span class="add">        this.series = series;</span>
+<span class="add">    }</span>
+<span class="add">    public InternationalString getTitle() {</span>
+<span class="add">        return title;</span>
+<span class="add">    }</span>
+<span class="add">    public void setTitle(InternationalString title) {</span>
+<span class="add">        this.title = title;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+<span class="add">class Commented {</span>
+<span class="add">    /**</span>
+     * An immutable empty array of strings.
+     */
+    private static final String[] EMPTY = new String[0];
+    /**
+     * An immutable empty array of responsible party.
+     */</pre></td></tr>
+<tr><td><pre> */
+private static final PresentationForm[] EMPTY_PRESENTATION = new PresentationForm[0];
+
+/**
+<span class="del"> * The title.</span>
+<span class="del"> */</span>
+<span class="del">private final String title;</span>
+<span class="del"></span>
+<span class="del">/**</span>
+<span class="del"> * Construct a citation with the specified title.</span>
+<span class="del"> */</span>
+<span class="del">public Citation(final String title) {</span>
+<span class="del">    this.title = title;</span>
+<span class="del">}</span>
+<span class="del"></span>
+<span class="del">/**</span>
+ * Name by which the cited resource is known.
+ *
+ * @param  locale The desired locale for the title to be returned, or &lt;code&gt;null&lt;/code&gt;</pre></td>
+<td><pre> */
+private static final PresentationForm[] EMPTY_PRESENTATION = new PresentationForm[0];
+
+<span class="add">private String title;</span>
+/**
+ * Name by which the cited resource is known.
+ *
+ * @param  locale The desired locale for the title to be returned, or &lt;code&gt;null&lt;/code&gt;</pre></td></tr>
+<tr><td><pre> */
+public boolean equals(final Object object) {
+    if (object!=null &amp;&amp; object.getClass().equals(getClass())) {
+<span class="del">        final Citation that = (Citation) object;</span>
+        return Utilities.equals(this.title, that.title);
+    }
+    return false;</pre></td>
+<td><pre> */
+public boolean equals(final Object object) {
+    if (object!=null &amp;&amp; object.getClass().equals(getClass())) {
+<span class="add">        final Commented that = (Commented) object;</span>
+        return Utilities.equals(this.title, that.title);
+    }
+    return false;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 6978</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 6978</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>jgarnett</td></tr>
+  <tr><td><b>Date:</b></td><td>2004-07-19</td></tr>
+  <tr><td><b>Message:</b></td><td>use of InternationalString</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 7197</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 7197</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>jeichar</td></tr>
+  <tr><td><b>Date:</b></td><td>2004-07-22</td></tr>
+  <tr><td><b>Message:</b></td><td>MetadataEntity fixed</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>ModifiableMetadata changes for revisions 7196:7197</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>ModifiableMetadata changes for revisions 7196:7197</h1>
+      <p>This commit contains change in code that do not exist anymore in Geotk.
+      See <a href="../06942/ModifiableMetadata.xhtml">revision 6942</a> for more information.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 7196</th><th>Revision 7197</th></tr>
+<tr><td><pre>import org.opengis.util.Cloneable;
+
+// Geotools dependencies
+<span class="del">import org.geotools.catalog.XPath;</span>
+import org.geotools.resources.Utilities;
+import org.geotools.resources.rsc.Resources;
+import org.geotools.resources.rsc.ResourceKeys;
+
+
+/**</pre></td>
+<td><pre>import org.opengis.util.Cloneable;
+
+// Geotools dependencies
+import org.geotools.resources.Utilities;
+import org.geotools.resources.rsc.Resources;
+import org.geotools.resources.rsc.ResourceKeys;
+<span class="add">import org.geotools.xml.XPathFactory;</span>
+
+
+/**</pre></td></tr>
+<tr><td><pre> * @return element value, List of element value, or null if xPath did not match anything.
+ */
+public final Object getElement(final String xpath) {
+<span class="del">    final List elements = XPath.getValue(xpath, this);</span>
+    switch (elements.size()) {
+        case 0:  return null;
+        case 1:  return elements.get(0);</pre></td>
+<td><pre> * @return element value, List of element value, or null if xPath did not match anything.
+ */
+public final Object getElement(final String xpath) {
+<span class="add">    final List elements = XPathFactory.value(xpath, this);</span>
+    switch (elements.size()) {
+        case 0:  return null;
+        case 1:  return elements.get(0);</pre></td></tr>
+<tr><td><pre> * 		A List is many Elements are found to match the xpath.
+ */
+public Object getElement(final String xpath) {
+<span class="del">    final List result = XPath.getElement(xpath, this);</span>
+    switch (result.size()) {
+        case 0:  return null;
+        case 1:  return result.get(0);</pre></td>
+<td><pre> * 		A List is many Elements are found to match the xpath.
+ */
+public Object getElement(final String xpath) {
+<span class="add">    final List result = XPathFactory.find(xpath, this);</span>
+    switch (result.size()) {
+        case 0:  return null;
+        case 1:  return result.get(0);</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultAddress changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultAddress changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Set;
+<span class="del">import java.util.Iterator;</span>
+<span class="del">import java.util.Collections;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.util.InternationalString;</span>
+<span class="del"></span>
+<span class="del">// Geotools dependencies</span>
+import org.geotools.metadata.MetadataEntity;
+import org.geotools.util.CheckedHashSet;
+<span class="del">import org.geotools.resources.Utilities;</span>
+
+
+/**</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+<span class="add">import java.util.Collections;</span>
+<span class="add">import java.util.Iterator;</span>
+import java.util.Set;
+
+import org.geotools.metadata.MetadataEntity;
+<span class="add">import org.geotools.resources.Utilities;</span>
+import org.geotools.util.CheckedHashSet;
+<span class="add">import org.opengis.util.InternationalString;</span>
+
+
+/**</pre></td></tr>
+<tr><td><pre> *
+ * @version $Id$
+ * @author Martin Desruisseaux
+<span class="del"> * @author Touraïvane</span>
+ */
+public class Address extends MetadataEntity
+       implements org.opengis.metadata.citation.Address</pre></td>
+<td><pre> *
+ * @version $Id$
+ * @author Martin Desruisseaux
+<span class="add"> * @author Toura�vane</span>
+ */
+public class Address extends MetadataEntity
+       implements org.opengis.metadata.citation.Address</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultCitation changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultCitation changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+<span class="del">import java.util.Map;</span>
+<span class="del">import java.util.Locale;</span>
+<span class="del">import java.util.Iterator;</span>
+<span class="del">import java.util.Collections;</span>
+<span class="del">import java.io.Serializable;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.metadata.citation.Series;</span>
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.citation.ResponsibleParty;
+<span class="del">import org.opengis.metadata.citation.PresentationForm;</span>
+import org.opengis.util.InternationalString;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.metadata.MetadataEntity;</span>
+<span class="del">import org.geotools.util.CheckedHashSet;</span>
+<span class="del">import org.geotools.util.CheckedHashMap;</span>
+<span class="del">import org.geotools.util.CheckedArrayList;</span>
+<span class="del">import org.geotools.util.SimpleInternationalString;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+
+<span class="del"></span>
+/**
+ * Standardized resource reference.
+ *</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+<span class="add">import java.util.Collections;</span>
+import java.util.Date;
+<span class="add">import java.util.Iterator;</span>
+import java.util.List;
+<span class="add">import java.util.Locale;</span>
+<span class="add">import java.util.Map;</span>
+import java.util.Set;
+
+<span class="add">import org.geotools.metadata.MetadataEntity;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.util.CheckedArrayList;</span>
+<span class="add">import org.geotools.util.CheckedHashMap;</span>
+<span class="add">import org.geotools.util.CheckedHashSet;</span>
+<span class="add">import org.geotools.util.SimpleInternationalString;</span>
+import org.opengis.metadata.citation.DateType;
+<span class="add">import org.opengis.metadata.citation.PresentationForm;</span>
+import org.opengis.metadata.citation.ResponsibleParty;
+<span class="add">import org.opengis.metadata.citation.Series;</span>
+import org.opengis.util.InternationalString;
+
+
+/**
+ * Standardized resource reference.
+ *</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultContact changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultContact changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>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;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.metadata.MetadataEntity;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+
+<span class="del"></span>
+/**
+ * Information required to enable contact with the responsible person and/or organization.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+<span class="del"> * @author Touraïvane</span>
+ */
+public class Contact extends MetadataEntity
+       implements org.opengis.metadata.citation.Contact</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+<span class="add">import org.geotools.metadata.MetadataEntity;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+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
+<span class="add"> * @author Toura�vane</span>
+ */
+public class Contact extends MetadataEntity
+       implements org.opengis.metadata.citation.Contact</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultOnlineResource changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultOnlineResource changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+import java.net.URL;
+<span class="del">import java.net.URLDecoder;</span>
+<span class="del">import java.net.MalformedURLException;</span>
+<span class="del">import java.io.UnsupportedEncodingException;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.metadata.citation.OnLineFunction;
+import org.opengis.util.InternationalString;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.metadata.MetadataEntity;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+
+<span class="del"></span>
+/**
+ * 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
+<span class="del"> * @author Touraïvane</span>
+ */
+public class OnLineResource extends MetadataEntity
+       implements org.opengis.metadata.citation.OnLineResource</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+<span class="add">import java.net.MalformedURLException;</span>
+import java.net.URL;
+
+<span class="add">import org.geotools.metadata.MetadataEntity;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+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
+<span class="add"> * @author Toura�vane</span>
+ */
+public class OnLineResource extends MetadataEntity
+       implements org.opengis.metadata.citation.OnLineResource</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultResponsibleParty changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultResponsibleParty changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2004, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2004, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2004, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+import org.opengis.metadata.citation.Role;
+<span class="del">import org.opengis.metadata.citation.Contact;</span>
+import org.opengis.util.InternationalString;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.util.SimpleInternationalString;</span>
+<span class="del">import org.geotools.metadata.MetadataEntity;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+
+<span class="del"></span>
+/**
+ * Identification of, and means of communication with, person(s) and
+ * organizations associated with the dataset.
+ *
+ * @version $Id$
+ * @author Martin Desruisseaux
+<span class="del"> * @author Touraïvane</span>
+ */
+public class ResponsibleParty extends MetadataEntity
+       implements org.opengis.metadata.citation.ResponsibleParty</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// OpenGIS dependencies
+<span class="add">import org.geotools.metadata.MetadataEntity;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.util.SimpleInternationalString;</span>
+<span class="add">import org.opengis.metadata.citation.Contact;</span>
+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
+<span class="add"> * @author Toura�vane</span>
+ */
+public class ResponsibleParty extends MetadataEntity
+       implements org.opengis.metadata.citation.ResponsibleParty</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 10796</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 10796</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>dzwiers</td></tr>
+  <tr><td><b>Date:</b></td><td>2005-01-28</td></tr>
+  <tr><td><b>Message:</b></td><td>imports cleaned</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>IndexedResourceBundle changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>IndexedResourceBundle changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.resources;
+
+// Utilities
+import java.util.Locale;
+<span class="del">import java.util.Enumeration;</span>
+import java.util.NoSuchElementException;
+<span class="del">import java.util.MissingResourceException;</span>
+<span class="del"></span>
+<span class="del">// Text format</span>
+<span class="del">import java.text.MessageFormat;</span>
+<span class="del"></span>
+<span class="del">// Input / output</span>
+<span class="del">import java.io.Writer;</span>
+<span class="del">import java.io.IOException;</span>
+<span class="del">import java.io.InputStream;</span>
+<span class="del">import java.io.DataInputStream;</span>
+<span class="del">import java.io.BufferedInputStream;</span>
+<span class="del">import java.io.FileNotFoundException;</span>
+<span class="del"></span>
+<span class="del">// Logging</span>
+import java.util.logging.Level;
+import java.util.logging.Logger;
+<span class="del">import java.util.logging.LogRecord;</span>
+
+
+/**</pre></td>
+<td><pre>package org.geotools.resources;
+
+// Utilities
+<span class="add">import java.io.BufferedInputStream;</span>
+<span class="add">import java.io.DataInputStream;</span>
+<span class="add">import java.io.FileNotFoundException;</span>
+<span class="add">import java.io.IOException;</span>
+<span class="add">import java.io.InputStream;</span>
+<span class="add">import java.io.Writer;</span>
+<span class="add">import java.text.MessageFormat;</span>
+<span class="add">import java.util.Enumeration;</span>
+import java.util.Locale;
+<span class="add">import java.util.MissingResourceException;</span>
+import java.util.NoSuchElementException;
+import java.util.logging.Level;
+<span class="add">import java.util.logging.LogRecord;</span>
+import java.util.logging.Logger;
+
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>IndexedResourceCompiler changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>IndexedResourceCompiler changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.resources;
+
+// Collections
+<span class="del">import java.util.Set;</span>
+<span class="del">import java.util.Map;</span>
+<span class="del">import java.util.HashSet;</span>
+<span class="del">import java.util.HashMap;</span>
+<span class="del">import java.util.Iterator;</span>
+<span class="del">import java.util.Properties;</span>
+<span class="del">import java.util.Collections;</span>
+<span class="del">import java.util.Arrays;</span>
+<span class="del"></span>
+<span class="del">// Input/output</span>
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+<span class="del">import java.io.DataOutputStream;</span>
+<span class="del">import java.io.BufferedOutputStream;</span>
+<span class="del">import java.io.FileOutputStream;</span>
+<span class="del">import java.io.FileInputStream;</span>
+<span class="del">import java.io.BufferedWriter;</span>
+<span class="del">import java.io.FileWriter;</span>
+import java.io.Writer;
+<span class="del"></span>
+<span class="del">// Miscellaneous</span>
+import java.util.Comparator;
+import java.util.StringTokenizer;
+<span class="del">import java.text.MessageFormat;</span>
+<span class="del">import java.lang.reflect.Field;</span>
+
+
+/**</pre></td>
+<td><pre>package org.geotools.resources;
+
+// Collections
+<span class="add">import java.io.BufferedOutputStream;</span>
+<span class="add">import java.io.BufferedWriter;</span>
+<span class="add">import java.io.DataOutputStream;</span>
+import java.io.File;
+<span class="add">import java.io.FileInputStream;</span>
+<span class="add">import java.io.FileOutputStream;</span>
+<span class="add">import java.io.FileWriter;</span>
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+<span class="add">import java.lang.reflect.Field;</span>
+<span class="add">import java.text.MessageFormat;</span>
+<span class="add">import java.util.Arrays;</span>
+<span class="add">import java.util.Collections;</span>
+import java.util.Comparator;
+<span class="add">import java.util.HashMap;</span>
+<span class="add">import java.util.HashSet;</span>
+<span class="add">import java.util.Iterator;</span>
+<span class="add">import java.util.Map;</span>
+<span class="add">import java.util.Properties;</span>
+<span class="add">import java.util.Set;</span>
+import java.util.StringTokenizer;
+
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Utilities changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Utilities changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le Développement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le D�veloppement</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>// Collections and arrays
+import java.util.Arrays;
+<span class="del"></span>
+<span class="del">// Logging</span>
+import java.util.logging.Level;
+import java.util.logging.Logger;
+<span class="del">import java.util.logging.LogRecord;</span>
+
+
+/**</pre></td>
+<td><pre>// Collections and arrays
+import java.util.Arrays;
+import java.util.logging.Level;
+<span class="add">import java.util.logging.LogRecord;</span>
+import java.util.logging.Logger;
+
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Citations changes for revisions 11095:11096</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Citations changes for revisions 11095:11096</h1>
+<p>Addition of pre-defined constants. In Geotk, those constants are not defined anymore in the
+<code>DefaultCitation</code> class. They are defined in the <code>Citations</code> 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 <code>metadata-sql</code> module can handle this task.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 11095</th><th>Revision 11096</th></tr>
+<tr><td><pre>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;</pre></td>
+<td><pre>package org.geotools.metadata.citation;
+
+// J2SE direct dependencies
+<span class="add">import java.net.MalformedURLException;</span>
+<span class="add">import java.net.URL;</span>
+<span class="add">import java.util.ArrayList;</span>
+import java.util.Collections;
+import java.util.Date;
+<span class="add">import java.util.HashSet;</span>
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;</pre></td></tr>
+<tr><td><pre>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;</pre></td>
+<td><pre>import org.geotools.util.CheckedHashSet;
+import org.geotools.util.SimpleInternationalString;
+import org.opengis.metadata.citation.DateType;
+<span class="add">import org.opengis.metadata.citation.OnLineFunction;</span>
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.citation.ResponsibleParty;
+<span class="add">import org.opengis.metadata.citation.Role;</span>
+import org.opengis.metadata.citation.Series;
+import org.opengis.util.InternationalString;</pre></td></tr>
+<tr><td><pre>    OPEN_GIS.setPresentationForm(Collections.singleton(PresentationForm.DOCUMENT_DIGITAL));
+    OPEN_GIS.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("OGC")));
+    OPEN_GIS.setCitedResponsibleParties(Collections.singleton(
+<span class="del">             org.geotools.metadata.citation.ResponsibleParty.OPEN_GIS));</span>
+    OPEN_GIS.freeze();
+}
+
+/**
+ * The &lt;A HREF="http://www.epsg.org"&gt;European Petroleum Survey Group&lt;/A&gt; authority.
+<span class="del"> *</span>
+<span class="del"> * @see org.geotools.metadata.citation.ResponsibleParty#EPSG</span>
+ */
+public static final Citation EPSG = new Citation("European Petroleum Survey Group");
+static {</pre></td>
+<td><pre>    OPEN_GIS.setPresentationForm(Collections.singleton(PresentationForm.DOCUMENT_DIGITAL));
+    OPEN_GIS.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("OGC")));
+    OPEN_GIS.setCitedResponsibleParties(Collections.singleton(
+<span class="add">             org.geotools.metadata.citation.ResponsibleParty.OGC));</span>
+    OPEN_GIS.freeze();
+}
+
+<span class="add">private static ResponsibleParty ogc( Role role, OnLineFunction function, String url ){</span>
+<span class="add">    try {</span>
+<span class="add">        return org.geotools.metadata.citation.ResponsibleParty.ogc( role, function, new URL( url ) );</span>
+<span class="add">    }</span>
+<span class="add">    catch( MalformedURLException badContact ){</span>
+<span class="add">        return org.geotools.metadata.citation.ResponsibleParty.OGC;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+/**
+<span class="add"> * The &lt;A HREF="http://www.opengis.org/docs/01-068r3.pdf"&gt;WMS 1.1.1&lt;/A&gt;</span>
+<span class="add"> * (01-068r3) "Automatic Projections" Authority.</span>
+<span class="add"> * &lt;p&gt;</span>
+<span class="add"> * Here is the assumptions used by the CRSAuthorityFactory to locate an</span>
+<span class="add"> * authority on AUTO data:</span>
+<span class="add"> * &lt;ul&gt;</span>
+<span class="add"> * &lt;li&gt;getTitle() returns something human readable</span>
+<span class="add"> * &lt;li&gt;getIdentifiers().contains( "AUTO" )</span>
+<span class="add"> * &lt;/ul&gt;</span>
+<span class="add"> * &lt;/p&gt;</span>
+<span class="add"> * &lt;p&gt;</span>
+<span class="add"> * Warning: different from AUTO2 used for WMS 1.3.0.</span>
+<span class="add"> * &lt;/p&gt;</span>
+<span class="add"> * @see http://www.opengeospatial.org/</span>
+<span class="add"> * @see http://www.opengis.org/docs/01-068r3.pdf</span>
+<span class="add"> * @see org.geotools.metadata.citation.ResponsibleParty#OGC</span>
+<span class="add"> */</span>
+<span class="add">public static final Citation AUTO = new Citation("Automatic Projections");</span>
+<span class="add">static { // Sanity check ensure that all @see tags are actually available in the metadata</span>
+<span class="add">    try {</span>
+<span class="add">        AUTO.setPresentationForm(Collections.singleton(PresentationForm.MODEL_DIGITAL));</span>
+<span class="add"></span>
+<span class="add">        List titles = new ArrayList();</span>
+<span class="add">        titles.add( new SimpleInternationalString("AUTO"));</span>
+<span class="add">        titles.add( new SimpleInternationalString("WMS 1.1.1"));</span>
+<span class="add">        titles.add( new SimpleInternationalString("OGC 01-068r2"));</span>
+<span class="add">        AUTO.setAlternateTitles( titles );</span>
+<span class="add"></span>
+<span class="add">        Set parties = new HashSet();</span>
+<span class="add">        parties.add( ogc( Role.POINT_OF_CONTACT, OnLineFunction.INFORMATION, "http://www.opengeospatial.org/" ));</span>
+<span class="add">        parties.add( ogc( Role.OWNER, OnLineFunction.INFORMATION, "http://www.opengis.org/docs/01-068r3.pdf" ));</span>
+<span class="add">        AUTO.setCitedResponsibleParties( parties );</span>
+<span class="add"></span>
+<span class="add">        AUTO.setIdentifiers( Collections.singleton("AUTO") );</span>
+<span class="add">        AUTO.freeze();</span>
+<span class="add">    }</span>
+<span class="add">    catch( Throwable t ){</span>
+<span class="add">        t.printStackTrace();</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+<span class="add"></span>
+<span class="add">/**</span>
+<span class="add"> * The &lt;A HREF="http://portal.opengis.org/files/?artifact_id=5316"&gt;WMS 1.3.0&lt;/A&gt;</span>
+<span class="add"> * (01-068r3) "Automatic Projections" Authority.</span>
+<span class="add"> * &lt;p&gt;</span>
+<span class="add"> * Here is the assumptions used by the CRSAuthorityFactory to locate an</span>
+<span class="add"> * authority on AUTO2 data:</span>
+<span class="add"> * &lt;ul&gt;</span>
+<span class="add"> * &lt;li&gt;getTitle() returns something human readable</span>
+<span class="add"> * &lt;li&gt;getIdentifiers().contains( "AUTO2" )</span>
+<span class="add"> * &lt;/ul&gt;</span>
+<span class="add"> * &lt;/p&gt;</span>
+<span class="add"> * &lt;p&gt;</span>
+<span class="add"> * Warning: different from AUTO used for WMS 1.1.1. and earlier.</span>
+<span class="add"> * &lt;/p&gt;</span>
+<span class="add"> * @see http://portal.opengis.org/files/?artifact_id=5316</span>
+<span class="add"> * @see org.geotools.metadata.citation.ResponsibleParty#OGC</span>
+<span class="add"> */</span>
+<span class="add">public static final Citation AUTO2 = new Citation("Automatic Projections");</span>
+<span class="add">static {</span>
+<span class="add">    try {</span>
+<span class="add">        AUTO2.setPresentationForm(Collections.singleton(PresentationForm.MODEL_DIGITAL));</span>
+<span class="add"></span>
+<span class="add">        List titles = new ArrayList();</span>
+<span class="add">        titles.add( new SimpleInternationalString("AUTO2"));</span>
+<span class="add">        titles.add( new SimpleInternationalString("WMS 1.3.0"));</span>
+<span class="add">        titles.add( new SimpleInternationalString("OGC 04-024"));</span>
+<span class="add">        AUTO2.setAlternateTitles( titles );</span>
+<span class="add"></span>
+<span class="add">        Set parties = new HashSet();</span>
+<span class="add">        parties.add( ogc( Role.POINT_OF_CONTACT, OnLineFunction.INFORMATION, "http://www.opengeospatial.org/" ));</span>
+<span class="add">        parties.add( ogc( Role.OWNER, OnLineFunction.INFORMATION, "http://portal.opengis.org/files/?artifact_id=5316" ));</span>
+<span class="add">        AUTO2.setCitedResponsibleParties( parties );</span>
+<span class="add"></span>
+<span class="add">        AUTO2.setIdentifiers( Collections.singleton("AUTO2") );</span>
+<span class="add">        AUTO2.freeze();</span>
+<span class="add">    }</span>
+<span class="add">    catch( Throwable t ){</span>
+<span class="add">        t.printStackTrace();</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+<span class="add"></span>
+<span class="add">/**</span>
+ * The &lt;A HREF="http://www.epsg.org"&gt;European Petroleum Survey Group&lt;/A&gt; authority.
+<span class="add"> * &lt;p&gt;</span>
+<span class="add"> * Here is the assumptions used by the CRSAuthorityFactory to locate an</span>
+<span class="add"> * authority on EPSG data:</span>
+<span class="add"> * &lt;ul&gt;</span>
+<span class="add"> * &lt;li&gt;getTitle() returns something human readable</span>
+<span class="add"> * &lt;li&gt;getIdentifiers().contains( "EPSG" )</span>
+<span class="add"> * &lt;/ul&gt;</span>
+<span class="add"> * &lt;/p&gt;</span>
+<span class="add"> * @see org.geotools.metadata.citation.ResponsibleParty#OGC</span>
+ */
+public static final Citation EPSG = new Citation("European Petroleum Survey Group");
+static {</pre></td></tr>
+<tr><td><pre>    EPSG.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("EPSG")));
+    EPSG.setCitedResponsibleParties(Collections.singleton(
+         org.geotools.metadata.citation.ResponsibleParty.EPSG));
+    EPSG.freeze();
+}</pre></td>
+<td><pre>    EPSG.setAlternateTitles(Collections.singletonList(new SimpleInternationalString("EPSG")));
+    EPSG.setCitedResponsibleParties(Collections.singleton(
+         org.geotools.metadata.citation.ResponsibleParty.EPSG));
+<span class="add">    EPSG.setIdentifiers( Collections.singleton("EPSG") );</span>
+    EPSG.freeze();
+}</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultContact changes for revisions 11095:11096</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultContact changes for revisions 11095:11096</h1>
+<p>Addition of pre-defined constants. Those constants will be replaced by entries in an embedded
+database for the Apache SIS project. The <code>metadata-sql</code> module can handle this task.</p>
+<p>The comment in the empty constructor has been removed.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 11095</th><th>Revision 11096</th></tr>
+<tr><td><pre> *
+ * @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);</pre></td>
+<td><pre> *
+ * @see org.geotools.metadata.citation.OnLineResource#OPEN_GIS
+ */
+<span class="add">public static final Contact OGC = new Contact();</span>
+<span class="add">static {</span>
+<span class="add">    OGC.setOnLineResource(org.geotools.metadata.citation.OnLineResource.OGC );</span>
+<span class="add">    OGC.freeze();</span>
+<span class="add">}</span>
+<span class="add">/**</span>
+<span class="add"> * Contact informations for the &lt;A HREF="http://www.opengis.org"&gt;OpenGIS consortium&lt;/A&gt;.</span>
+<span class="add"> *</span>
+<span class="add"> * @see org.geotools.metadata.citation.OnLineResource#OPEN_GIS</span>
+<span class="add"> */</span>
+public static final Contact OPEN_GIS = new Contact();
+static {
+    OPEN_GIS.setOnLineResource(org.geotools.metadata.citation.OnLineResource.OPEN_GIS);</pre></td></tr>
+<tr><td><pre> * Constructs an initially empty contact.
+ */
+public Contact() {
+}
+
+/**</pre></td>
+<td><pre> * Constructs an initially empty contact.
+ */
+public Contact() {
+<span class="add">    // empty constructor, please use set methods and call</span>
+<span class="add">    // freeze before returning this instance to client code</span>
+}
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultOnlineResource changes for revisions 11095:11096</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultOnlineResource changes for revisions 11095:11096</h1>
+<p>Addition of pre-defined constants. Those constants will be replaced by entries in an embedded
+database for the Apache SIS project. The <code>metadata-sql</code> module can handle this task.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>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</code></blockquote>
+<table class="changes">
+<tr><th>Revision 11095</th><th>Revision 11096</th></tr>
+<tr><td><pre>private static final long serialVersionUID = 5412370008274334799L;
+
+/**
+ * The online resources for the &lt;A HREF="http://www.opengis.org"&gt;OpenGIS consortium&lt;/A&gt;.
+ */
+public static final OnLineResource OPEN_GIS = new OnLineResource();</pre></td>
+<td><pre>private static final long serialVersionUID = 5412370008274334799L;
+
+/**
+<span class="add"> * The online resources for the &lt;A HREF="http://www.opengis.org"&gt;Open Geospatial Consortium&lt;/A&gt;.</span>
+<span class="add"> * @see OPEN_GIS</span>
+<span class="add"> */</span>
+<span class="add">public static final OnLineResource OGC = new OnLineResource();</span>
+<span class="add"></span>
+<span class="add">/**</span>
+ * The online resources for the &lt;A HREF="http://www.opengis.org"&gt;OpenGIS consortium&lt;/A&gt;.
+ */
+public static final OnLineResource OPEN_GIS = new OnLineResource();</pre></td></tr>
+<tr><td><pre>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"));</pre></td>
+<td><pre>public static final OnLineResource GEOTOOLS = new OnLineResource();
+static {
+    try {
+<span class="add">        OGC.     setLinkage(new URL("http://www.opengeospatial.org/"      ));</span>
+        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"));</pre></td></tr>
+<tr><td><pre>    // 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();</pre></td>
+<td><pre>    // Should never happen.
+    throw new ExceptionInInitializerError(exception);
+}
+<span class="add">OGC.     setFunction(OnLineFunction.INFORMATION);</span>
+OPEN_GIS.setFunction(OnLineFunction.DOWNLOAD);
+EPSG    .setFunction(OnLineFunction.DOWNLOAD);
+GEOTIFF .setFunction(OnLineFunction.DOWNLOAD);
+ESRI    .setFunction(OnLineFunction.INFORMATION);
+GEOTOOLS.setFunction(OnLineFunction.DOWNLOAD);
+
+<span class="add">OGC     .freeze();</span>
+OPEN_GIS.freeze();
+EPSG    .freeze();
+GEOTIFF .freeze();</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>



Mime
View raw message