Author: desruisseaux
Date: Thu Feb 12 21:17:27 2015
New Revision: 1659402
URL: http://svn.apache.org/r1659402
Log:
Ported the ParameterizedAffine internal class, to be needed by
MathTransformFactory implementation.
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
(with props)
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java?rev=1659402&r1=1659401&r2=1659402&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
[UTF-8] Thu Feb 12 21:17:27 2015
@@ -411,6 +411,10 @@ public class AffineTransform2D extends I
return true;
}
+ /*
+ * Intentionally no hashCode() method. See equals(Object) for explanation.
+ */
+
/**
* Returns a new affine transform which is a modifiable copy of this
transform. This implementation always
* returns an instance of {@link AffineTransform}, <strong>not</strong>
{@code AffineTransform2D}, because
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java?rev=1659402&view=auto
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
(added)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
[UTF-8] Thu Feb 12 21:17:27 2015
@@ -0,0 +1,145 @@
+/*
+ * 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.internal.referencing.j2d;
+
+import java.util.Objects;
+import java.awt.geom.AffineTransform;
+import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.referencing.operation.MathTransform;
+import org.apache.sis.parameter.Parameterized;
+
+
+/**
+ * An affine transform that remember the parameters used for its construction.
+ * Those parameters may be very different than the usual affine transform
parameters.
+ *
+ * For example an {@link
org.apache.sis.referencing.operation.projection.Equirectangular} projection
+ * can be expressed as an affine transform. In such case, the same affine
transform can be described
+ * by two equivalent set of parameters:
+ *
+ * <ul>
+ * <li>The {@code "elt_0_0"}, {@code "elt_0_1"}, <i>etc.</i> parameters
inherited from the parent class.</li>
+ * <li>The {@code "semi_major"}, {@code "semi_minor"}, <i>etc.</i>
parameters which, when used with the
+ * Equirectangular operation method, produced this affine transform.</li>
+ * </ul>
+ *
+ * This {@code ParameterizedAffine} class can be used when we want to describe
this affine transform
+ * by the Equirectangular set of parameters instead than the generic Affine
set of parameters.
+ * In such case, we must give a reference to an object able to provide those
parameters.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @since 0.6
+ * @version 0.6
+ * @module
+ */
+public final class ParameterizedAffine extends AffineTransform2D {
+ /**
+ * For cross-version compatibility.
+ */
+ private static final long serialVersionUID = 906346920928432466L;
+
+ /**
+ * An object capable to provide the parameters used for creating this
transform.
+ */
+ public final Parameterized parameters;
+
+ /**
+ * {@code true} if {@link #parameters} provides an accurate description of
this transform, or
+ * {@code false} if this transform may be different than the one described
by the parameters.
+ * This field may be {@code false} for example after an Equirectangular
projection has been
+ * concatenated with other affine transforms for unit conversions, axis
swapping, <i>etc</i>.
+ */
+ private final boolean isDefinitive;
+
+ /**
+ * Creates a new transform from the given affine and parameters.
+ *
+ * @param transform The affine transform to copy.
+ * @param parameters The parameters to remember.
+ * @param isDefinitive {@code true} if {@code parameters} provides an
accurate description of {@code transform}, or
+ * {@code false} if the transform may be different
than the one described by {@code parameters}.
+ */
+ public ParameterizedAffine(final AffineTransform transform, final
Parameterized parameters, final boolean isDefinitive) {
+ super(transform);
+ this.parameters = parameters;
+ this.isDefinitive = isDefinitive;
+ }
+
+ /**
+ * Returns the given transform associated to the same parameters than this
{@code ParameterizedAffine},
+ * if possible. If the given transform is not affine, then it is returned
unchanged.
+ *
+ * @param transform The transform to be at least partially described by
{@link #parameters}.
+ * @return A copy of the given affine transform associated to the
parameter of this object,
+ * or the given transform unchanged if it was not affine.
+ */
+ public MathTransform newTransform(final MathTransform transform) {
+ if (transform instanceof AffineTransform) {
+ return new ParameterizedAffine((AffineTransform) transform,
parameters, false);
+ } else {
+ return transform;
+ }
+ }
+
+ /**
+ * Returns the parameter descriptors for this map projection.
+ *
+ * @return The map projection parameters if they are an accurate
description of this transform,
+ * or the generic affine parameters in case of doubt.
+ */
+ @Override
+ public ParameterDescriptorGroup getParameterDescriptors() {
+ return isDefinitive ? parameters.getParameterDescriptors() :
super.getParameterDescriptors();
+ }
+
+ /**
+ * Returns the parameter values for this map projection.
+ *
+ * @return The map projection parameters if they are an accurate
description of this transform,
+ * or the generic affine parameters in case of doubt.
+ */
+ @Override
+ public ParameterValueGroup getParameterValues() {
+ return isDefinitive ? parameters.getParameterValues() :
super.getParameterValues();
+ }
+
+ /**
+ * Compares this affine transform with the given object for equality.
+ * Parameters are compared only if the other object is also an instance of
{@code ParameterizedAffine}
+ * in order to preserve the {@link AffineTransform#equals(Object)}
<cite>symmetricity</cite> contract.
+ *
+ * @param object The object to compare with this transform for equality.
+ * @return {@code true} if the given object is of appropriate class (as
explained in the
+ * {@link AffineTransform2D#equals(Object)} documentation) and the
coefficients are the same.
+ */
+ @Override
+ public boolean equals(final Object object) {
+ if (super.equals(object)) {
+ if (object instanceof ParameterizedAffine) {
+ final ParameterizedAffine that = (ParameterizedAffine) object;
+ return Objects.equals(this.parameters, that.parameters);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /*
+ * Intentionally no hashCode() method. See
AffineTransform2D.equals(Object) for explanation.
+ */
+}
Propchange:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8
