Author: desruisseaux
Date: Wed Jan 15 15:23:00 2014
New Revision: 1558421
URL: http://svn.apache.org/r1558421
Log:
Override AbstractCS.forConvention(...) in each subclass in order to ensure
correct return type.
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -210,6 +210,16 @@ public class DefaultAffineCS extends Abs
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultAffineCS forConvention(final AxesConvention convention) {
+ return (DefaultAffineCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
* This method shall be overridden by all {@code AffineCS} subclasses in
this package.
*/
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -233,6 +233,16 @@ public class DefaultCartesianCS extends
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultCartesianCS forConvention(final AxesConvention convention) {
+ return (DefaultCartesianCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -199,6 +199,16 @@ public class DefaultCompoundCS extends A
return components;
}
+ /*
+ * Do not override createSameType(…) and forConvention(…) because we can
not create a new DefaultCompoundCS
+ * without knownledge of the CoordinateSystem components to give to it. It
would be possible to recursively
+ * invoke components[i].forConvention(…), but it would be useless to
perform such decomposition here because
+ * DefaultCompoundCRS will need to perform its own decomposition anyway.
+ *
+ * If the user invokes DefaultCompoundCS.forConvention(…) anyway, he will
get an AbstractCS instance, which
+ * is not that bad.
+ */
+
/**
* Compares this coordinate system with the specified object for equality.
*
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -189,6 +189,16 @@ public class DefaultCylindricalCS extend
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultCylindricalCS forConvention(final AxesConvention convention)
{
+ return (DefaultCylindricalCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -209,6 +209,16 @@ public class DefaultEllipsoidalCS extend
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultEllipsoidalCS forConvention(final AxesConvention convention)
{
+ return (DefaultEllipsoidalCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -182,6 +182,16 @@ public class DefaultLinearCS extends Abs
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultLinearCS forConvention(final AxesConvention convention) {
+ return (DefaultLinearCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -185,6 +185,16 @@ public class DefaultPolarCS extends Abst
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultPolarCS forConvention(final AxesConvention convention) {
+ return (DefaultPolarCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -189,6 +189,16 @@ public class DefaultSphericalCS extends
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultSphericalCS forConvention(final AxesConvention convention) {
+ return (DefaultSphericalCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -182,6 +182,16 @@ public class DefaultTimeCS extends Abstr
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultTimeCS forConvention(final AxesConvention convention) {
+ return (DefaultTimeCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -171,6 +171,16 @@ public class DefaultUserDefinedCS extend
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultUserDefinedCS forConvention(final AxesConvention convention)
{
+ return (DefaultUserDefinedCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1558421&r1=1558420&r2=1558421&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
[UTF-8] Wed Jan 15 15:23:00 2014
@@ -194,6 +194,16 @@ public class DefaultVerticalCS extends A
}
/**
+ * {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ */
+ @Override
+ public DefaultVerticalCS forConvention(final AxesConvention convention) {
+ return (DefaultVerticalCS) super.forConvention(convention);
+ }
+
+ /**
* Returns a coordinate system of the same class than this CS but with
different axes.
*/
@Override
