Author: desruisseaux
Date: Thu Feb 25 18:49:41 2016
New Revision: 1732341
URL: http://svn.apache.org/viewvc?rev=1732341&view=rev
Log:
Moved an internal method related to JAXB (un)marshalling from
ReferencingUtilities to MetadataUtilities.
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -176,6 +176,37 @@ public final class MetadataUtilities ext
}
/**
+ * Invoked by private setter methods (themselves invoked by JAXB at
unmarshalling time)
+ * when an element is already set. Invoking this method from those setter
methods serves
+ * three purposes:
+ *
+ * <ul>
+ * <li>Make sure that a singleton property is not defined twice in the
XML document.</li>
+ * <li>Protect ourselves against changes in immutable objects outside
unmarshalling. It should
+ * not be necessary since the setter methods shall not be public,
but we are paranoiac.</li>
+ * <li>Be a central point where we can trace all setter methods, in case
we want to improve
+ * warning or error messages in future SIS versions.</li>
+ * </ul>
+ *
+ * @param classe The caller class, used only in case of warning message
to log.
+ * @param method The caller method, used only in case of warning message
to log.
+ * @param name The property name, used only in case of error message to
format.
+ * @throws IllegalStateException if {@code isDefined} is {@code true} and
we are not unmarshalling an object.
+ *
+ * @since 0.7
+ */
+ public static void propertyAlreadySet(final Class<?> classe, final String
method, final String name)
+ throws IllegalStateException
+ {
+ final Context context = Context.current();
+ if (context != null) {
+ Context.warningOccured(context, classe, method, Errors.class,
Errors.Keys.ElementAlreadyPresent_1, name);
+ } else {
+ throw new
IllegalStateException(Errors.format(Errors.Keys.ElementAlreadyPresent_1, name));
+ }
+ }
+
+ /**
* Returns the {@code gco:id} or {@code gml:id} value to use for the given
object.
* The returned identifier will be unique in the current XML document.
*
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -32,8 +32,6 @@ import org.opengis.referencing.datum.Pri
import org.apache.sis.util.Static;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.datum.DefaultPrimeMeridian;
@@ -321,33 +319,4 @@ public final class ReferencingUtilities
}
return null;
}
-
- /**
- * Invoked by private setter methods (themselves invoked by JAXB at
unmarshalling time)
- * when an element is already set. Invoking this method from those setter
methods serves
- * three purposes:
- *
- * <ul>
- * <li>Make sure that a singleton property is not defined twice in the
XML document.</li>
- * <li>Protect ourselves against changes in immutable objects outside
unmarshalling. It should
- * not be necessary since the setter methods shall not be public,
but we are paranoiac.</li>
- * <li>Be a central point where we can trace all setter methods, in case
we want to improve
- * warning or error messages in future SIS versions.</li>
- * </ul>
- *
- * @param classe The caller class, used only in case of warning message
to log.
- * @param method The caller method, used only in case of warning message
to log.
- * @param name The property name, used only in case of error message to
format.
- * @throws IllegalStateException If {@code isDefined} is {@code true} and
we are not unmarshalling an object.
- */
- public static void propertyAlreadySet(final Class<?> classe, final String
method, final String name)
- throws IllegalStateException
- {
- final Context context = Context.current();
- if (context != null) {
- Context.warningOccured(context, classe, method, Errors.class,
Errors.Keys.ElementAlreadyPresent_1, name);
- } else {
- throw new
IllegalStateException(Errors.format(Errors.Keys.ElementAlreadyPresent_1, name));
- }
- }
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -31,7 +31,7 @@ import org.opengis.parameter.GeneralPara
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterNameException;
import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroup;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
@@ -479,7 +479,7 @@ public class DefaultParameterDescriptorG
verifyNames(null, parameters);
descriptors = asList(parameters);
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setDescriptors", "parameter");
+ MetadataUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setDescriptors", "parameter");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -40,7 +40,7 @@ import org.apache.sis.io.wkt.ElementKind
import org.apache.sis.internal.jaxb.gml.Measure;
import org.apache.sis.internal.jaxb.gml.MeasureList;
import org.apache.sis.internal.referencing.WKTUtilities;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.util.PatchedUnitFormat;
import org.apache.sis.internal.util.Numerics;
@@ -1157,7 +1157,7 @@ public class DefaultParameterValue<T> ex
value = (T) xmlValue;
}
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setXmlValue", "value");
+ MetadataUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setXmlValue", "value");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -34,7 +34,7 @@ import org.opengis.parameter.GeneralPara
import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterCardinalityException;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
@@ -534,7 +534,7 @@ scan: for (final GeneralParameterValue
if (values == null) {
values = new ParameterValueList(descriptor);
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setDescriptor", "group");
+ MetadataUtilities.propertyAlreadySet(DefaultParameterValue.class,
"setDescriptor", "group");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -46,7 +46,7 @@ import org.apache.sis.internal.util.Nume
import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.internal.metadata.NameToIdentifier;
import org.apache.sis.internal.referencing.WKTUtilities;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
@@ -970,7 +970,7 @@ public class AbstractIdentifiedObject ex
}
}
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractIdentifiedObject.class,
"setIdentifier", "identifier");
+
MetadataUtilities.propertyAlreadySet(AbstractIdentifiedObject.class,
"setIdentifier", "identifier");
}
}
@@ -1089,7 +1089,7 @@ public class AbstractIdentifiedObject ex
if (remarks == null) {
remarks = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractIdentifiedObject.class,
"setRemarks", "remarks");
+
MetadataUtilities.propertyAlreadySet(AbstractIdentifiedObject.class,
"setRemarks", "remarks");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -29,7 +29,7 @@ import org.apache.sis.util.Workaround;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.iso.Types;
import org.apache.sis.internal.jaxb.metadata.EX_Extent;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
@@ -287,7 +287,7 @@ public class AbstractReferenceSystem ext
if (domainOfValidity == null) {
domainOfValidity = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractReferenceSystem.class,
"setDomainOfValidity", "domainOfValidity");
+
MetadataUtilities.propertyAlreadySet(AbstractReferenceSystem.class,
"setDomainOfValidity", "domainOfValidity");
}
}
@@ -300,7 +300,7 @@ public class AbstractReferenceSystem ext
if (scope == null) {
scope = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractReferenceSystem.class,
"setScope", "scope");
+
MetadataUtilities.propertyAlreadySet(AbstractReferenceSystem.class, "setScope",
"scope");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -31,6 +31,7 @@ import org.opengis.referencing.crs.Singl
import org.opengis.referencing.crs.GeneralDerivedCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.cs.AxesConvention;
@@ -536,7 +537,7 @@ public class AbstractCRS extends Abstrac
if (name == null) {
name =
String.valueOf(ReferencingUtilities.toPropertyName(CoordinateSystem.class,
cs.getClass()));
}
- ReferencingUtilities.propertyAlreadySet(AbstractCRS.class,
"setCoordinateSystem", name);
+ MetadataUtilities.propertyAlreadySet(AbstractCRS.class,
"setCoordinateSystem", name);
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -36,7 +36,7 @@ import org.opengis.referencing.operation
import org.opengis.geometry.MismatchedDimensionException;
import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.internal.jaxb.referencing.CC_Conversion;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.ReferencingServices;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.system.Semaphores;
@@ -296,7 +296,7 @@ abstract class AbstractDerivedCRS<C exte
if (conversionFromBase == null) {
conversionFromBase = conversion;
} else {
- ReferencingUtilities.propertyAlreadySet(AbstractDerivedCRS.class,
"setConversionFromBase", "conversion");
+ MetadataUtilities.propertyAlreadySet(AbstractDerivedCRS.class,
"setConversionFromBase", "conversion");
}
}
@@ -319,7 +319,7 @@ abstract class AbstractDerivedCRS<C exte
final SingleCRS previous =
CC_Conversion.setBaseCRS(conversionFromBase, baseCRS);
if (previous != null) {
CC_Conversion.setBaseCRS(conversionFromBase, previous); //
Temporary location.
-
ReferencingUtilities.propertyAlreadySet(AbstractDerivedCRS.class, "setBaseCRS",
name);
+ MetadataUtilities.propertyAlreadySet(AbstractDerivedCRS.class,
"setBaseCRS", name);
}
} else {
throw new
IllegalStateException(Errors.format(Errors.Keys.MissingComponentInElement_2,
getInterface(), "conversion"));
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -26,7 +26,7 @@ import org.opengis.referencing.crs.Engin
import org.opengis.referencing.datum.EngineeringDatum;
import org.apache.sis.referencing.cs.*;
import org.apache.sis.referencing.AbstractReferenceSystem;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
@@ -293,7 +293,7 @@ public class DefaultEngineeringCRS exten
if (datum == null) {
datum = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultEngineeringCRS.class,
"setDatum", "engineeringDatum");
+ MetadataUtilities.propertyAlreadySet(DefaultEngineeringCRS.class,
"setDatum", "engineeringDatum");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -34,6 +34,7 @@ import org.opengis.referencing.datum.Geo
import org.opengis.referencing.datum.PrimeMeridian;
import org.apache.sis.internal.referencing.Legacy;
import org.apache.sis.internal.metadata.AxisDirections;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.referencing.WKTUtilities;
import org.apache.sis.internal.referencing.ReferencingUtilities;
@@ -299,7 +300,7 @@ class DefaultGeodeticCRS extends Abstrac
if (datum == null) {
datum = value;
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultGeodeticCRS.class,
"setDatum", "geodeticDatum");
+ MetadataUtilities.propertyAlreadySet(DefaultGeodeticCRS.class,
"setDatum", "geodeticDatum");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -26,7 +26,7 @@ import org.opengis.referencing.crs.Image
import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.datum.ImageDatum;
import org.apache.sis.internal.metadata.WKTKeywords;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.io.wkt.Formatter;
@@ -281,7 +281,7 @@ public class DefaultImageCRS extends Abs
if (datum == null) {
datum = value;
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultImageCRS.class,
"setDatum", "imageDatum");
+ MetadataUtilities.propertyAlreadySet(DefaultImageCRS.class,
"setDatum", "imageDatum");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -29,7 +29,7 @@ import org.opengis.referencing.crs.Tempo
import org.opengis.referencing.datum.TemporalDatum;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.AbstractReferenceSystem;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Units;
@@ -347,7 +347,7 @@ public class DefaultTemporalCRS extends
if (datum == null) {
datum = value;
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultVerticalCRS.class,
"setDatum", "temporalDatum");
+ MetadataUtilities.propertyAlreadySet(DefaultVerticalCRS.class,
"setDatum", "temporalDatum");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -27,7 +27,7 @@ import org.opengis.referencing.datum.Ver
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.internal.metadata.WKTKeywords;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.io.wkt.Formatter;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
@@ -276,7 +276,7 @@ public class DefaultVerticalCRS extends
if (datum == null) {
datum = value;
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultVerticalCRS.class,
"setDatum", "verticalDatum");
+ MetadataUtilities.propertyAlreadySet(DefaultVerticalCRS.class,
"setDatum", "verticalDatum");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -40,7 +40,7 @@ import org.opengis.referencing.crs.Coord
import org.apache.sis.internal.metadata.AxisNames;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.metadata.AxisDirections;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.measure.Longitude;
@@ -898,7 +898,7 @@ public class DefaultCoordinateSystemAxis
if (abbreviation == null) {
abbreviation = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setAbbreviation", "abbreviation");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setAbbreviation", "abbreviation");
}
}
@@ -911,7 +911,7 @@ public class DefaultCoordinateSystemAxis
if (direction == null) {
direction = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setDirection", "direction");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setDirection", "direction");
}
}
@@ -924,7 +924,7 @@ public class DefaultCoordinateSystemAxis
if (unit == null) {
unit = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setUnit", "unit");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setUnit", "unit");
}
}
@@ -937,7 +937,7 @@ public class DefaultCoordinateSystemAxis
if (rangeMeaning == null) {
rangeMeaning = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setRangeMeaning", "rangeMeaning");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setRangeMeaning", "rangeMeaning");
}
}
@@ -963,7 +963,7 @@ public class DefaultCoordinateSystemAxis
outOfRange("minimumValue", value);
}
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setMinimum", "minimumValue");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setMinimum", "minimumValue");
}
}
@@ -989,7 +989,7 @@ public class DefaultCoordinateSystemAxis
outOfRange("maximumValue", value);
}
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setMaximum", "maximumValue");
+
MetadataUtilities.propertyAlreadySet(DefaultCoordinateSystemAxis.class,
"setMaximum", "maximumValue");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -35,7 +35,6 @@ import org.apache.sis.util.iso.Types;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.internal.util.Citations;
import org.apache.sis.internal.metadata.MetadataUtilities;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.io.wkt.Formatter;
@@ -489,7 +488,7 @@ public class AbstractDatum extends Abstr
if (anchorDefinition == null) {
anchorDefinition = value;
} else {
- ReferencingUtilities.propertyAlreadySet(AbstractDatum.class,
"setAnchorPoint", "anchorDefinition");
+ MetadataUtilities.propertyAlreadySet(AbstractDatum.class,
"setAnchorPoint", "anchorDefinition");
}
}
@@ -502,7 +501,7 @@ public class AbstractDatum extends Abstr
if (realizationEpoch == Long.MIN_VALUE) {
realizationEpoch = value.getTime();
} else {
- ReferencingUtilities.propertyAlreadySet(AbstractDatum.class,
"setRealizationEpoch", "realizationEpoch");
+ MetadataUtilities.propertyAlreadySet(AbstractDatum.class,
"setRealizationEpoch", "realizationEpoch");
}
}
@@ -515,7 +514,7 @@ public class AbstractDatum extends Abstr
if (domainOfValidity == null) {
domainOfValidity = value;
} else {
- ReferencingUtilities.propertyAlreadySet(AbstractDatum.class,
"setDomainOfValidity", "domainOfValidity");
+ MetadataUtilities.propertyAlreadySet(AbstractDatum.class,
"setDomainOfValidity", "domainOfValidity");
}
}
@@ -528,7 +527,7 @@ public class AbstractDatum extends Abstr
if (scope == null) {
scope = value;
} else {
- ReferencingUtilities.propertyAlreadySet(AbstractDatum.class,
"setScope", "scope");
+ MetadataUtilities.propertyAlreadySet(AbstractDatum.class,
"setScope", "scope");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -34,7 +34,7 @@ import org.apache.sis.internal.util.Nume
import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.internal.jaxb.gml.Measure;
import org.apache.sis.internal.jaxb.referencing.SecondDefiningParameter;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.referencing.IdentifiedObjects;
@@ -862,7 +862,7 @@ public class DefaultEllipsoid extends Ab
unit = measure.getUnit(Length.class);
harmonizeAxisUnits(uom);
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultEllipsoid.class,
"setSemiMajorAxisMeasure", "semiMajorAxis");
+ MetadataUtilities.propertyAlreadySet(DefaultEllipsoid.class,
"setSemiMajorAxisMeasure", "semiMajorAxis");
}
}
@@ -904,7 +904,7 @@ public class DefaultEllipsoid extends Ab
harmonizeAxisUnits(measure.getUnit(Length.class));
}
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultEllipsoid.class,
+ MetadataUtilities.propertyAlreadySet(DefaultEllipsoid.class,
"setSecondDefiningParameter",
"secondDefiningParameter");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -35,9 +35,9 @@ import org.apache.sis.referencing.operat
import
org.apache.sis.referencing.operation.matrix.NoninvertibleMatrixException;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.internal.metadata.WKTKeywords;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.ReferencingServices;
import org.apache.sis.internal.referencing.ExtentSelector;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.internal.system.Loggers;
import org.apache.sis.util.logging.Logging;
@@ -622,7 +622,7 @@ public class DefaultGeodeticDatum extend
if (ellipsoid == null) {
ellipsoid = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultGeodeticDatum.class,
"setEllipsoid", "ellipsoid");
+ MetadataUtilities.propertyAlreadySet(DefaultGeodeticDatum.class,
"setEllipsoid", "ellipsoid");
}
}
@@ -635,7 +635,7 @@ public class DefaultGeodeticDatum extend
if (primeMeridian == null) {
primeMeridian = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultGeodeticDatum.class,
"setPrimeMeridian", "primeMeridian");
+ MetadataUtilities.propertyAlreadySet(DefaultGeodeticDatum.class,
"setPrimeMeridian", "primeMeridian");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -26,7 +26,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.referencing.datum.ImageDatum;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.internal.metadata.WKTKeywords;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.util.ComparisonMode;
@@ -288,7 +288,7 @@ public class DefaultImageDatum extends A
if (pixelInCell == null) {
pixelInCell = value;
} else {
- ReferencingUtilities.propertyAlreadySet(DefaultImageDatum.class,
"setPixelInCell", "pixelInCell");
+ MetadataUtilities.propertyAlreadySet(DefaultImageDatum.class,
"setPixelInCell", "pixelInCell");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -31,6 +31,7 @@ import org.opengis.referencing.crs.Gener
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.internal.util.PatchedUnitFormat;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.jaxb.gml.Measure;
import org.apache.sis.internal.util.Numerics;
@@ -444,7 +445,7 @@ public class DefaultPrimeMeridian extend
}
}
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultPrimeMeridian.class,
"setGreenwichMeasure", "greenwichLongitude");
+ MetadataUtilities.propertyAlreadySet(DefaultPrimeMeridian.class,
"setGreenwichMeasure", "greenwichLongitude");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -30,7 +30,6 @@ import org.opengis.referencing.datum.Tem
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.jaxb.gml.UniversalTimeAdapter;
import org.apache.sis.internal.metadata.MetadataUtilities;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.FormattableObject;
@@ -341,7 +340,7 @@ public class DefaultTemporalDatum extend
if (origin == Long.MIN_VALUE) {
origin = value.getTime();
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultTemporalDatum.class,
"setOrigin", "origin");
+ MetadataUtilities.propertyAlreadySet(DefaultTemporalDatum.class,
"setOrigin", "origin");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -31,7 +31,7 @@ import org.apache.sis.internal.jaxb.Cont
import org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.internal.metadata.VerticalDatumTypes;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
@@ -347,7 +347,7 @@ public class DefaultVerticalDatum extend
if (type == null) {
type = t;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultVerticalDatum.class,
"setTypeElement", "verticalDatumType");
+ MetadataUtilities.propertyAlreadySet(DefaultVerticalDatum.class,
"setTypeElement", "verticalDatumType");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -55,6 +55,7 @@ import org.apache.sis.internal.referenci
import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.internal.referencing.WKTUtilities;
import org.apache.sis.internal.metadata.WKTKeywords;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.internal.system.Semaphores;
@@ -924,7 +925,7 @@ check: for (int isTarget=0; ; isTar
if (sourceCRS == null) {
sourceCRS = crs;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setSource", "sourceCRS");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setSource", "sourceCRS");
}
}
@@ -943,7 +944,7 @@ check: for (int isTarget=0; ; isTar
if (targetCRS == null) {
targetCRS = crs;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setTarget", "targetCRS");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setTarget", "targetCRS");
}
}
@@ -964,7 +965,7 @@ check: for (int isTarget=0; ; isTar
if (coordinateOperationAccuracy == null) {
coordinateOperationAccuracy = UnmodifiableArrayList.wrap(values);
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setAccuracy", "coordinateOperationAccuracy");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setAccuracy", "coordinateOperationAccuracy");
}
}
@@ -977,7 +978,7 @@ check: for (int isTarget=0; ; isTar
if (operationVersion == null) {
operationVersion = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setOperationVersion", "operationVersion");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setOperationVersion", "operationVersion");
}
}
@@ -990,7 +991,7 @@ check: for (int isTarget=0; ; isTar
if (domainOfValidity == null) {
domainOfValidity = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setDomainOfValidity", "domainOfValidity");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setDomainOfValidity", "domainOfValidity");
}
}
@@ -1003,7 +1004,7 @@ check: for (int isTarget=0; ; isTar
if (scope == null) {
scope = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setScope", "scope");
+
MetadataUtilities.propertyAlreadySet(AbstractCoordinateOperation.class,
"setScope", "scope");
}
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -46,6 +46,7 @@ import org.apache.sis.internal.jaxb.refe
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.internal.metadata.ReferencingServices;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.util.collection.Containers;
@@ -422,7 +423,7 @@ class AbstractSingleOperation extends Ab
if (method == null) {
method = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractSingleOperation.class,
"setMethod", "method");
+
MetadataUtilities.propertyAlreadySet(AbstractSingleOperation.class,
"setMethod", "method");
}
}
@@ -496,7 +497,7 @@ class AbstractSingleOperation extends Ab
CC_OperationMethod.store(values, parameters.values(),
replacements);
parameters = Parameters.unmodifiable(parameters);
} else {
-
ReferencingUtilities.propertyAlreadySet(AbstractSingleOperation.class,
"setParameters", "parameterValue");
+
MetadataUtilities.propertyAlreadySet(AbstractSingleOperation.class,
"setParameters", "parameterValue");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -48,7 +48,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.internal.jaxb.gco.StringAdapter;
import org.apache.sis.internal.jaxb.referencing.CC_OperationMethod;
import org.apache.sis.internal.referencing.NilReferencingObject;
-import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
import org.apache.sis.parameter.Parameterized;
import org.apache.sis.referencing.NamedIdentifier;
@@ -798,7 +798,7 @@ public class DefaultOperationMethod exte
if (sourceDimensions == null) {
sourceDimensions = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setSourceDimensions", "sourceDimensions");
+ MetadataUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setSourceDimensions", "sourceDimensions");
}
}
@@ -811,7 +811,7 @@ public class DefaultOperationMethod exte
if (targetDimensions == null) {
targetDimensions = value;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setTargetDimensions", "targetDimensions");
+ MetadataUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setTargetDimensions", "targetDimensions");
}
}
@@ -845,7 +845,7 @@ public class DefaultOperationMethod exte
formula = (formula == null) ? new DefaultFormula(citation)
: new DefaultFormula(formula.getFormula(), citation);
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setFormulaCitation", "formulaCitation");
+ MetadataUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setFormulaCitation", "formulaCitation");
}
}
@@ -857,7 +857,7 @@ public class DefaultOperationMethod exte
formula = (formula == null) ? new DefaultFormula(description)
: new DefaultFormula(new
SimpleInternationalString(description), formula.getCitation());
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setFormulaDescription", "formula");
+ MetadataUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setFormulaDescription", "formula");
}
}
@@ -922,7 +922,7 @@ public class DefaultOperationMethod exte
if (parameters == null) {
parameters = CC_OperationMethod.group(super.getName(),
descriptors);
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setDescriptors", "parameter");
+ MetadataUtilities.propertyAlreadySet(DefaultOperationMethod.class,
"setDescriptors", "parameter");
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java?rev=1732341&r1=1732340&r2=1732341&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
[UTF-8] Thu Feb 25 18:49:41 2016
@@ -28,6 +28,7 @@ import org.opengis.referencing.crs.Coord
import org.opengis.referencing.crs.CompoundCRS;
import org.apache.sis.referencing.operation.transform.PassThroughTransform;
import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.util.UnsupportedImplementationException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
@@ -285,7 +286,7 @@ public class DefaultPassThroughOperation
if (operation == null) {
operation = op;
} else {
-
ReferencingUtilities.propertyAlreadySet(DefaultPassThroughOperation.class,
"setOperation", "coordOperation");
+
MetadataUtilities.propertyAlreadySet(DefaultPassThroughOperation.class,
"setOperation", "coordOperation");
}
}
