sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1746659 - in /sis/branches/JDK7: ./ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/ core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/ ...
Date Thu, 02 Jun 2016 23:23:03 GMT
Author: desruisseaux
Date: Thu Jun  2 23:23:03 2016
New Revision: 1746659

URL: http://svn.apache.org/viewvc?rev=1746659&view=rev
Log:
Merge from JDK8 branch the removal of deprecated methods.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  2 23:23:03 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1746054
+/sis/branches/JDK8:1584960-1746656
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -283,7 +283,7 @@ public class DefaultBand extends Default
 
     /**
      * Returns the wavelength at which the response is the highest.
-     * The units of measurement is given by {@link #getUnits()}.
+     * The units of measurement is given by {@link #getBoundUnits()}.
      *
      * @return Wavelength at which the response is the highest, or {@code null} if unspecified.
      */

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -40,7 +40,7 @@
  * {@code      └─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent
Spatial temporal extent}<br>
  * </td><td class="sep" style="width: 50%; white-space: nowrap">
  *             {@linkplain org.apache.sis.metadata.iso.extent.DefaultExtent             
  Extent}<br>
- * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.extent.AbstractGeographicExtent
    Geographic extent}<br>
+ * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.extent.AbstractGeographicExtent
    Geographic extent} «abstract»<br>
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultVerticalExtent
       Vertical extent}<br>
  * {@code  └─} {@linkplain org.apache.sis.metadata.iso.extent.DefaultTemporalExtent
       Temporal extent}<br>
  *             {@linkplain org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent
Spatial temporal extent}<br>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -153,12 +153,6 @@ public enum AxesConvention implements Ax
         }
 
         @Override
-        @Deprecated
-        public Unit<?> getUnitReplacement(Unit<?> unit) {
-            return getUnitReplacement(null, unit);
-        }
-
-        @Override
         public Unit<?> getUnitReplacement(final CoordinateSystemAxis axis, Unit<?>
unit) {
             if (Units.isLinear(unit)) {
                 unit = SI.METRE;
@@ -171,12 +165,6 @@ public enum AxesConvention implements Ax
         }
 
         @Override
-        @Deprecated
-        public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-            return getDirectionReplacement(null, direction);
-        }
-
-        @Override
         public AxisDirection getDirectionReplacement(final CoordinateSystemAxis axis, final
AxisDirection direction) {
             /*
              * For now we do not touch to inter-cardinal directions (e.g. "North-East")
@@ -250,23 +238,11 @@ public enum AxesConvention implements Ax
         }
 
         @Override
-        @Deprecated
-        public Unit<?> getUnitReplacement(final Unit<?> unit) {
-            return unit;
-        }
-
-        @Override
         public Unit<?> getUnitReplacement(final CoordinateSystemAxis axis, final Unit<?>
unit) {
             return unit;
         }
 
         @Override
-        @Deprecated
-        public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-            return getDirectionReplacement(null, direction);
-        }
-
-        @Override
         public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, AxisDirection
direction) {
             return NORMALIZED.getDirectionReplacement(axis, direction);
         }
@@ -306,23 +282,11 @@ public enum AxesConvention implements Ax
         }
 
         @Override
-        @Deprecated
-        public Unit<?> getUnitReplacement(final Unit<?> unit) {
-            return unit;
-        }
-
-        @Override
         public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, final Unit<?>
unit) {
             return unit;
         }
 
         @Override
-        @Deprecated
-        public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-            return direction;
-        }
-
-        @Override
         public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, final AxisDirection
direction) {
             return direction;
         }
@@ -358,23 +322,11 @@ public enum AxesConvention implements Ax
         }
 
         @Override
-        @Deprecated
-        public Unit<?> getUnitReplacement(final Unit<?> unit) {
-            return unit;
-        }
-
-        @Override
         public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, final Unit<?>
unit) {
             return unit;
         }
 
         @Override
-        @Deprecated
-        public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-            return direction;
-        }
-
-        @Override
         public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, final AxisDirection
direction) {
             return direction;
         }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -83,15 +83,6 @@ public interface AxisFilter {
     AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, AxisDirection direction);
 
     /**
-     * @deprecated Use {@link #getDirectionReplacement(CoordinateSystemAxis, AxisDirection)}
instead.
-     *
-     * @param  direction The original axis direction.
-     * @return The new axis direction, or {@code direction} if there is no change.
-     */
-    @Deprecated
-    AxisDirection getDirectionReplacement(AxisDirection direction);
-
-    /**
      * Returns a replacement for the given axis unit.
      *
      * <div class="note"><b>Example:</b>
@@ -116,13 +107,4 @@ public interface AxisFilter {
      * @since 0.7
      */
     Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit);
-
-    /**
-     * @deprecated Use {@link #getUnitReplacement(CoordinateSystemAxis, Unit)} instead.
-     *
-     * @param  unit The original axis unit.
-     * @return The new axis unit, or {@code unit} if there is no change.
-     */
-    @Deprecated
-    Unit<?> getUnitReplacement(Unit<?> unit);
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -446,16 +446,6 @@ public final class CoordinateSystems ext
             public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, AxisDirection
direction) {
                 return direction;
             }
-
-            @Deprecated @Override
-            public AxisDirection getDirectionReplacement(AxisDirection direction) {
-                return direction;
-            }
-
-            @Deprecated @Override
-            public Unit<?> getUnitReplacement(Unit<?> unit) {
-                return getUnitReplacement(null, unit);
-            }
         });
     }
 
@@ -497,16 +487,6 @@ public final class CoordinateSystems ext
             public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, AxisDirection
