Author: desruisseaux
Date: Mon Jul 18 17:54:24 2016
New Revision: 1753295
URL: http://svn.apache.org/viewvc?rev=1753295&view=rev
Log:
Avoid usage of JDK7 classes on JDK6 branch.
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java?rev=1753295&r1=1753294&r2=1753295&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
[UTF-8] Mon Jul 18 17:54:24 2016
@@ -30,7 +30,7 @@ import org.apache.sis.util.resources.Err
import org.apache.sis.util.Classes;
// Branch-dependent imports
-import java.util.Objects;
+import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.AttributeType;
import org.opengis.feature.Feature;
import org.opengis.feature.PropertyType;
@@ -178,7 +178,6 @@ public final class AttributeTypeBuilder<
* @see #characteristics()
* @see AttributeConvention#VALID_VALUES_CHARACTERISTIC
*/
- @SafeVarargs
public final AttributeTypeBuilder<V> setValidValues(final V... values) {
return
setCharacteristic(AttributeConvention.VALID_VALUES_CHARACTERISTIC,
Set.class, CollectionsExt.immutableSet(false, values));
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java?rev=1753295&r1=1753294&r2=1753295&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
[UTF-8] Mon Jul 18 17:54:24 2016
@@ -21,7 +21,7 @@ import org.apache.sis.feature.DefaultAtt
import org.apache.sis.util.Classes;
// Branch-dependent imports
-import java.util.Objects;
+import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.AttributeType;
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1753295&r1=1753294&r2=1753295&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
[UTF-8] Mon Jul 18 17:54:24 2016
@@ -35,7 +35,8 @@ import org.apache.sis.util.resources.Err
import org.apache.sis.util.ArraysExt;
// Branch-dependent imports
-import java.util.Objects;
+import org.apache.sis.internal.jdk7.JDK7;
+import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.AttributeType;
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
@@ -676,7 +677,7 @@ public class FeatureTypeBuilder extends
separator = ", ";
}
buffer.append(" {");
- separator = System.lineSeparator();
+ separator = JDK7.lineSeparator();
for (final PropertyTypeBuilder p : properties) {
p.toString(buffer.append(separator).append("
").append(p.getClass().getSimpleName()));
}
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1753295&r1=1753294&r2=1753295&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
[UTF-8] Mon Jul 18 17:54:24 2016
@@ -29,7 +29,7 @@ import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
// Branch-dependent imports
-import java.util.Objects;
+import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.IdentifiedType;
Modified:
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java?rev=1753295&r1=1753294&r2=1753295&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
[UTF-8] Mon Jul 18 17:54:24 2016
@@ -125,7 +125,7 @@ public final class Geometries extends St
ymin = (Double) MIN_Y.invoke(env, (Object[]) null);
xmax = (Double) MAX_X.invoke(env, (Object[]) null);
ymax = (Double) MAX_Y.invoke(env, (Object[]) null);
- } catch (ReflectiveOperationException e) {
+ } catch (Exception e) { //
(ReflectiveOperationException) on JDK7 branch.
if (e instanceof InvocationTargetException) {
final Throwable cause = e.getCause();
if (cause instanceof RuntimeException) {
