Author: desruisseaux
Date: Tue Oct 7 01:20:42 2014
New Revision: 1629789
URL: http://svn.apache.org/r1629789
Log:
Minor adjustments making easier the merge to trunk.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java?rev=1629789&r1=1629788&r2=1629789&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
[UTF-8] Tue Oct 7 01:20:42 2014
@@ -35,7 +35,7 @@ import static org.apache.sis.internal.me
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.4 (derived from geotk-3.00)
- * @version 0.4
+ * @version 0.5
* @module
*/
@XmlType(name = "CodeType")
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1629789&r1=1629788&r2=1629789&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] Tue Oct 7 01:20:42 2014
@@ -254,7 +254,7 @@ public final class IdentifiedObjects ext
*/
public static Identifier getIdentifier(final IdentifiedObject object,
final Citation authority) {
if (object != null) {
- final Iterator<Identifier> it = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> it =
iterator(object.getIdentifiers());
if (it != null) while (it.hasNext()) {
final Identifier identifier = it.next();
if (identifier != null) { // Paranoiac check.
@@ -290,7 +290,7 @@ public final class IdentifiedObjects ext
*/
public static String getIdentifierOrName(final IdentifiedObject object) {
if (object != null) {
- final Iterator<Identifier> it = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> it =
iterator(object.getIdentifiers());
if (it != null) while (it.hasNext()) {
final String code = toString(it.next());
if (code != null) { // Paranoiac check.
@@ -338,7 +338,7 @@ public final class IdentifiedObjects ext
}
}
}
- final Iterator<Identifier> id = iterator(object.getIdentifiers());
+ final Iterator<? extends Identifier> id =
iterator(object.getIdentifiers());
if (id != null) while (id.hasNext()) {
identifier = id.next();
if (identifier != null) { // Paranoiac check.
