sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1466475 [4/4] - in /sis/trunk: ./ sis-build-helper/ sis-metadata/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ sis-metadata/src/main/java/org/apache/sis/inte...
Date Wed, 10 Apr 2013 13:15:13 GMT
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Version.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Version.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] Wed Apr 10
13:15:08 2013
@@ -42,7 +42,7 @@ public class Version implements CharSequ
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -6793384507333713770L;
+    private static final long serialVersionUID = 8402041502662929792L;
 
     /**
      * The version of this Apache SIS distribution.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -57,7 +57,7 @@ public class BackingStoreException exten
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -1714319767053628606L;
+    private static final long serialVersionUID = -4549821631559359838L;
 
     /**
      * Constructs a new exception with no detail message.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -69,7 +69,7 @@ public class CheckedArrayList<E> extends
     /**
      * Serial version UID for compatibility with different versions.
      */
-    private static final long serialVersionUID = -587331971085094268L;
+    private static final long serialVersionUID = -8265578982723471814L;
 
     /**
      * The element type.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -69,7 +69,7 @@ public class CheckedHashMap<K,V> extends
     /**
      * Serial version UID for compatibility with different versions.
      */
-    private static final long serialVersionUID = -7777695267921872849L;
+    private static final long serialVersionUID = -5983828895888575736L;
 
     /**
      * The class type for keys.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -68,7 +68,7 @@ public class CheckedHashSet<E> extends L
     /**
      * Serial version UID for compatibility with different versions.
      */
-    private static final long serialVersionUID = -9014541457174735097L;
+    private static final long serialVersionUID = 1999408533884863599L;
 
     /**
      * The element type.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -65,7 +65,7 @@ public class CodeListSet<E extends CodeL
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 3648460713432430695L;
+    private static final long serialVersionUID = -6328082298556260980L;
 
     /**
      * A pool of code list arrays. When many {@code CodeListSet} instances are for the

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CollectionsExt.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CollectionsExt.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CollectionsExt.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -503,7 +503,7 @@ public final class CollectionsExt extend
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = -8926770873102046405L;
+        private static final long serialVersionUID = 7050753365408754641L;
 
         /**
          * The unique instance. Can not be public because of parameterized types: we need
a method
@@ -592,7 +592,7 @@ public final class CollectionsExt extend
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = 3809610984070771228L;
+        private static final long serialVersionUID = 807166038568740444L;
 
         /**
          * The unique instance. Can not be public because of parameterized types: we need
a method

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -75,7 +75,7 @@ public class DefaultTreeTable implements
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 1951201018202846555L;
+    private static final long serialVersionUID = 7991792044044382191L;
 
     /**
      * The root node, or {@code null} if not yet specified.
@@ -320,7 +320,7 @@ public class DefaultTreeTable implements
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = 2931274954865719140L;
+        private static final long serialVersionUID = -5729029633479218691L;
 
         /**
          * Implementation of {@link Node} children list. This list updates automatically
the

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -73,7 +73,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -6994867383669885934L;
+    private static final long serialVersionUID = -4760466188643114727L;
 
     /**
      * The storage map whose keys are derived from.
@@ -200,7 +200,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
      * to the {@linkplain #storage} map instead than iterating over all entries.
      */
     private static class InvertibleKey<SK,SV,K,V> extends DerivedMap<SK,SV,K,V>
{
-        private static final long serialVersionUID = -7770446176017835821L;
+        private static final long serialVersionUID = 3499911507293121425L;
 
