Author: desruisseaux
Date: Mon Feb 5 11:12:54 2018
New Revision: 1823152
URL: http://svn.apache.org/viewvc?rev=1823152&view=rev
Log:
Remove GO_Decimal32 (because unused by SIS), avoid uncertain @XmlType annotations, and Javadoc
fixes.
Removed:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -249,7 +249,7 @@ public class GO_CharacterString {
final ControlledVocabulary code = Types.forCodeTitle(text);
final String name = Types.getListName(code);
/*
- * The namespace is often MDB, but we also have some other namespaces link CIT.
+ * The namespace has have various value like CIT, SRV, MDQ, MRI, MSR, LAN, etc.
* The real namespace is declared in the @XmlElement annotation of the getElement
* method in the JAXB adapter. We could use reflection, but we do not in order to
* avoid potential class loading issue and also because not all CodeList are in the
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -38,7 +38,6 @@ import javax.xml.bind.annotation.XmlType
* @version 0.3
*
* @see GO_Real
- * @see GO_Decimal32
*
* @since 0.3
* @module
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -17,7 +17,6 @@
package org.apache.sis.internal.jaxb.gmd;
import java.util.Locale;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.apache.sis.util.CharSequences;
import org.apache.sis.internal.jaxb.Context;
@@ -51,7 +50,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(name = "Country_PropertyType", namespace = Namespaces.LAN)
public final class Country extends GO_CharacterString {
/**
* The country using a {@link org.opengis.util.CodeList}-like format.
@@ -119,7 +117,7 @@ public final class Country extends GO_Ch
/**
* Gets the value of the Country code using ISO 19115-3 element name.
*/
- @XmlElement(name = "CountryCode")
+ @XmlElement(name = "CountryCode", namespace = Namespaces.LAN)
private CodeListUID getCountryCode() {
return isLegacyMetadata ? null : identifier;
}
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -17,7 +17,6 @@
package org.apache.sis.internal.jaxb.gmd;
import java.util.Locale;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
@@ -47,12 +46,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(name = "LanguageCode_PropertyType", namespace = Namespaces.LAN)
public final class LanguageCode extends GO_CharacterString {
/**
* The language using a {@link org.opengis.util.CodeList}-like format.
*/
- @XmlElement(name = "LanguageCode")
+ @XmlElement(name = "LanguageCode", namespace = Namespaces.LAN)
private CodeListUID identifier;
/**
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -18,7 +18,6 @@ package org.apache.sis.internal.jaxb.gmd
import java.util.Set;
import java.util.Locale;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
@@ -65,7 +64,6 @@ import org.apache.sis.util.ArraysExt;
* @since 0.3
* @module
*/
-@XmlType(name = "PT_FreeText_PropertyType", namespace = Namespaces.LAN)
public final class PT_FreeText extends GO_CharacterString {
/**
* A set of {@link LocalisedCharacterString}, representing the {@code <gmd:textGroup>}
element.
@@ -73,8 +71,8 @@ public final class PT_FreeText extends G
*
* @see <a href="http://jira.geotoolkit.org/browse/GEOTK-152">GEOTK-152</a>
*/
- @XmlElementWrapper(name = "PT_FreeText")
- @XmlElement(required = true)
+ @XmlElementWrapper(name = "PT_FreeText", namespace = Namespaces.LAN)
+ @XmlElement(namespace = Namespaces.LAN, required = true)
private TextGroup[] textGroup;
/**
@@ -173,7 +171,7 @@ public final class PT_FreeText extends G
*/
@Override
protected CharSequence toCharSequence() {
- String defaultValue = toString(); // May be null.
+ String defaultValue = toString(); // May be
null.
if (defaultValue != null && contains(defaultValue)) {
/*
* If the <gco:CharacterString> value is repeated in one of the
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java?rev=1823152&r1=1823151&r2=1823152&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
[UTF-8] Mon Feb 5 11:12:54 2018
@@ -47,8 +47,8 @@ import org.apache.sis.internal.jaxb.Lega
* <tr><td>mdb</td> <td>Metadata Base</td>
<td>{@value #MDB}</td> <td></td></tr>
* <tr><td>cit</td> <td>Citation and responsible party information</td>
<td>{@value #CIT}</td> <td></td></tr>
* <tr><td>gex</td> <td>Geospatial EXtent</td>
<td>{@value #GEX}</td> <td></td></tr>
- * <tr><td>mrs</td> <td>Metadata for Reference System</td>
<td>{@value #MRS}</td> <td></td></tr>
* <tr><td>rce</td> <td>Referencing By Coordinates Common</td>
<td>{@value #RCE}</td> <td></td></tr>
+ * <tr><td>mrs</td> <td>Metadata for Reference System</td>
<td>{@value #MRS}</td> <td></td></tr>
* <tr><td>msr</td> <td>Metadata for Spatial Representation</td>
<td>{@value #MSR}</td> <td></td></tr>
* <tr><td>mrc</td> <td>Metadata for Resource Content</td>
<td>{@value #MRC}</td> <td></td></tr>
* <tr><td>mri</td> <td>Metadata for Resource Identification</td>
<td>{@value #MRI}</td> <td></td></tr>
|