sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1575895 [2/2] - in /sis/ip-review: ./ rev/07846/ rev/07857/ rev/07860/ rev/10796/ rev/20874/ rev/24973/
Date Mon, 10 Mar 2014 10:38:41 GMT
Added: sis/ip-review/rev/07860/MatrixParameters.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/07860/MatrixParameters.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/07860/MatrixParameters.xhtml (added)
+++ sis/ip-review/rev/07860/MatrixParameters.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,445 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameters changes for revisions 7705:7860</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameters changes for revisions 7705:7860</h1>
+<p>In this commit:</p>
+<ul>
+  <li>Changes for renaming of GeoAPI interface: <code>OperationParameter</code> → <code>ParameterDescriptor</code>.
+      Reverting this changes causes compilation errors, which can be fixed only be re-applying the same change.</li>
+  <li>Class renaming: <code>ParameterValue</code> → <code>Parameter</code>. SIS uses a different naming convention.
+      (<code>DefaultParameterValue</code>).</li>
+  <li>Addition of <code>serialVersionUID = 1L</code>: this change has been reverted
+      (replaced by computed <code>serialVersionUID</code>).</li>
+  <li>Renaming of <code>values</code> field as <code>matrixValues</code>. This change has been reverted.</li>
+  <li>Replacements of <code>String getXXX(Locale)</code> by <code>InternationalString getXXX()</code>,
+      and <code>super.getValue(name)</code> by <code>super.parameter(name)</code>.
+      Those changes have been forced by a GeoAPI changes. Reverting this changes causes compilation errors,
+      which can be fixed only be re-applying the same changes.</li>
+  <li>New <code>delValue(...)</code> methods. This contribution has been removed
+      (note that <code>delValue(row, column, numRow, numCol)</code> was actually
+      ignoring the <code>numRow</code> and <code>numCol</code> parameters).</li>
+  <li>Override the <code>values()</code> method. The need to override this method is recognized. Failure to
+      override this method is a violation of <code>ParameterValueGroup</code> contract, which can be detected
+      by improved JUnit tests. The Geotk/SIS implementation has been fully rewritten, because the internal
+      layout of parameter values is different (it is not just a copy of the <code>param</code> array).</li>
+  <li>Modification of <code>setMatrix(...)</code> method. This change has been reverted.</li>
+</ul>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7705:7860 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/MatrixParameters.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 7705</th><th>Revision 7860</th></tr>
+<tr><td><pre> */
+package org.geotools.parameter;
+
+<span class="del">// J2SE dependencies</span>
+<span class="del">import java.util.Locale;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.metadata.Identifier;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.parameter.ParameterValue;
+<span class="del">import org.opengis.parameter.OperationParameter;</span>
+import org.opengis.parameter.GeneralParameterValue;
+<span class="del">import org.opengis.parameter.OperationParameterGroup;</span>
+<span class="del">import org.opengis.parameter.GeneralOperationParameter;</span>
+import org.opengis.parameter.ParameterNotFoundException;
+
+// Geotools dependencies</pre></td>
+<td><pre> */
+package org.geotools.parameter;
+
+<span class="add">// OpenGIS dependencies</span>
+<span class="add">import java.util.ArrayList;</span>
+<span class="add">import java.util.List;</span>
+
+import org.opengis.metadata.Identifier;
+import org.opengis.referencing.operation.Matrix;
+<span class="add">import org.opengis.util.InternationalString;</span>
+import org.opengis.parameter.ParameterValue;
+<span class="add">import org.opengis.parameter.ParameterDescriptor;</span>
+import org.opengis.parameter.GeneralParameterValue;
+<span class="add">import org.opengis.parameter.ParameterDescriptorGroup;</span>
+<span class="add">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+import org.opengis.parameter.ParameterNotFoundException;
+
+// Geotools dependencies</pre></td></tr>
+<tr><td><pre>* The values for a group of {@linkplain MatrixParameters matrix parameters}. This value group
+* is extensible, i.e. the number of &lt;code&gt;"elt_&lt;var&gt;row&lt;/var&gt;_&lt;var&gt;col&lt;/var&gt;"&lt;/code&gt; parameters
+* depends on the &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameter values. Concequently,
+<span class="del">* this {@linkplain ParameterValueGroup parameter value group} is also its own mutable</span>
+<span class="del">* {@linkplain OperationParameterGroup operation parameter group}.</span>
+*
+* @version $Id$
+* @author Martin Desruisseaux</pre></td>
+<td><pre>* The values for a group of {@linkplain MatrixParameters matrix parameters}. This value group
+* is extensible, i.e. the number of &lt;code&gt;"elt_&lt;var&gt;row&lt;/var&gt;_&lt;var&gt;col&lt;/var&gt;"&lt;/code&gt; parameters
+* depends on the &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameter values. Concequently,
+<span class="add">* this {@linkplain ParameterGroup parameter value group} is also its own mutable</span>
+<span class="add">* {@linkplain ParameterGroupDescriptor operation parameter group}.</span>
+*
+* @version $Id$
+* @author Martin Desruisseaux</pre></td></tr>
+<tr><td><pre> *
+ * @see MatrixParameters
+ */
+<span class="del">public class MatrixParameterValues extends ParameterValueGroup implements OperationParameterGroup {</span>
+    /**
+     * The parameter values. Will be constructed only when first requested.
+     */
+<span class="del">    private ParameterValue[][] values;</span>
+
+    /**
+     * The value for the {@link MatrixParameters#numRow} parameter.</pre></td>
+<td><pre> *
+ * @see MatrixParameters
+ */
+<span class="add">public class MatrixParameterValues extends ParameterGroup implements ParameterDescriptorGroup {</span>
+<span class="add">    private static final long serialVersionUID = 1L;</span>
+<span class="add"></span>
+    /**
+     * The parameter values. Will be constructed only when first requested.
+     */
+<span class="add">    private ParameterValue[][] matrixValues;</span>
+
+    /**
+     * The value for the {@link MatrixParameters#numRow} parameter.</pre></td></tr>
+<tr><td><pre> * since the description depends on &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt;
+ * parameter values.
+ */
+<span class="del">public GeneralOperationParameter getDescriptor() {</span>
+    return this;
+}</pre></td>
+<td><pre> * since the description depends on &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt;
+ * parameter values.
+ */
+<span class="add">public GeneralParameterDescriptor getDescriptor() {</span>
+    return this;
+}</pre></td></tr>
+<tr><td><pre> * Forward the call to the {@linkplain MatrixParameters matrix parameters} descriptor
+ * specified at construction time.
+ */
+<span class="del">public String getName(final Locale locale) {</span>
+<span class="del">    return descriptor.getName(locale);</span>
+}
+
+/**</pre></td>
+<td><pre> * Forward the call to the {@linkplain MatrixParameters matrix parameters} descriptor
+ * specified at construction time.
+ */
+<span class="add">public InternationalString getName() {</span>
+<span class="add">    return descriptor.getName();</span>
+}
+
+/**</pre></td></tr>
+<tr><td><pre> * Forward the call to the {@linkplain MatrixParameters matrix parameters} descriptor
+ * specified at construction time.
+ */
+<span class="del">public String getRemarks(Locale locale) {</span>
+<span class="del">    return descriptor.getRemarks(locale);</span>
+}
+
+/**</pre></td>
+<td><pre> * Forward the call to the {@linkplain MatrixParameters matrix parameters} descriptor
+ * specified at construction time.
+ */
+<span class="add">public InternationalString getRemarks() {</span>
+<span class="add">    return descriptor.getRemarks();</span>
+}
+
+/**</pre></td></tr>
+<tr><td><pre> * @return The parameter for the given name.
+ * @throws ParameterNotFoundException if there is no parameter for the given name.
+ */
+<span class="del">public OperationParameter getParameter(final String name)</span>
+        throws ParameterNotFoundException
+{
+    return ((MatrixParameters) descriptor).getParameter(name, numRow.intValue(),</pre></td>
+<td><pre> * @return The parameter for the given name.
+ * @throws ParameterNotFoundException if there is no parameter for the given name.
+ */
+<span class="add">public ParameterDescriptor getParameter(final String name)</span>
+        throws ParameterNotFoundException
+{
+    return ((MatrixParameters) descriptor).getParameter(name, numRow.intValue(),</pre></td></tr>
+<tr><td><pre> * class for other parameters, especially "num_row" and "num_col".
+ */
+try {
+<span class="del">    return super.getValue(name);</span>
+} catch (ParameterNotFoundException exception) {
+    if (cause!=null) try {
+        exception.initCause(cause);</pre></td>
+<td><pre> * class for other parameters, especially "num_row" and "num_col".
+ */
+try {
+<span class="add">    return super.parameter(name);</span>
+} catch (ParameterNotFoundException exception) {
+    if (cause!=null) try {
+        exception.initCause(cause);</pre></td></tr>
+<tr><td><pre>{
+    return getValue(row, column, numRow.intValue(), numCol.intValue());
+}
+<span class="del"></span>
+/**
+ * Implementation of {@link #getValue(int,int)}.
+ *</pre></td>
+<td><pre>{
+    return getValue(row, column, numRow.intValue(), numCol.intValue());
+}
+/**
+ * Implementation of {@link #getValue(int,int)}.
+ *</pre></td></tr>
+<tr><td><pre>{
+    MatrixParameters.checkIndice("row",    row,    numRow);
+    MatrixParameters.checkIndice("column", column, numCol);
+<span class="del">    if (values == null) {</span>
+<span class="del">        values = new ParameterValue[numRow][];</span>
+    }
+<span class="del">    if (row &gt;= values.length) {</span>
+<span class="del">        values = (ParameterValue[][]) XArray.resize(values, numRow);</span>
+    }
+<span class="del">    ParameterValue[] rowValues = values[row];</span>
+    if (rowValues == null) {
+<span class="del">        values[row] = rowValues = new ParameterValue[numCol];</span>
+    }
+    if (column &gt;= rowValues.length) {
+<span class="del">        values[row] = rowValues = (ParameterValue[]) XArray.resize(rowValues, numCol);</span>
+    }
+    ParameterValue param = rowValues[column];
+    if (param == null) {
+<span class="del">        rowValues[column] = param = new ParameterRealValue(</span>
+                ((MatrixParameters) descriptor).getParameter(row, column, numRow, numCol));
+    }
+    return param;
+}
+<span class="del"></span>
+/**
+ * Returns the parameters descriptors in this group. The amount of parameters depends
+ * on the value of &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameters.
+ */
+<span class="del">public GeneralOperationParameter[] getParameters() {</span>
+    return ((MatrixParameters) descriptor).getParameters(numRow.intValue(),
+                                                         numCol.intValue());
+}
+
+/**
+ * Returns the parameters values in this group. The amount of parameters depends
+ * on the value of &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameters.</pre></td>
+<td><pre>{
+    MatrixParameters.checkIndice("row",    row,    numRow);
+    MatrixParameters.checkIndice("column", column, numCol);
+<span class="add">    if (matrixValues == null) {</span>
+<span class="add">        matrixValues = new ParameterValue[numRow][];</span>
+    }
+<span class="add">    if (row &gt;= matrixValues.length) {</span>
+<span class="add">        matrixValues = (ParameterValue[][]) XArray.resize(matrixValues, numRow);</span>
+    }
+<span class="add">    ParameterValue[] rowValues = matrixValues[row];</span>
+    if (rowValues == null) {
+<span class="add">        matrixValues[row] = rowValues = new ParameterValue[numCol];</span>
+    }
+    if (column &gt;= rowValues.length) {
+<span class="add">        matrixValues[row] = rowValues = (ParameterValue[]) XArray.resize(rowValues, numCol);</span>
+    }
+    ParameterValue param = rowValues[column];
+    if (param == null) {
+<span class="add">        rowValues[column] = param = new ParameterReal(</span>
+                ((MatrixParameters) descriptor).getParameter(row, column, numRow, numCol));
+    }
+    return param;
+}
+<span class="add">public final void delValue(final int row, final int column){</span>
+<span class="add">    delValue(row, column, numRow.intValue(), numCol.intValue());</span>
+<span class="add">}</span>
+<span class="add">public void delValue( int row, int column, int numRow, int numCol ){</span>
+<span class="add">    if( matrixValues == null ){</span>
+<span class="add">        return; // nothing to remove</span>
+<span class="add">    }</span>
+<span class="add">    final ParameterValue[] rowValues = matrixValues[column];</span>
+<span class="add">    if( rowValues == null ){</span>
+<span class="add">        // nothing there</span>
+<span class="add">        return;</span>
+<span class="add">    }</span>
+<span class="add">    if ( row &lt; rowValues.length) {</span>
+<span class="add">        rowValues[row] = null;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+/**
+ * Returns the parameters descriptors in this group. The amount of parameters depends
+ * on the value of &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameters.
+ */
+<span class="add">public GeneralParameterDescriptor[] getParameters() {</span>
+    return ((MatrixParameters) descriptor).getParameters(numRow.intValue(),
+                                                         numCol.intValue());
+}
+
+<span class="add">/* (non-Javadoc)</span>
+<span class="add"> * @see org.geotools.parameter.ParameterGroup#values()</span>
+<span class="add"> */</span>
+<span class="add">public List values() {</span>
+<span class="add">    GeneralParameterValue[] params = getValues();</span>
+<span class="add">    List list = new ArrayList();</span>
+<span class="add">    for( int i=0; i&lt;params.length; i++ ){</span>
+<span class="add">        list.add( params[i] );</span>
+<span class="add">    }</span>
+<span class="add">    return list;</span>
+<span class="add">}</span>
+/**
+ * Returns the parameters values in this group. The amount of parameters depends
+ * on the value of &lt;code&gt;"num_row"&lt;/code&gt; and &lt;code&gt;"num_col"&lt;/code&gt; parameters.</pre></td></tr>
+<tr><td><pre>int k = 0;
+parameters[k++] = this.numRow;
+parameters[k++] = this.numCol;
+<span class="del">if (values != null) {</span>
+<span class="del">    final int maxRow = Math.min(numRow, values.length);</span>
+    for (int j=0; j&lt;maxRow; j++) {
+<span class="del">        final ParameterValue[] rowValues = values[j];</span>
+        if (rowValues != null) {
+            final int maxCol = Math.min(numCol, rowValues.length);
+            for (int i=0; i&lt;maxCol; i++) {</pre></td>
+<td><pre>int k = 0;
+parameters[k++] = this.numRow;
+parameters[k++] = this.numCol;
+<span class="add">if (matrixValues != null) {</span>
+<span class="add">    final int maxRow = Math.min(numRow, matrixValues.length);</span>
+    for (int j=0; j&lt;maxRow; j++) {
+<span class="add">        final ParameterValue[] rowValues = matrixValues[j];</span>
+        if (rowValues != null) {
+            final int maxCol = Math.min(numCol, rowValues.length);
+            for (int i=0; i&lt;maxCol; i++) {</pre></td></tr>
+<tr><td><pre>final int numRow = this.numRow.intValue();
+final int numCol = this.numCol.intValue();
+final GeneralMatrix matrix = new GeneralMatrix(numRow, numCol);
+<span class="del">if (values != null) {</span>
+    for (int j=0; j&lt;numRow; j++) {
+<span class="del">        final ParameterValue[] row = values[j];</span>
+        if (row != null) {
+            for (int i=0; i&lt;numCol; i++) {
+                final ParameterValue element = row[i];</pre></td>
+<td><pre>final int numRow = this.numRow.intValue();
+final int numCol = this.numCol.intValue();
+final GeneralMatrix matrix = new GeneralMatrix(numRow, numCol);
+<span class="add">if (matrixValues != null) {</span>
+    for (int j=0; j&lt;numRow; j++) {
+<span class="add">        final ParameterValue[] row = matrixValues[j];</span>
+        if (row != null) {
+            for (int i=0; i&lt;numCol; i++) {
+                final ParameterValue element = row[i];</pre></td></tr>
+<tr><td><pre> * @param matrix The matrix to copy in this group of parameters.
+ */
+public void setMatrix(final Matrix matrix) {
+<span class="del">    final MatrixParameters descriptor = ((MatrixParameters) this.descriptor);</span>
+    final int numRow = matrix.getNumRow();
+    final int numCol = matrix.getNumCol();
+    this.numRow.setValue(numRow);
+    this.numCol.setValue(numCol);
+<span class="del">    for (int j=0; j&lt;numRow; j++) {</span>
+<span class="del">        for (int i=0; i&lt;numCol; i++) {</span>
+<span class="del">            final double element = matrix.getElement(j,i);</span>
+<span class="del">            final Object def = descriptor.getParameter(j,i, numRow, numCol).getDefaultValue();</span>
+<span class="del">            if (!(def instanceof Number) || element != ((Number)def).doubleValue()) {</span>
+<span class="del">                getValue(j,i, numRow, numCol).setValue(element);</span>
+<span class="del">            } else {</span>
+<span class="del">                /*</span>
+<span class="del">                 * The matrix element has the default value. Delete the corresponding</span>
+<span class="del">                 * entry from this parameter value group.</span>
+<span class="del">                 */</span>
+<span class="del">                if (values!=null &amp;&amp; j&lt;values.length) {</span>
+<span class="del">                    final ParameterValue[] rowValues = values[j];</span>
+<span class="del">                    if (rowValues!=null &amp;&amp; i&lt;rowValues.length) {</span>
+<span class="del">                        rowValues[i] = null;</span>
+                    }
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Compare this object with the specified one for equality.</pre></td>
+<td><pre> * @param matrix The matrix to copy in this group of parameters.
+ */
+public void setMatrix(final Matrix matrix) {
+<span class="add">    final MatrixParameters matrixDescriptor = ((MatrixParameters) this.descriptor);</span>
+    final int numRow = matrix.getNumRow();
+    final int numCol = matrix.getNumCol();
+    this.numRow.setValue(numRow);
+    this.numCol.setValue(numCol);
+<span class="add">    for (int row=0; row&lt;numRow; row++) {</span>
+<span class="add">        for (int col=0; col&lt;numCol; col++) {</span>
+<span class="add">            final double element = matrix.getElement(row,col);</span>
+<span class="add">            ParameterDescriptor descriptor = matrixDescriptor.getParameter( row, col );</span>
+<span class="add">            final Object defaultValue = descriptor.getDefaultValue();</span>
+<span class="add">            if( defaultValue instanceof Number ){</span>
+<span class="add">                double value = ((Number) defaultValue ).doubleValue();</span>
+<span class="add">                if( element != value ){</span>
+<span class="add">                    // ParameterValue paramValue = getValue( row, col );</span>
+<span class="add">                    if( matrixValues == null ){</span>
+<span class="add">                        matrixValues = new ParameterValue[ numRow ][];</span>
+                    }
+<span class="add">                    if( matrixValues[ row] == null ){</span>
+<span class="add">                        matrixValues[ row ] = new ParameterValue[ numCol ];</span>
+                }
+<span class="add">                    ParameterValue realValue = new ParameterReal( descriptor, element );</span>
+<span class="add">                    matrixValues[ row ][ col ] = realValue;</span>
+            }
+<span class="add">                else {</span>
+<span class="add">                    // remove entry to keep things sparse</span>
+<span class="add">                    if( matrixValues != null &amp;&amp; matrixValues[row] != null &amp;&amp;</span>
+<span class="add">                        matrixValues[row][col] != null ){</span>
+<span class="add">                        matrixValues[row][col] = null;</span>
+        }
+    }
+}
+<span class="add">            else {</span>
+<span class="add">                // remove entry</span>
+<span class="add">                if( matrixValues != null &amp;&amp; matrixValues[row] != null &amp;&amp;</span>
+<span class="add">                    matrixValues[row][col] != null ){</span>
+<span class="add">                    matrixValues[row][col] = null;</span>
+<span class="add">                }</span>
+<span class="add">            }</span>
+<span class="add">        }</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+
+/**
+ * Compare this object with the specified one for equality.</pre></td></tr>
+<tr><td><pre> */
+public Object clone() {
+    final MatrixParameterValues copy = (MatrixParameterValues) super.clone();
+<span class="del">    if (copy.values != null) {</span>
+        copy.numRow = (ParameterValue)     copy.getValue(0);
+        copy.numCol = (ParameterValue)     copy.getValue(1);
+<span class="del">        copy.values = (ParameterValue[][]) copy.values.clone();</span>
+<span class="del">        for (int j=0; j&lt;copy.values.length; j++) {</span>
+<span class="del">            ParameterValue[] array = copy.values[j];</span>
+            if (array != null) {
+<span class="del">                copy.values[j] = array = (ParameterValue[]) array.clone();</span>
+                for (int i=0; i&lt;array.length; i++) {
+                    if (array[i] != null) {
+                        array[i] = (ParameterValue) array[i].clone();</pre></td>
+<td><pre> */
+public Object clone() {
+    final MatrixParameterValues copy = (MatrixParameterValues) super.clone();
+<span class="add">    if (copy.matrixValues != null) {</span>
+        copy.numRow = (ParameterValue)     copy.getValue(0);
+        copy.numCol = (ParameterValue)     copy.getValue(1);
+<span class="add">        copy.matrixValues = (ParameterValue[][]) copy.matrixValues.clone();</span>
+<span class="add">        for (int j=0; j&lt;copy.matrixValues.length; j++) {</span>
+<span class="add">            ParameterValue[] array = copy.matrixValues[j];</span>
+            if (array != null) {
+<span class="add">                copy.matrixValues[j] = array = (ParameterValue[]) array.clone();</span>
+                for (int i=0; i&lt;array.length; i++) {
+                    if (array[i] != null) {
+                        array[i] = (ParameterValue) array[i].clone();</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/07860/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/07860/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml (added)
+++ sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameterDescriptors changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameterDescriptors 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/referencing/src/main/java/org/geotools/parameter/MatrixParameterDescriptors.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) 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) 2004, 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.parameter;
+
+// J2SE dependencies
+import java.util.Map;
+<span class="del">import java.util.List;</span>
+<span class="del">import java.util.Iterator;</span>
+<span class="del">import java.util.Collections;</span>
+import javax.units.Unit;
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.parameter.ParameterValue;
+<span class="del">import org.opengis.parameter.ParameterDescriptor;</span>
+import org.opengis.parameter.ParameterValueGroup;
+<span class="del">import org.opengis.parameter.GeneralParameterValue;</span>
+<span class="del">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+<span class="del">import org.opengis.parameter.ParameterNotFoundException;</span>
+<span class="del">import org.opengis.parameter.InvalidParameterNameException;</span>
+import org.opengis.referencing.operation.Matrix;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.referencing.IdentifiedObject;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+<span class="del">import org.geotools.resources.cts.Resources;</span>
+<span class="del">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="del">import org.geotools.resources.UnmodifiableArrayList;</span>
+<span class="del">import org.geotools.referencing.operation.GeneralMatrix;</span>
+
+<span class="del"></span>
+/**
+ * A parameter group for {@linkplain Matrix matrix} elements.  The amount of
+ * {@linkplain ParameterValue parameter values} is extensible, i.e. it can grown or</pre></td>
+<td><pre>package org.geotools.parameter;
+
+// J2SE dependencies
+<span class="add">import java.util.Collections;</span>
+<span class="add">import java.util.Iterator;</span>
+<span class="add">import java.util.List;</span>
+import java.util.Map;
+<span class="add"></span>
+import javax.units.Unit;
+
+<span class="add">import org.geotools.referencing.IdentifiedObject;</span>
+<span class="add">import org.geotools.referencing.operation.GeneralMatrix;</span>
+<span class="add">import org.geotools.resources.UnmodifiableArrayList;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.cts.Resources;</span>
+<span class="add">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.GeneralParameterValue;</span>
+<span class="add">import org.opengis.parameter.InvalidParameterNameException;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.ParameterNotFoundException;</span>
+import org.opengis.parameter.ParameterValue;
+import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.referencing.operation.Matrix;
+
+
+/**
+ * A parameter group for {@linkplain Matrix matrix} elements.  The amount of
+ * {@linkplain ParameterValue parameter values} is extensible, i.e. it can grown or</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/MatrixParameterDescriptors.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/MatrixParameters.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/MatrixParameters.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/10796/MatrixParameters.xhtml (added)
+++ sis/ip-review/rev/10796/MatrixParameters.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameters changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameters 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/referencing/src/main/java/org/geotools/parameter/MatrixParameters.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) 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) 2004, 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.parameter;
+
+// OpenGIS dependencies
+import java.util.List;
+<span class="del">import java.util.ArrayList;</span>
+<span class="del">import java.io.IOException;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+import org.opengis.metadata.Identifier;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+<span class="del">import org.opengis.parameter.ParameterValue;</span>
+<span class="del">import org.opengis.parameter.ParameterValueGroup;</span>
+<span class="del">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="del">import org.opengis.parameter.GeneralParameterValue;</span>
+<span class="del">import org.opengis.parameter.ParameterDescriptorGroup;</span>
+<span class="del">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+<span class="del">import org.opengis.parameter.ParameterNotFoundException;</span>
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.io.TableWriter;</span>
+<span class="del">import org.geotools.resources.XArray;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+<span class="del">import org.geotools.resources.UnmodifiableArrayList;</span>
+<span class="del">import org.geotools.referencing.operation.GeneralMatrix;</span>
+<span class="del">import org.geotools.referencing.wkt.UnformattableObjectException;</span>
+
+<span class="del"></span>
+/**
+ * The values for a group of {@linkplain MatrixParameterDescriptors matrix parameters}. This value
+ * group is extensible, i.e. the number of &lt;code&gt;"elt_&lt;var&gt;row&lt;/var&gt;_&lt;var&gt;col&lt;/var&gt;"&lt;/code&gt;</pre></td>
+<td><pre>package org.geotools.parameter;
+
+// OpenGIS dependencies
+<span class="add">import java.io.IOException;</span>
+import java.util.List;
+
+<span class="add">import org.geotools.io.TableWriter;</span>
+<span class="add">import org.geotools.referencing.operation.GeneralMatrix;</span>
+<span class="add">import org.geotools.resources.UnmodifiableArrayList;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.resources.XArray;</span>
+import org.opengis.metadata.Identifier;
+<span class="add">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.GeneralParameterValue;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptorGroup;</span>
+<span class="add">import org.opengis.parameter.ParameterNotFoundException;</span>
+<span class="add">import org.opengis.parameter.ParameterValue;</span>
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.GenericName;
+import org.opengis.util.InternationalString;
+
+
+/**
+ * The values for a group of {@linkplain MatrixParameterDescriptors matrix parameters}. This value
+ * group is extensible, i.e. the number of &lt;code&gt;"elt_&lt;var&gt;row&lt;/var&gt;_&lt;var&gt;col&lt;/var&gt;"&lt;/code&gt;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/MeasurementParameter.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/MeasurementParameter.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/10796/MeasurementParameter.xhtml (added)
+++ sis/ip-review/rev/10796/MeasurementParameter.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MeasurementParameter changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MeasurementParameter 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/referencing/src/main/java/org/geotools/parameter/FloatParameter.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.parameter;
+
+// J2SE dependencies and extensions
+import java.net.URL;
+import javax.units.Unit;
+<span class="del">import java.io.IOException;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="del">import org.opengis.parameter.InvalidParameterTypeException;</span>
+<span class="del">import org.opengis.parameter.InvalidParameterValueException;</span>
+<span class="del"></span>
+<span class="del">// Geotools dependencies</span>
+import org.geotools.io.TableWriter;
+import org.geotools.resources.Utilities;
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.resources.cts.Resources;
+<span class="del">import org.geotools.referencing.wkt.Formatter;</span>
+
+
+/**</pre></td>
+<td><pre>package org.geotools.parameter;
+
+// J2SE dependencies and extensions
+<span class="add">import java.io.IOException;</span>
+import java.net.URL;
+<span class="add"></span>
+import javax.units.Unit;
+
+import org.geotools.io.TableWriter;
+import org.geotools.resources.Utilities;
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.resources.cts.Resources;
+<span class="add">import org.opengis.parameter.InvalidParameterTypeException;</span>
+<span class="add">import org.opengis.parameter.InvalidParameterValueException;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptor;</span>
+
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/MeasurementParameter.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/MeasurementParameter.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/ParameterFormat.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/ParameterFormat.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/10796/ParameterFormat.xhtml (added)
+++ sis/ip-review/rev/10796/ParameterFormat.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>ParameterFormat changes for revisions 10795:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>ParameterFormat 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/referencing/src/main/java/org/geotools/parameter/ParameterWriter.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>package org.geotools.parameter;
+
+// J2SE dependencies
+import java.util.Date;
+<span class="del">import java.util.Map;</span>
+import java.util.LinkedHashMap;
+import java.util.List;
+<span class="del">import java.util.ArrayList;</span>
+<span class="del">import java.util.Collection;</span>
+<span class="del">import java.util.Iterator;</span>
+<span class="del">import java.util.Arrays;</span>
+import java.util.Locale;
+<span class="del">import java.text.DateFormat;</span>
+<span class="del">import java.text.NumberFormat;</span>
+<span class="del">import java.lang.reflect.Array;</span>
+<span class="del">import java.io.IOException;</span>
+<span class="del">import java.io.FilterWriter;</span>
+<span class="del">import java.io.Writer;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.util.GenericName;</span>
+import org.opengis.metadata.Identifier;
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+<span class="del">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+import org.opengis.parameter.ParameterValue;
+import org.opengis.parameter.ParameterValueGroup;
+<span class="del">import org.opengis.parameter.GeneralParameterValue;</span>
+import org.opengis.referencing.operation.OperationMethod;
+<span class="del">import org.opengis.referencing.IdentifiedObject;</span>
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.io.TableWriter;</span>
+<span class="del">import org.geotools.measure.Angle;</span>
+<span class="del">import org.geotools.measure.AngleFormat;</span>
+<span class="del">import org.geotools.resources.XArray;</span>
+<span class="del">import org.geotools.resources.Arguments;</span>
+<span class="del">import org.geotools.resources.Utilities;</span>
+<span class="del">import org.geotools.resources.gcs.Resources;</span>
+<span class="del">import org.geotools.resources.gcs.ResourceKeys;</span>
+
+<span class="del"></span>
+/**
+ * Format {@linkplain ParameterDescriptorGroup parameter descriptors} or
+ * {@linkplain ParameterValueGroup parameter values} in a tabular format.</pre></td>
+<td><pre>package org.geotools.parameter;
+
+// J2SE dependencies
+<span class="add">import java.io.FilterWriter;</span>
+<span class="add">import java.io.IOException;</span>
+<span class="add">import java.io.Writer;</span>
+<span class="add">import java.lang.reflect.Array;</span>
+<span class="add">import java.text.DateFormat;</span>
+<span class="add">import java.text.NumberFormat;</span>
+<span class="add">import java.util.ArrayList;</span>
+<span class="add">import java.util.Collection;</span>
+import java.util.Date;
+<span class="add">import java.util.Iterator;</span>
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+<span class="add">import java.util.Map;</span>
+
+<span class="add">import org.geotools.io.TableWriter;</span>
+<span class="add">import org.geotools.measure.Angle;</span>
+<span class="add">import org.geotools.measure.AngleFormat;</span>
+<span class="add">import org.geotools.resources.Arguments;</span>
+<span class="add">import org.geotools.resources.Utilities;</span>
+<span class="add">import org.geotools.resources.XArray;</span>
+<span class="add">import org.geotools.resources.gcs.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.gcs.Resources;</span>
+import org.opengis.metadata.Identifier;
+<span class="add">import org.opengis.parameter.GeneralParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.GeneralParameterValue;</span>
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterValue;
+import org.opengis.parameter.ParameterValueGroup;
+<span class="add">import org.opengis.referencing.IdentifiedObject;</span>
+import org.opengis.referencing.operation.OperationMethod;
+<span class="add">import org.opengis.util.GenericName;</span>
+
+
+/**
+ * Format {@linkplain ParameterDescriptorGroup parameter descriptors} or
+ * {@linkplain ParameterValueGroup parameter values} in a tabular format.</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/ParameterFormat.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/ParameterFormat.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml (added)
+++ sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameterDescriptors changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameterDescriptors changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option) any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/MatrixParameterDescriptors.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2004, Geotools Project Managment Committee (PMC)</span>
+ * (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
+<span class="del"> *    License as published by the Free Software Foundation; either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ *    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.
+<span class="del"> *</span>
+<span class="del"> *    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del"> *    License along with this library; if not, write to the Free Software</span>
+<span class="del"> *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</span>
+ */
+package org.geotools.parameter;</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *    (C) 2004-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (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
+<span class="add"> *    License as published by the Free Software Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    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.parameter;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/MatrixParameterDescriptors.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/MatrixParameters.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/MatrixParameters.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/20874/MatrixParameters.xhtml (added)
+++ sis/ip-review/rev/20874/MatrixParameters.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameters changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameters changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option) any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/MatrixParameters.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2004, Geotools Project Managment Committee (PMC)</span>
+ * (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
+<span class="del"> *    License as published by the Free Software Foundation; either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ *    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.
+<span class="del"> *</span>
+<span class="del"> *    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del"> *    License along with this library; if not, write to the Free Software</span>
+<span class="del"> *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</span>
+ */
+package org.geotools.parameter;</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *    (C) 2004-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (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
+<span class="add"> *    License as published by the Free Software Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    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.parameter;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/MeasurementParameter.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/MeasurementParameter.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/20874/MeasurementParameter.xhtml (added)
+++ sis/ip-review/rev/20874/MeasurementParameter.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MeasurementParameter changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MeasurementParameter changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option) any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/FloatParameter.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2004, Geotools Project Managment Committee (PMC)</span>
+ * (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
+<span class="del"> *    License as published by the Free Software Foundation; either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *    (C) 2004-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (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
+<span class="add"> *    License as published by the Free Software Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td></tr>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del">*    License along with this library; if not, write to the Free Software</span>
+<span class="del">*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</span>
+<span class="del">*</span>
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/MeasurementParameter.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/MeasurementParameter.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/ParameterFormat.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/ParameterFormat.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/20874/ParameterFormat.xhtml (added)
+++ sis/ip-review/rev/20874/ParameterFormat.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>ParameterFormat changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>ParameterFormat changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option) any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/ParameterWriter.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2004, Geotools Project Managment Committee (PMC)</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="del"> *    License as published by the Free Software Foundation; either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ *    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.
+<span class="del"> *</span>
+<span class="del"> *    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del"> *    License along with this library; if not, write to the Free Software</span>
+<span class="del"> *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</span>
+ */
+package org.geotools.parameter;</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *    (C) 2004-2006, GeoTools Project Managment Committee (PMC)</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="add"> *    License as published by the Free Software Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    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.parameter;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/ParameterFormat.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/ParameterFormat.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/24973/MatrixParameters.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/24973/MatrixParameters.xhtml?rev=1575895&view=auto
==============================================================================
--- sis/ip-review/rev/24973/MatrixParameters.xhtml (added)
+++ sis/ip-review/rev/24973/MatrixParameters.xhtml Mon Mar 10 10:38:40 2014
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MatrixParameters changes for revisions 24972:24973</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MatrixParameters changes for revisions 24972:24973</h1>
+<p>Replacement of <code>Identifier</code> by <code>ReferenceIdentifier</code>.
+This change has been forced by a GeoAPI change. Reverting this change causes a compilation failure,
+which is resolved by reapplying the same change as required by GeoAPI interfaces. So rewriting this
+contribution produces identical result (except for the removal of <code>GenericName</code> import).</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24972:24973 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/parameter/MatrixParameters.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 24972</th><th>Revision 24973</th></tr>
+<tr><td><pre>import java.util.Set;
+
+// OpenGIS dependencies
+<span class="del">import org.opengis.metadata.Identifier;</span>
+import org.opengis.parameter.GeneralParameterDescriptor;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.parameter.ParameterDescriptor;</pre></td>
+<td><pre>import java.util.Set;
+
+// OpenGIS dependencies
+import org.opengis.parameter.GeneralParameterDescriptor;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.parameter.ParameterDescriptor;</pre></td></tr>
+<tr><td><pre>import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+import org.opengis.parameter.ParameterValue;
+import org.opengis.referencing.operation.Matrix;
+<span class="del">import org.opengis.util.GenericName;</span>
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies</pre></td>
+<td><pre>import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+import org.opengis.parameter.ParameterValue;
+<span class="add">import org.opengis.referencing.ReferenceIdentifier;</span>
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.InternationalString;
+
+// Geotools dependencies</pre></td></tr>
+<tr><td><pre> * Forward the call to the {@linkplain MatrixParameterDescriptors matrix parameter descriptors}
+ * specified at construction time.
+ */
+<span class="del">public Identifier getName() {</span>
+    return descriptor.getName();
+}</pre></td>
+<td><pre> * Forward the call to the {@linkplain MatrixParameterDescriptors matrix parameter descriptors}
+ * specified at construction time.
+ */
+<span class="add">public ReferenceIdentifier getName() {</span>
+    return descriptor.getName();
+}</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/24973/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/24973/MatrixParameters.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html



Mime
View raw message