direction) {
                 return direction;
             }
-
-            @Deprecated @Override
-            public AxisDirection getDirectionReplacement(AxisDirection direction) {
-                return direction;
-            }
-
-            @Deprecated @Override
-            public Unit<?> getUnitReplacement(Unit<?> unit) {
-                return getUnitReplacement(null, unit);
-            }
         });
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -422,18 +422,6 @@ public class ContextualParameters extend
     }
 
     /**
-     * @deprecated Replaced by {@link #getMatrix(MatrixRole)}.
-     *
-     * @param  norm {@code true} for fetching the <cite>normalization</cite>
transform to apply before the kernel,
-     *         or {@code false} for the <cite>denormalization</cite> transform
to apply after the kernel.
-     * @return The matrix for the requested normalization ({@code true}) or denormalization
({@code false}) affine transform.
-     */
-    @Deprecated
-    public final MatrixSIS getMatrix(final boolean norm) {
-        return getMatrix(norm ? MatrixRole.NORMALIZATION : MatrixRole.DENORMALIZATION);
-    }
-
-    /**
      * Prepends a normalization step converting input ordinates in the two first dimensions
from degrees to radians.
      * The normalization can optionally subtract the given λ₀ value (in degrees) from
the longitude.
      *

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -1185,35 +1185,6 @@ public class DefaultMathTransformFactory
     }
 
     /**
-     * Creates a transform from a base to a derived CS using an existing parameterized transform.
-     * The given {@code parameterized} transform shall expect
-     * {@linkplain org.apache.sis.referencing.cs.AxesConvention#NORMALIZED normalized} input
coordinates and
-     * produce normalized output coordinates.
-     *
-     * @param  baseCS        The source coordinate system.
-     * @param  parameterized A <cite>base to derived</cite> transform for normalized
input and output coordinates.
-     * @param  derivedCS     The target coordinate system.
-     * @return The transform from {@code baseCS} to {@code derivedCS}, including unit conversions
and axis swapping.
-     * @throws FactoryException if the object creation failed. This exception is thrown
-     *         if some required parameter has not been supplied, or has illegal value.
-     *
-     * @deprecated Replaced by {@link #swapAndScaleAxes(MathTransform, Context)}.
-     */
-    @Deprecated
-    public MathTransform createBaseToDerived(final CoordinateSystem baseCS,
-            final MathTransform parameterized, final CoordinateSystem derivedCS)
-            throws FactoryException
-    {
-        ArgumentChecks.ensureNonNull("baseCS",        baseCS);
-        ArgumentChecks.ensureNonNull("parameterized", parameterized);
-        ArgumentChecks.ensureNonNull("derivedCS",     derivedCS);
-        final Context context = new Context();
-        context.setSource(baseCS);
-        context.setTarget(derivedCS);
-        return swapAndScaleAxes(parameterized, context);
-    }
-
-    /**
      * Creates a math transform that represent a change of coordinate system.
      *
      * @param source the source coordinate system.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -286,14 +286,6 @@ public final strictfp class CoordinateSy
             }
 
             @Override
-            public Unit<?> getUnitReplacement(Unit<?> unit) {
-                if (Units.isAngular(unit)) {
-                    unit = NonSI.GRADE;
-                }
-                return unit;
-            }
-
-            @Override
             public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?>
unit) {
                 if (Units.isAngular(unit)) {
                     unit = NonSI.GRADE;
@@ -305,11 +297,6 @@ public final strictfp class CoordinateSy
             public AxisDirection getDirectionReplacement(CoordinateSystemAxis axis, final
AxisDirection direction) {
                 return direction;
             }
-
-            @Override
-            public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-                return direction;
-            }
         });
         assertEqualsIgnoreMetadata(targetCS, actualCS);
     }
@@ -330,16 +317,6 @@ public final strictfp class CoordinateSy
             }
 
             @Override
-            public Unit<?> getUnitReplacement(final Unit<?> unit) {
-                return unit;
-            }
-
-            @Override
-            public AxisDirection getDirectionReplacement(final AxisDirection direction) {
-                return direction;
-            }
-
-            @Override
             public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, final Unit<?>
unit) {
                 return unit;
             }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java?rev=1746659&r1=1746658&r2=1746659&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
[UTF-8] Thu Jun  2 23:23:03 2016
@@ -211,24 +211,6 @@ public final class Logging extends Stati
     }
 
     /**
-     * Invoked when an unexpected error occurred. This method logs a message at {@link Level#WARNING}
to the
-     * specified logger. The originating class name and method name are inferred from the
error stack trace,
-     * using the first {@linkplain StackTraceElement stack trace element} for which the class
name is inside
-     * a package or sub-package of the logger name.
-     *
-     * @param  logger Where to log the error, or {@code null} for inferring a default value
from other arguments.
-     * @param  error  The error that occurred, or {@code null} if none.
-     * @return {@code true} if the error has been logged, or {@code false} if the given {@code
error}
-     *         was null or if the logger does not log anything at {@link Level#WARNING}.
-     *
-     * @deprecated Use {@link #unexpectedException(Logger, Class, String, Throwable)} instead.
-     */
-    @Deprecated
-    public static boolean unexpectedException(final Logger logger, final Throwable error)
{
-        return unexpectedException(logger, null, null, error, Level.WARNING);
-    }
-
-    /**
      * Invoked when an unexpected error occurred. This method logs a message at {@link Level#WARNING}
      * to the specified logger. The originating class name and method name can optionally
be specified.
      * If any of them is {@code null}, then it will be inferred from the error stack trace
as described below.



Mime
View raw message