Author: desruisseaux
Date: Fri Feb 21 14:18:57 2014
New Revision: 1570579
URL: http://svn.apache.org/r1570579
Log:
Minor javadoc: override getDatum() in order to show it at the right position in
subclass javadoc.
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1570579&r1=1570578&r2=1570579&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
[UTF-8] Fri Feb 21 14:18:57 2014
@@ -191,6 +191,17 @@ public class DefaultGeocentricCRS extend
}
/**
+ * Returns the geodetic datum associated to this geocentric CRS.
+ * This is the datum given at construction time.
+ *
+ * @return The geodetic datum associated to this geocentric CRS.
+ */
+ @Override
+ public final GeodeticDatum getDatum() {
+ return super.getDatum();
+ }
+
+ /**
* {@inheritDoc}
*
* @return {@inheritDoc}
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java?rev=1570579&r1=1570578&r2=1570579&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] Fri Feb 21 14:18:57 2014
@@ -59,7 +59,7 @@ import static org.apache.sis.internal.re
"datum"
})
@XmlRootElement(name = "GeodeticCRS")
-class DefaultGeodeticCRS extends AbstractCRS implements GeodeticCRS {
+class DefaultGeodeticCRS extends AbstractCRS implements GeodeticCRS { // If
made public, see comment in getDatum().
/**
* Serial number for inter-operability with different versions.
*/
@@ -129,10 +129,14 @@ class DefaultGeodeticCRS extends Abstrac
/**
* Returns the datum.
*
+ * This method is overridden is subclasses for documentation purpose only,
mostly for showing this method in
+ * the appropriate position in javadoc (instead than at the bottom of the
page). If {@code DefaultGeodeticCRS}
+ * is made public in a future SIS version, then we should make this method
final and remove the overridden methods.
+ *
* @return The datum.
*/
@Override
- public final GeodeticDatum getDatum() {
+ public GeodeticDatum getDatum() {
return datum;
}
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1570579&r1=1570578&r2=1570579&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
[UTF-8] Fri Feb 21 14:18:57 2014
@@ -162,6 +162,17 @@ public class DefaultGeographicCRS extend
}
/**
+ * Returns the geodetic datum associated to this geographic CRS.
+ * This is the datum given at construction time.
+ *
+ * @return The geodetic datum associated to this geographic CRS.
+ */
+ @Override
+ public final GeodeticDatum getDatum() {
+ return super.getDatum();
+ }
+
+ /**
* Returns the coordinate system.
*
* @return The coordinate system.
