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 2014/09/04 13:18:36 UTC
svn commit: r1622460 - in /sis/branches/JDK6: ./
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
ide-project/NetBeans/nbproject/project.properties pom.xml
Author: desruisseaux
Date: Thu Sep 4 11:18:35 2014
New Revision: 1622460
URL: http://svn.apache.org/r1622460
Log:
Merge from the JDK7 branch.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
sis/branches/JDK6/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1617765-1622457
Merged /sis/branches/JDK7:r1617767-1622458
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java?rev=1622460&r1=1622459&r2=1622460&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java [UTF-8] Thu Sep 4 11:18:35 2014
@@ -21,7 +21,6 @@ import java.util.Iterator;
import org.opengis.metadata.citation.Telephone;
import org.opengis.metadata.citation.TelephoneType;
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
-import org.apache.sis.util.ArgumentChecks;
/**
@@ -99,7 +98,9 @@ final class LegacyTelephones extends Leg
*/
@Override
public boolean add(final String value) {
- ArgumentChecks.ensureNonNull("value", value);
+ if (value == null || value.isEmpty()) { // Null value happen with empty XML elements like <gco:CharacterString/>
+ return false;
+ }
final Iterator<Telephone> it = elements.iterator();
if (it.hasNext()) {
final Telephone telephone = it.next();
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties?rev=1622460&r1=1622459&r2=1622460&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Thu Sep 4 11:18:35 2014
@@ -80,7 +80,7 @@ project.GeoAPI = ../../../../GeoAP
unit-api.version = 0.6.1
jsr275.version = 0.9.3
jama.version = 1.0.3
-geometry.version = 1.1
+geometry.version = 1.1.1
georss.version = 0.9.8
rome.version = 0.9
jdom1.version = 1.0
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1622460&r1=1622459&r2=1622460&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Thu Sep 4 11:18:35 2014
@@ -412,7 +412,7 @@ Apache SIS is a free software, Java lang
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
- <geoapi.version>3.1-SNAPSHOT</geoapi.version>
+ <geoapi.version>4.0-SNAPSHOT</geoapi.version>
</properties>
<profiles>