         /** The inverse of {@link #keyConverter}. */
         protected final ObjectConverter<K,SK> keyInverse;
@@ -238,7 +238,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
      * to the {@linkplain #storage} map instead than iterating over all entries.
      */
     private static final class InvertibleValue<SK,SV,K,V> extends DerivedMap<SK,SV,K,V>
{
-        private static final long serialVersionUID = 6249800498911409046L;
+        private static final long serialVersionUID = -8290698486357636366L;
 
         /** The inverse of {@link #valueConverter}. */
         private final ObjectConverter<V,SV> valueInverse;
@@ -264,7 +264,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
      * to the {@linkplain #storage} map instead than iterating over all entries.
      */
     private static final class Invertible<SK,SV,K,V> extends InvertibleKey<SK,SV,K,V>
{
-        private static final long serialVersionUID = 3830322680676020356L;
+        private static final long serialVersionUID = -6625938922337246124L;
 
         /** The inverse of {@link #valueConverter}. */
         private final ObjectConverter<V,SV> valueInverse;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -67,7 +67,7 @@ class DerivedSet<S,E> extends AbstractSe
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -4662336508586424581L;
+    private static final long serialVersionUID = 6309535868745970619L;
 
     /**
      * The storage set whose values are derived from.
@@ -198,7 +198,7 @@ class DerivedSet<S,E> extends AbstractSe
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = 5957167307119709856L;
+        private static final long serialVersionUID = -5336633027232952482L;
 
         /**
          * The converter from the derived to the storage type.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptyQueue.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptyQueue.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptyQueue.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptyQueue.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -37,7 +37,7 @@ final class EmptyQueue<E> extends Abstra
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -6147951199761870325L;
+    private static final long serialVersionUID = 2798927118201392605L;
 
     /**
      * The singleton instance to be returned by {@link Collections#emptyQueue()}.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptySortedSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptySortedSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptySortedSet.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptySortedSet.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ final class EmptySortedSet<E> extends Ab
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 4684832991264788298L;
+    private static final long serialVersionUID = -2404255437755421772L;
 
     /**
      * The unique instance of this set.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -115,7 +115,7 @@ public class RangeSet<E extends Comparab
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -6085227672036239981L;
+    private static final long serialVersionUID = 7493555225994855486L;
 
     /**
      * The range comparator returned by {@link RangeSet#comparator()}. This comparator
@@ -141,7 +141,7 @@ public class RangeSet<E extends Comparab
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = -3710903977144041225L;
+        private static final long serialVersionUID = 8688450091923783564L;
 
         /**
          * The singleton instance, as a raw type in order to allow
@@ -1400,7 +1400,7 @@ public class RangeSet<E extends Comparab
      * @see RangeSet#create(Class, boolean, boolean)
      */
     private static final class Numeric<E extends Number & Comparable<? super E>>
extends RangeSet<E> {
-        private static final long serialVersionUID = 934107071458551753L;
+        private static final long serialVersionUID = 5603640102714482527L;
 
         Numeric(final Class<E> elementType, final boolean isMinIncluded, final boolean
isMaxIncluded) {
             super(elementType, isMinIncluded, isMaxIncluded);

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -164,7 +164,7 @@ public class TableColumn<V> implements C
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = -2486202389234601560L;
+        private static final long serialVersionUID = -3460868641711391888L;
 
         /**
          * The programmatic name of the static final field holding this constant.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -69,7 +69,7 @@ abstract class TreeNodeList extends Abst
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 9210230622796007350L;
+    private static final long serialVersionUID = -8723469207489667631L;
 
     /**
      * Enumeration constant for {@link #setParentOf(TreeTable.Node, int)}.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -89,7 +89,7 @@ public class TreeTableFormat extends Tab
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -4476366905386037025L;
+    private static final long serialVersionUID = 147992015470098561L;
 
     /**
      * Shared {@code TreeTableFormat} instance for {@link TreeTable#toString()} implementation.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/UnmodifiableArrayList.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/UnmodifiableArrayList.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/UnmodifiableArrayList.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/UnmodifiableArrayList.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -51,7 +51,7 @@ public class UnmodifiableArrayList<E> ex
     /**
      * For compatibility with different versions.
      */
-    private static final long serialVersionUID = -3605810209653785967L;
+    private static final long serialVersionUID = 13882164775184042L;
 
     /**
      * The wrapped array.
@@ -277,7 +277,7 @@ public class UnmodifiableArrayList<E> ex
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = -6297280390649627532L;
+        private static final long serialVersionUID = 33065197642139916L;
 
         /**
          * Index of the first element and size of this list.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -61,7 +61,7 @@ public abstract class AbstractName imple
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 3362498790089164525L;
+    private static final long serialVersionUID = 667242702456713391L;
 
     /**
      * A view of this name as a fully-qualified one.
@@ -268,7 +268,7 @@ public abstract class AbstractName imple
         /**
          * Serial number for inter-operability with different versions.
          */
-        private static final long serialVersionUID = -6422809765366372062L;
+        private static final long serialVersionUID = -5259001179796274879L;
 
         /**
          * The sequence of {@linkplain DefaultLocalName local names} making this generic
name.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -55,7 +55,7 @@ public class DefaultInternationalString 
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 5760033376627376938L;
+    private static final long serialVersionUID = 3663160836923279819L;
 
     /**
      * The string values in different locales (never {@code null}).

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -60,7 +60,7 @@ public class DefaultLocalName extends Ab
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 8747478206456790138L;
+    private static final long serialVersionUID = -697839568997068872L;
 
     /**
      * The scope of this name, or {@code null} if the scope is the unique {@code GLOBAL}
instance.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -45,7 +45,7 @@ public class DefaultMemberName extends D
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 6252686806895124457L;
+    private static final long serialVersionUID = 7307683415489715298L;
 
     /**
      * The type of the data associated with the record member.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -57,7 +57,7 @@ public class DefaultNameSpace implements
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -3064358267398624306L;
+    private static final long serialVersionUID = 8272640747799127007L;
 
     /**
      * The default separator, which is {@value}. The separator is inserted between the

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -55,7 +55,7 @@ public class DefaultScopedName extends A
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -5215955533541748481L;
+    private static final long serialVersionUID = 1363103337249930577L;
 
     /**
      * The immutable list of parsed names.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ public class DefaultTypeName extends Def
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -7985388992575173993L;
+    private static final long serialVersionUID = 7182126541436753582L;
 
     /**
      * Empty constructor to be used by JAXB only. Despite its "final" declaration,

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -35,7 +35,7 @@ final class GlobalNameSpace extends Defa
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 5276591595735817024L;
+    private static final long serialVersionUID = 4652341179694633152L;
 
     /**
      * The unique global namespace.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -85,7 +85,7 @@ public class ResourceInternationalString
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 6339944890723487336L;
+    private static final long serialVersionUID = -8636012022904092254L;
 
     /**
      * The name of the resource bundle, as a fully qualified class name.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -49,7 +49,7 @@ public class SimpleInternationalString e
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 3543963804501667578L;
+    private static final long serialVersionUID = 7600371840915793379L;
 
     /**
      * Creates a new instance from the given string. If the type of the text

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Wed Apr
10 13:15:08 2013
@@ -295,7 +295,7 @@ public final class Types extends Static 
         /**
          * For cross-version compatibility.
          */
-        private static final long serialVersionUID = 7336442452947376873L;
+        private static final long serialVersionUID = -6202647167398898834L;
 
         /**
          * The class loader to use for fetching GeoAPI resources.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -57,7 +57,7 @@ public final class PerformanceLevel exte
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = 6055684381688936293L;
+    private static final long serialVersionUID = -6547125008284983701L;
 
     /*
      * IMPLEMENTATION NOTE: The level values used in the constants below are also used

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -622,7 +622,7 @@ public final class Errors extends Indexe
      * The international string to be returned by {@link formatInternational}.
      */
     private static final class International extends ResourceInternationalString {
-        private static final long serialVersionUID = -229348959712294902L;
+        private static final long serialVersionUID = -5355796215044405012L;
 
         International(int key)                   {super(key);}
         International(int key, Object args)      {super(key, args);}

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -186,7 +186,7 @@ public final class Messages extends Inde
      * The international string to be returned by {@link formatInternational}.
      */
     private static final class International extends ResourceInternationalString {
-        private static final long serialVersionUID = -229348959712294903L;
+        private static final long serialVersionUID = 4553487496835099424L;
 
         International(int key)                   {super(key);}
         International(int key, Object args)      {super(key, args);}

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
[UTF-8] Wed Apr 10 13:15:08 2013
@@ -47,7 +47,7 @@ abstract class ResourceInternationalStri
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 4744571031462678126L;
+    private static final long serialVersionUID = -3910920973710535738L;
 
     /**
      * The key for the resource to fetch. A negative value means that the resource takes
no

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8]
Wed Apr 10 13:15:08 2013
@@ -309,7 +309,7 @@ public final class Vocabulary extends In
      * The international string to be returned by {@link formatInternational}.
      */
     private static final class International extends ResourceInternationalString {
-        private static final long serialVersionUID = 8360132666298806838L;
+        private static final long serialVersionUID = -5423999784169092823L;
 
         International(int key)                   {super(key);}
         International(int key, Object args)      {super(key, args);}

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java [UTF-8] Wed
Apr 10 13:15:08 2013
@@ -59,8 +59,11 @@ public interface IdentifierSpace<T> exte
      * Its type is {@code "xs:ID"} - i.e. it is a fragment identifier, unique within document
scope only,
      * for internal cross-references. It is not useful by itself as a persistent unique identifier.
      *
-     * <p>The XML {@linkplain #getName() attribute name} is {@code "gml:id"}.
-     * The XML attribute name of the reference to an identified object is {@code "xlink:href"}.</p>
+     * <p>The XML {@linkplain #getName() attribute name} is {@code "gml:id"}, but is
also used
+     * for {@code "gco:id"} in metadata documents. However the {@code "gco:"} prefix is omitted
+     * in XML documents (i.e. the {@code gco:id} attribute is <cite>unqualified</cite>).</p>
+     *
+     * <p>The XML attribute name of the reference to such identified object is {@code
"xlink:href"}.</p>
      *
      * @see javax.xml.bind.annotation.XmlID
      */
@@ -71,8 +74,11 @@ public interface IdentifierSpace<T> exte
      * that implement ISO 19115 in XML. May be used as a persistent unique identifier, but
only
      * available within GMD context.
      *
-     * <p>The XML {@linkplain #getName() attribute name} is {@code "gco:uuid"}.
-     * The XML attribute name of the reference to an identified object is {@code "gco:uuidref"}.</p>
+     * <p>The XML {@linkplain #getName() attribute name} is {@code "gco:uuid"}. However
the
+     * {@code "gco:"} prefix is omitted in XML documents (i.e. the {@code gco:uuid} attribute
+     * is <cite>unqualified</cite>).</p>
+     *
+     * <p>The XML attribute name of the reference to such identified object is {@code
"gco:uuidref"}.
      *
      * @see UUID
      */

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8] Wed Apr
10 13:15:08 2013
@@ -58,7 +58,7 @@ public final class NilReason implements 
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -1302619137838086028L;
+    private static final long serialVersionUID = 5553785821187789895L;
 
     /**
      * There is no value.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] Wed Apr 10 13:15:08
2013
@@ -86,7 +86,7 @@ public class XLink implements Serializab
     /**
      * For cross-version compatibility.
      */
-    private static final long serialVersionUID = -4349950135677857725L;
+    private static final long serialVersionUID = 4046720871882443681L;
 
     /**
      * The type of link. If {@code null}, then the type will be inferred by {@link #getType()}.

Modified: sis/trunk/src/main/docbook/fr/XML.xml
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/docbook/fr/XML.xml?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/src/main/docbook/fr/XML.xml (original)
+++ sis/trunk/src/main/docbook/fr/XML.xml Wed Apr 10 13:15:08 2013
@@ -28,7 +28,7 @@
     qui ne font pas partie des spécifications abstraites d’origines.
     Ces attributs supplémentaires sont habituellement propres au <acronym>XML</acronym>
     et peuvent ne pas apparaître directement dans l’<acronym>API</acronym>
de Apache <acronym>SIS</acronym>.
-    Certains de ces attributs, notamment <literal role="OGC">gmd:id</literal>,
<literal role="OGC">gco:uuid</literal>
+    Certains de ces attributs, notamment <literal role="OGC">id</literal>, <literal
role="OGC">uuid</literal>
     et <literal>xlink:href</literal>, restent toutefois accessibles sous forme
de paires clé-valeurs.
   </para>
   <para>
@@ -181,7 +181,7 @@
       Le type de la valeur est un élément <acronym>XML</acronym> dont le
nom commence toujours par une lettre majuscule, en ignorant les préfixes.
       Dans l’exemple ci-haut nous avions <classname role="OGC">MD_DataIdentification</classname>,
qui correspond à l’interface Java <classname role="GeoAPI">DataIdentification</classname>.
       C’est cet élément <acronym>XML</acronym> qui contient les propriétés
filles. Cet élément accepte aussi un groupe d’attributs
-      (notamment <literal role="OGC">gmd:id</literal> et <literal role="OGC">gco:uuid</literal>)
+      (notamment <literal role="OGC">id</literal> et <literal role="OGC">uuid</literal>)
       que les schémas <acronym>XSD</acronym> de l’<acronym>OGC</acronym>
nomment collectivement <classname role="OGC">gco:ObjectIdentification</classname>.
       Ces attributs n’ont pas de méthodes Java dédiées, mais sont accessibles
indirectement via l’interface <classname role="SIS">IdentifiedObject</classname>
       décrite dans la sous-section suivante.
@@ -219,8 +219,8 @@
     <section>
       <title>Identification d’instances déjà définies</title>
       <para>
-        L’élément englobant peut contenir un attribut <literal role="OGC">gmd:id</literal>,
-        <literal role="OGC">gco:uuid</literal> ou <literal>xlink:href</literal>.
+        L’élément englobant peut contenir un attribut <literal role="OGC">id</literal>,
+        <literal role="OGC">uuid</literal> ou <literal>xlink:href</literal>.
         Si un de ces attributs est présent, l’élément englobé peut être
complètement omis;
         il sera remplacé au moment de la lecture par l’élément référencé
par l’attribut.
         Dans l’exemple suivant, la partie gauche définie un élément associé
à l’identifiant “<literal>mon_id</literal>”,
@@ -258,11 +258,11 @@
       </para>
       <itemizedlist>
         <listitem>
-          <literal role="OGC">gmd:id</literal> n’est valide qu’à
l’intérieur du document <acronym>XML</acronym>
+          <literal role="OGC">id</literal> n’est valide qu’à l’intérieur
du document <acronym>XML</acronym>
           qui définit l’objet ainsi référencé.
         </listitem>
         <listitem>
-          <literal role="OGC">gco:uuid</literal> peut être valide à l’extérieur
du document <acronym>XML</acronym>,
+          <literal role="OGC">uuid</literal> peut être valide à l’extérieur
du document <acronym>XML</acronym>,
           mais quelqu’un doit maintenir une base de données fournissant les objets
pour chaque <acronym>UUID</acronym> donnés.
         </listitem>
         <listitem>
@@ -278,10 +278,10 @@
         notamment <constant role="SIS">ID</constant>, <constant role="SIS">UUID</constant>
et <constant role="SIS">HREF</constant>.
         Chacune de ces clés peut être associée à une valeur d’un type différent
(habituellement <classname>String</classname>,
         <classname>UUID</classname> ou <classname>URI</classname>)
selon la clé.
-        Par exemple le code suivant définit une valeur pour l’attribut <literal
role="OGC">gco:uuid</literal>:
+        Par exemple le code suivant définit une valeur pour l’attribut <literal
role="OGC">uuid</literal>:
       </para>
       <example>
-        <title>Associer un identifiant <literal role="OGC">gco:uuid</literal>
à une méta-donnée</title>
+        <title>Associer un identifiant <literal role="OGC">uuid</literal>
à une méta-donnée</title>
         <programlisting language="java">import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.xml.IdentifierSpace;
 import java.util.UUID;

Modified: sis/trunk/src/main/docbook/fr/geoapi.xml
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/docbook/fr/geoapi.xml?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/src/main/docbook/fr/geoapi.xml (original)
+++ sis/trunk/src/main/docbook/fr/geoapi.xml Wed Apr 10 13:15:08 2013
@@ -108,7 +108,7 @@
           Une conversion à partir des schémas <acronym>XSD</acronym> introduit,
au moins dans le cas des méta-données, près du
           double du nombre d’interfaces réellement définies par le standard, sans
que cela n’apporte de nouvelles fonctionnalités.
           Les schémas <acronym>XSD</acronym> définissent aussi des attributs
propres aux documents <acronym>XML</acronym>
-          (<literal role="OGC">gmd:id</literal>, <literal role="OGC">gco:uuid</literal>,
<literal>xlink:href</literal>, <foreignphrase>etc.</foreignphrase>),
+          (<literal role="OGC">id</literal>, <literal role="OGC">uuid</literal>,
<literal>xlink:href</literal>, <foreignphrase>etc.</foreignphrase>),
           qui n’existent pas dans les diagrammes <acronym>UML</acronym>
originaux et que l’on ne souhaite pas forcément exposer dans un API Java.
           Une conversion à partir des schémas <acronym>UML</acronym> évite
ce problème, mais les outils capable d’effectuer cette
           opération sont plus rares.



Mime
View raw message