sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1600340 [2/2] - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/internal/referencing/ sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/ sis...
Date Wed, 04 Jun 2014 17:00:14 GMT
Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java?rev=1600340&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import org.opengis.referencing.operation.MathTransform1D;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.referencing.operation.NoninvertibleTransformException;
+
+
+/**
+ * Concatenated transform where both transforms are one-dimensional.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.5 (derived from geotk-2.0)
+ * @version 0.5
+ * @module
+ */
+final class ConcatenatedTransformDirect1D extends ConcatenatedTransformDirect implements
MathTransform1D {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = 1064398659892864966L;
+
+    /**
+     * Constructs a concatenated transform.
+     */
+    ConcatenatedTransformDirect1D(final MathTransform1D transform1,
+                                  final MathTransform1D transform2)
+    {
+        super(transform1, transform2);
+    }
+
+    /**
+     * Checks if transforms are compatibles with this implementation.
+     */
+    @Override
+    boolean isValid() {
+        return super.isValid() && (getSourceDimensions() == 1) && (getTargetDimensions()
== 1);
+    }
+
+    /**
+     * Transforms the specified value.
+     */
+    @Override
+    public double transform(final double value) throws TransformException {
+        return ((MathTransform1D) transform2).transform(
+               ((MathTransform1D) transform1).transform(value));
+    }
+
+    /**
+     * Gets the derivative of this function at a value.
+     */
+    @Override
+    public double derivative(final double value) throws TransformException {
+        final double value1 = ((MathTransform1D) transform1).derivative(value);
+        final double value2 = ((MathTransform1D) transform2).derivative(
+                              ((MathTransform1D) transform1).transform(value));
+        return value2 * value1;
+    }
+
+    /**
+     * Creates the inverse transform of this object.
+     */
+    @Override
+    public MathTransform1D inverse() throws NoninvertibleTransformException {
+        return (MathTransform1D) super.inverse();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect1D.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java?rev=1600340&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import java.awt.Shape;
+import java.awt.geom.Point2D;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.referencing.operation.MathTransform2D;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.referencing.operation.NoninvertibleTransformException;
+import org.apache.sis.referencing.operation.matrix.MatrixSIS;
+
+
+/**
+ * Concatenated transform where both transforms are two-dimensional.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.5 (derived from geotk-1.2)
+ * @version 0.5
+ * @module
+ */
+final class ConcatenatedTransformDirect2D extends ConcatenatedTransformDirect implements
MathTransform2D {
+    /**
+     * Serial number for inter-operability with different versions.
+     */
+    private static final long serialVersionUID = 6009454091075588885L;
+
+    /**
+     * Constructs a concatenated transform.
+     */
+    public ConcatenatedTransformDirect2D(final MathTransform2D transform1,
+                                         final MathTransform2D transform2)
+    {
+        super(transform1, transform2);
+    }
+
+    /**
+     * Checks if transforms are compatibles with this implementation.
+     */
+    @Override
+    boolean isValid() {
+        return super.isValid() && (getSourceDimensions() == 2) && (getTargetDimensions()
== 2);
+    }
+
+    /**
+     * Transforms the specified {@code ptSrc} and stores the result in {@code ptDst}.
+     */
+    @Override
+    public Point2D transform(final Point2D ptSrc, Point2D ptDst) throws TransformException
{
+        assert isValid();
+        final MathTransform2D transform1 = (MathTransform2D) this.transform1;
+        final MathTransform2D transform2 = (MathTransform2D) this.transform2;
+        ptDst = transform1.transform(ptSrc, ptDst);
+        return  transform2.transform(ptDst, ptDst);
+    }
+
+    /**
+     * Transform the specified shape.
+     *
+     * @param  shape Shape to transform.
+     * @return Transformed shape.
+     * @throws TransformException if a transform failed.
+     */
+    @Override
+    public Shape createTransformedShape(final Shape shape) throws TransformException {
+        return AbstractMathTransform2D.createTransformedShape(this, shape, null, null, false);
+    }
+
+    /**
+     * Gets the derivative of this transform at a point.
+     *
+     * @param  point The coordinate point where to evaluate the derivative.
+     * @return The derivative at the specified point (never {@code null}).
+     * @throws TransformException if the derivative can't be evaluated at the specified point.
+     */
+    @Override
+    public Matrix derivative(final Point2D point) throws TransformException {
+        final MathTransform2D transform1 = (MathTransform2D) this.transform1;
+        final MathTransform2D transform2 = (MathTransform2D) this.transform2;
+        final Matrix matrix1 = transform1.derivative(point);
+        final Matrix matrix2 = transform2.derivative(transform1.transform(point,null));
+        return MatrixSIS.castOrCopy(matrix2).multiply(matrix1);
+    }
+
+    /**
+     * Creates the inverse transform of this object.
+     */
+    @Override
+    public MathTransform2D inverse() throws NoninvertibleTransformException {
+        return (MathTransform2D) super.inverse();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformDirect2D.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java?rev=1600340&r1=1600339&r2=1600340&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -38,7 +38,7 @@ import org.opengis.referencing.operation
  * @version 0.4
  * @module
  *
- * @see org.apache.sis.referencing.operation.MathTransforms
+ * @see MathTransforms#getMatrix(MathTransform)
  */
 public interface LinearTransform extends MathTransform {
     /**

Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java?rev=1600340&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -0,0 +1,236 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import java.awt.geom.AffineTransform;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.MathTransform1D;
+import org.opengis.referencing.operation.MathTransform2D;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.referencing.operation.MathTransformFactory;
+import org.apache.sis.internal.referencing.DirectPositionView;
+import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
+import org.apache.sis.util.Static;
+
+import static org.apache.sis.util.ArgumentChecks.*;
+
+
+/**
+ * Utility methods related to {@link MathTransform}s. This class centralizes in one place
some of the
+ * most commonly used functions from the {@link org.apache.sis.referencing.operation.transform}
package,
+ * thus reducing the need to explore that low-level package.
+ * The {@code MathTransforms} class provides the following services:
+ *
+ * <ul>
+ *   <li>Create various SIS implementations of {@link MathTransform}.</li>
+ *   <li>Perform non-standard operations on arbitrary instances.</li>
+ * </ul>
+ *
+ * The factory static methods are provided as convenient alternatives to the GeoAPI {@link
MathTransformFactory}
+ * interface. However users seeking for more implementation neutrality are encouraged to
limit themselves to the
+ * GeoAPI factory interfaces instead.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.5 (derived from geotk-3.20)
+ * @version 0.5
+ * @module
+ *
+ * @see MathTransformFactory
+ */
+public final class MathTransforms extends Static {
+    /**
+     * Do not allow instantiation of this class.
+     */
+    private MathTransforms() {
+    }
+
+    /**
+     * Concatenates the two given transforms. The returned transform will implement
+     * {@link MathTransform1D} or {@link MathTransform2D} if the dimensions of the
+     * concatenated transform are equal to 1 or 2 respectively.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of the first transform
+     *         does not match the input dimension of the second transform.
+     *
+     * @see MathTransformFactory#createConcatenatedTransform(MathTransform, MathTransform)
+     */
+    public static MathTransform concatenate(final MathTransform tr1, final MathTransform
tr2)
+            throws MismatchedDimensionException
+    {
+        ensureNonNull("tr1", tr1);
+        ensureNonNull("tr2", tr2);
+        return ConcatenatedTransform.create(tr1, tr2);
+    }
+
+    /**
+     * Concatenates the given one-dimensional transforms. This is a convenience methods
+     * delegating to {@link #concatenate(MathTransform, MathTransform)} and casting the
+     * result to a {@link MathTransform1D} instance.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of the first transform
+     *         does not match the input dimension of the second transform.
+     */
+    public static MathTransform1D concatenate(MathTransform1D tr1, MathTransform1D tr2)
+            throws MismatchedDimensionException
+    {
+        return (MathTransform1D) concatenate((MathTransform) tr1, (MathTransform) tr2);
+    }
+
+    /**
+     * Concatenates the given two-dimensional transforms. This is a convenience methods
+     * delegating to {@link #concatenate(MathTransform, MathTransform)} and casting the
+     * result to a {@link MathTransform2D} instance.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of the first transform
+     *         does not match the input dimension of the second transform.
+     */
+    public static MathTransform2D concatenate(MathTransform2D tr1, MathTransform2D tr2)
+            throws MismatchedDimensionException
+    {
+        return (MathTransform2D) concatenate((MathTransform) tr1, (MathTransform) tr2);
+    }
+
+    /**
+     * Concatenates the three given transforms. This is a convenience methods doing its job
+     * as two consecutive concatenations.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @param tr3 The third math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of a transform
+     *         does not match the input dimension of next transform.
+     */
+    public static MathTransform concatenate(MathTransform tr1, MathTransform tr2, MathTransform
tr3)
+            throws MismatchedDimensionException
+    {
+        ensureNonNull("tr1", tr1);
+        ensureNonNull("tr2", tr2);
+        ensureNonNull("tr3", tr3);
+        return concatenate(concatenate(tr1, tr2), tr3);
+    }
+
+    /**
+     * Concatenates the three given one-dimensional transforms. This is a convenience methods
+     * delegating to {@link #concatenate(MathTransform, MathTransform, MathTransform)} and
+     * casting the result to a {@link MathTransform1D} instance.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @param tr3 The third math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of a transform
+     *         does not match the input dimension of next transform.
+     */
+    public static MathTransform1D concatenate(MathTransform1D tr1, MathTransform1D tr2, MathTransform1D
tr3)
+            throws MismatchedDimensionException
+    {
+        return (MathTransform1D) concatenate((MathTransform) tr1, (MathTransform) tr2, (MathTransform)
tr3);
+    }
+
+    /**
+     * Concatenates the three given two-dimensional transforms. This is a convenience methods
+     * delegating to {@link #concatenate(MathTransform, MathTransform, MathTransform)} and
+     * casting the result to a {@link MathTransform2D} instance.
+     *
+     * @param tr1 The first math transform.
+     * @param tr2 The second math transform.
+     * @param tr3 The third math transform.
+     * @return    The concatenated transform.
+     * @throws MismatchedDimensionException if the output dimension of a transform
+     *         does not match the input dimension of next transform.
+     */
+    public static MathTransform2D concatenate(MathTransform2D tr1, MathTransform2D tr2, MathTransform2D
tr3)
+            throws MismatchedDimensionException
+    {
+        return (MathTransform2D) concatenate((MathTransform) tr1, (MathTransform) tr2, (MathTransform)
tr3);
+    }
+
+    /**
+     * If the given transform is linear, returns its coefficients as a matrix.
+     * More specifically:
+     *
+     * <ul>
+     *   <li>If the given transform is an instance of {@link LinearTransform}, returns
+     *       {@link LinearTransform#getMatrix()}.</li>
+     *   <li>Otherwise if the given transform is an instance of {@link AffineTransform},
+     *       returns its coefficients in a {@link Matrix3} instance.</li>
+     *   <li>Otherwise returns {@code null}.</li>
+     * </ul>
+     *
+     * @param  transform The transform, or {@code null}.
+     * @return The matrix of the given transform, or {@code null} if none.
+     */
+    public static Matrix getMatrix(final MathTransform transform) {
+        if (transform instanceof LinearTransform) {
+            return ((LinearTransform) transform).getMatrix();
+        }
+        if (transform instanceof AffineTransform) {
+            return AffineTransforms2D.toMatrix((AffineTransform) transform);
+        }
+        return null;
+    }
+
+    /**
+     * A buckle method for calculating derivative and coordinate transformation in a single
step.
+     * The transform result is stored in the given destination array, and the derivative
matrix
+     * is returned. Invoking this method is equivalent to the following code, except that
it may
+     * execute faster with some {@code MathTransform} implementations:
+     *
+     * {@preformat java
+     *     DirectPosition ptSrc = ...;
+     *     DirectPosition ptDst = ...;
+     *     Matrix matrixDst = derivative(ptSrc);
+     *     ptDst = transform(ptSrc, ptDst);
+     * }
+     *
+     * @param transform The transform to use.
+     * @param srcPts The array containing the source coordinate.
+     * @param srcOff The offset to the point to be transformed in the source array.
+     * @param dstPts the array into which the transformed coordinate is returned.
+     * @param dstOff The offset to the location of the transformed point that is stored in
the destination array.
+     * @return The matrix of the transform derivative at the given source position.
+     * @throws TransformException If the point can't be transformed or if a problem occurred
+     *         while calculating the derivative.
+     */
+    public static Matrix derivativeAndTransform(final MathTransform transform,
+                                                final double[] srcPts, final int srcOff,
+                                                final double[] dstPts, final int dstOff)
+            throws TransformException
+    {
+        if (transform instanceof AbstractMathTransform) {
+            return ((AbstractMathTransform) transform).transform(srcPts, srcOff, dstPts,
dstOff, true);
+        }
+        // Must be calculated before to transform the coordinate.
+        final Matrix derivative = transform.derivative(new DirectPositionView(srcPts, srcOff,
transform.getSourceDimensions()));
+        if (dstPts != null) {
+            transform.transform(srcPts, srcOff, dstPts, dstOff, 1);
+        }
+        return derivative;
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java?rev=1600340&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.Matrix;
+
+class PassThroughTransform {
+    int firstAffectedOrdinate;
+
+    int numTrailingOrdinates;
+
+    MathTransform subTransform;
+
+    public static MathTransform create(final int firstAffectedOrdinate,
+                                       final MathTransform subTransform,
+                                       final int numTrailingOrdinates)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    final Matrix toSubMatrix(final Matrix matrix) {
+        throw new UnsupportedOperationException();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java?rev=1600340&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import org.opengis.referencing.operation.Matrix;
+
+class ProjectiveTransform {
+    public static LinearTransform create(final Matrix matrix) {
+        throw new UnsupportedOperationException();
+    }
+
+    public static LinearTransform identity(final int dimension) {
+        throw new UnsupportedOperationException();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1600340&r1=1600339&r2=1600340&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] Wed Jun  4 17:00:13 2014
@@ -85,6 +85,11 @@ public final class Errors extends Indexe
         public static final short CanNotComputeDerivative = 1;
 
         /**
+         * Can not concatenate transforms “{0}” and “{1}”.
+         */
+        public static final short CanNotConcatenateTransforms_2 = 160;
+
+        /**
          * Can not connect to “{0}”.
          */
         public static final short CanNotConnectTo_1 = 2;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1600340&r1=1600339&r2=1600340&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] Wed Jun  4 17:00:13 2014
@@ -27,6 +27,7 @@
 AbstractType_1                    = Type \u2018{0}\u2019 is abstract.
 AmbiguousName_3                   = Name \u201c{2}\u201d is ambiguous because it can be understood
as either \u201c{0}\u201d or \u201c{1}\u201d.
 CanNotAddToExclusiveSet_2         = No element can be added to this set because properties
\u2018{0}\u2019 and \u2018{1}\u2019 are mutually exclusive.
+CanNotConcatenateTransforms_2     = Can not concatenate transforms \u201c{0}\u201d and \u201c{1}\u201d.
 CanNotConnectTo_1                 = Can not connect to \u201c{0}\u201d.
 CanNotConvertFromType_2           = Can not convert from type \u2018{0}\u2019 to type \u2018{1}\u2019.
 CanNotConvertValue_2              = Can not convert value \u201c{0}\u201d to type \u2018{1}\u2019.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1600340&r1=1600339&r2=1600340&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] Wed Jun  4 17:00:13 2014
@@ -17,6 +17,7 @@
 AbstractType_1                    = Le type \u2018{0}\u2019 est abstrait.
 AmbiguousName_3                   = Le nom \u00ab\u202f{2}\u202f\u00bb est ambigu\u00eb car
il peut \u00eatre interpr\u00e9t\u00e9 comme \u00ab\u202f{0}\u202f\u00bb ou \u00ab\u202f{1}\u202f\u00bb.
 CanNotAddToExclusiveSet_2         = Aucun \u00e9l\u00e9ment ne peut \u00eatre ajout\u00e9
\u00e0 cet ensemble car les propri\u00e9t\u00e9s \u2018{0}\u2019 et \u2018{1}\u2019 sont mutuellement
exclusives.
+CanNotConcatenateTransforms_2     = Les transformations \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb
ne peuvent pas \u00eatre combin\u00e9es.
 CanNotConnectTo_1                 = Ne peut pas se connecter \u00e0 \u00ab\u202f{0}\u202f\u00bb.
 CanNotConvertFromType_2           = Ne peut pas convertir du type \u2018{0}\u2019 vers le
type \u2018{1}\u2019.
 CanNotConvertValue_2              = La valeur \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre
convertie vers le type \u2018{1}\u2019.



Mime
View raw message