sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1810235 - in /sis/branches/JDK8/core: sis-feature/src/main/java/org/apache/sis/feature/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ sis-...
Date Sat, 30 Sep 2017 19:37:53 GMT
Author: desruisseaux
Date: Sat Sep 30 19:37:53 2017
New Revision: 1810235

URL: http://svn.apache.org/viewvc?rev=1810235&view=rev
Log:
Partial rollback of GO_GenericName and GO_LocalName displacement (for now).
This is because we would like to propose a 0.8 release soon, and trying to move the XML support
from 'sis-utility' to 'sis-metadata' now seems a bit risky. It would also make more difficult
to
merge the work on ISO 19115-1:2014 update. So we are better to release O.8 as-is, complete
the
ISO 19115 update, and after try again the migration of some sis-utility classes to sis-metadata.

Added:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
      - copied, changed from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_GenericName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
      - copied, changed from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_LocalName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
      - copied, changed from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameAdapter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
      - copied, changed from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameValue.java
Removed:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/
Modified:
    sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java

Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -53,9 +53,9 @@ final class NamedFeatureType implements
 
     /**
      * The feature type to use instead of the {@code NamedFeatureType}. Initially null, then
set to the "real"
-     * feature type after {@link DefaultAssociationRole#resolve(DefaultFeatureType)} has
been able to create it.
-     * This information is stored in case the same {@code NamedFeatureType} instance has
been used in more than
-     * one {@link DefaultFeatureType}.
+     * feature type after {@link DefaultAssociationRole#resolve(DefaultFeatureType, Collection)}
has been able
+     * to create it. This information is stored in case the same {@code NamedFeatureType}
instance has been used
+     * in more than one {@link DefaultFeatureType}.
      */
     volatile FeatureType resolved;
 

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.met
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.opengis.util.ScopedName;
 import org.opengis.util.GenericName;
-import org.apache.sis.internal.jaxb.name.NameValue;
+import org.apache.sis.internal.jaxb.gco.NameValue;
 
 
 /**
@@ -29,7 +29,7 @@ import org.apache.sis.internal.jaxb.name
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  *
- * @see org.apache.sis.internal.jaxb.name.GO_GenericName
+ * @see org.apache.sis.internal.jaxb.gco.GO_GenericName
  *
  * @since 0.5
  * @module

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -60,7 +60,7 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.internal.jaxb.gco.GO_Boolean;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;
+import org.apache.sis.internal.jaxb.gco.GO_GenericName;
 import org.apache.sis.internal.jaxb.gco.StringAdapter;
 import org.apache.sis.internal.jaxb.gco.InternationalStringAdapter;
 import org.apache.sis.internal.jaxb.metadata.RS_Identifier;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -689,6 +689,7 @@ public final class Citations extends Sta
      *
      * @since 0.6
      */
+    @SuppressWarnings("deprecation")
     public static String getUnicodeIdentifier(final Citation citation) {
         return org.apache.sis.internal.util.Citations.getUnicodeIdentifier(citation);
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -127,4 +127,3 @@ import org.apache.sis.internal.jaxb.gco.
 import org.apache.sis.internal.jaxb.gmd.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -113,4 +113,3 @@ import org.apache.sis.internal.jaxb.Sche
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;
-import org.apache.sis.internal.jaxb.name.GO_LocalName;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -162,4 +162,3 @@ import org.apache.sis.internal.jaxb.gco.
 import org.apache.sis.internal.jaxb.gmd.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;

Copied: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
(from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_GenericName.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java?p2=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_GenericName.java&r1=1810234&r2=1810235&rev=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_GenericName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.name;
+package org.apache.sis.internal.jaxb.gco;
 
 import org.opengis.util.GenericName;
 

Copied: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
(from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_LocalName.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java?p2=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_LocalName.java&r1=1810234&r2=1810235&rev=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/GO_LocalName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.name;
+package org.apache.sis.internal.jaxb.gco;
 
 import org.opengis.util.LocalName;
 

Copied: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
(from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameAdapter.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java?p2=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameAdapter.java&r1=1810234&r2=1810235&rev=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameAdapter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.name;
+package org.apache.sis.internal.jaxb.gco;
 
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.adapters.XmlAdapter;

Copied: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
(from r1810234, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameValue.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java?p2=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameValue.java&r1=1810234&r2=1810235&rev=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/name/NameValue.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.name;
+package org.apache.sis.internal.jaxb.gco;
 
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.XmlAttribute;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -93,7 +93,7 @@ public class DefaultLocalName extends Ab
      * <div class="section">Note on JAXB annotation</div>
      * The {@link XmlElement} annotation applied here is appropriate for {@code TypeName}
and {@code MemberName}
      * subtypes only. It is <strong>not</strong> appropriate when (un)marshalling
directly a {@code LocalName}.
-     * The distinction between the two cases is done by {@link org.apache.sis.internal.jaxb.name.GO_LocalName},
+     * The distinction between the two cases is done by {@link org.apache.sis.internal.jaxb.gco.GO_LocalName},
      * which replace the {@code LocalName} instance by an internal {@code NameValue} object
(so the XML element
      * declared here is never marshalled). Example:
      *

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -128,4 +128,4 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;
+import org.apache.sis.internal.jaxb.gco.GO_GenericName;

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -29,7 +29,7 @@ import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;
+import org.apache.sis.internal.jaxb.gco.GO_GenericName;
 
 
 /**

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java?rev=1810235&r1=1810234&r2=1810235&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
[UTF-8] Sat Sep 30 19:37:53 2017
@@ -49,5 +49,5 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
-import org.apache.sis.internal.jaxb.name.GO_GenericName;
+import org.apache.sis.internal.jaxb.gco.GO_GenericName;
 import org.apache.sis.xml.Namespaces;



Mime
View raw message