You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/03/14 11:59:11 UTC
svn commit: r1786889 -
/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
Author: desruisseaux
Date: Tue Mar 14 11:59:11 2017
New Revision: 1786889
URL: http://svn.apache.org/viewvc?rev=1786889&view=rev
Log:
Post-merge cleanup.
Modified:
sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java?rev=1786889&r1=1786888&r2=1786889&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java [UTF-8] Tue Mar 14 11:59:11 2017
@@ -179,7 +179,7 @@ public class ReferencingByIdentifiers ex
*
* @return property used to characterize the spatial reference system.
*
- * @see AbstractLocationType#getTheme()
+ * @see ModifiableLocationType#getTheme()
*/
@Override
public InternationalString getTheme() {
@@ -209,7 +209,7 @@ public class ReferencingByIdentifiers ex
*/
@Override
@SuppressWarnings("ReturnOfCollectionOrArrayField") // Because the collection is unmodifiable.
- public List<LocationType> getLocationTypes() {
+ public List<? extends LocationType> getLocationTypes() {
return locationTypes;
}
@@ -250,8 +250,8 @@ public class ReferencingByIdentifiers ex
}
default: {
// Theme and owner are metadata, so they can be ignored.
- return Utilities.deepEquals(getLocationTypes(),
- ((ReferenceSystemUsingIdentifiers) object).getLocationTypes(), mode);
+ final ReferenceSystemUsingIdentifiers that = (ReferenceSystemUsingIdentifiers) object;
+ return Utilities.deepEquals(getLocationTypes(), that.getLocationTypes(), mode);
}
}
}