sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1605894 - in /sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso: citation/ content/ identification/
Date Thu, 26 Jun 2014 19:57:14 GMT
Author: desruisseaux
Date: Thu Jun 26 19:57:14 2014
New Revision: 1605894

URL: http://svn.apache.org/r1605894
Log:
Uncommented the JAXB annotation for the new classes only (not yet for attributes in existing
classes).

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -37,8 +37,8 @@ import org.apache.sis.util.iso.Types;
  * @module
  */
 @XmlType(name = "AbstractCI_Party_Type", propOrder = {
-/// "name",
-/// "contactInfo"
+    "name",
+    "contactInfo"
 })
 @XmlRootElement(name = "CI_Party")
 public class AbstractParty extends ISOMetadata implements Party {
@@ -122,7 +122,7 @@ public class AbstractParty extends ISOMe
      * @return Name of the party.
      */
     @Override
-/// @XmlElement(name = "name")
+    @XmlElement(name = "name")
     public InternationalString getName() {
         return name;
     }
@@ -143,7 +143,7 @@ public class AbstractParty extends ISOMe
      * @return Contact information for the party.
      */
     @Override
-/// @XmlElement(name = "contactInfo")
+    @XmlElement(name = "contactInfo")
     public Collection<Contact> getContactInfo() {
         return contactInfo = nonNullCollection(contactInfo, Contact.class);
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -38,8 +38,8 @@ import org.apache.sis.metadata.iso.ISOMe
  */
 @XmlType(name = "CI_Responsibility_Type", propOrder = {
 /// "role",
-/// "extent",
-/// "party"
+/// "extents",
+/// "parties"
 })
 @XmlRootElement(name = "CI_Responsibility")
 public class DefaultResponsibility extends ISOMetadata implements Responsibility {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -99,11 +99,14 @@
     @XmlJavaTypeAdapter(CI_DateTypeCode.class),
     @XmlJavaTypeAdapter(CI_OnLineFunctionCode.class),
     @XmlJavaTypeAdapter(CI_OnlineResource.class),
+    @XmlJavaTypeAdapter(CI_Party.class),
     @XmlJavaTypeAdapter(CI_PresentationFormCode.class),
+    @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
     @XmlJavaTypeAdapter(CI_RoleCode.class),
     @XmlJavaTypeAdapter(CI_Series.class),
     @XmlJavaTypeAdapter(CI_Telephone.class),
+    @XmlJavaTypeAdapter(EX_Extent.class),
     @XmlJavaTypeAdapter(MD_Identifier.class),
 
     // Java types, primitive types and basic OGC types handling

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -37,8 +37,8 @@ import org.apache.sis.metadata.iso.ISOMe
  * @module
  */
 @XmlType(name = "MD_AttributeGroup_Type", propOrder = {
-/// "contentType",
-/// "groupAttribute"
+    "contentType",
+    "groupAttribute"
 })
 @XmlRootElement(name = "MD_AttributeGroup")
 public class DefaultAttributeGroup extends ISOMetadata implements AttributeGroup {
@@ -111,7 +111,7 @@ public class DefaultAttributeGroup exten
      * @return The types of information represented by the value(s).
      */
     @Override
-/// @XmlElement(name = "contentType", required = true)
+    @XmlElement(name = "contentType", required = true)
     public Collection<CoverageContentType> getContentTypes() {
         return contentTypes = nonNullCollection(contentTypes, CoverageContentType.class);
     }
@@ -131,7 +131,7 @@ public class DefaultAttributeGroup exten
      * @return The content types for attributes groups for a {@code RangeDimension}, or {@code
null} if none.
      */
     @Override
-/// @XmlElement(name = "groupAttribute")
+    @XmlElement(name = "groupAttribute")
     public Collection<RangeDimension> getGroupAttributes() {
         return groupAttributes = nonNullCollection(groupAttributes, RangeDimension.class);
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -36,8 +36,8 @@ import org.apache.sis.util.ArgumentCheck
  * @module
  */
 @XmlType(name = "MD_FeatureTypeInfo", propOrder = {
-/// "featureTypeName",
-/// "featureInstanceCount"
+    "featureTypeName",
+    "featureInstanceCount"
 })
 @XmlRootElement(name = "MD_FeatureTypeInfo")
 public class DefaultFeatureTypeInfo extends ISOMetadata implements FeatureTypeInfo {
@@ -124,7 +124,7 @@ public class DefaultFeatureTypeInfo exte
      * @return Name of the feature type.
      */
     @Override
-/// @XmlElement(name = "featureTypeName", required = true)
+    @XmlElement(name = "featureTypeName", required = true)
     public GenericName getFeatureTypeName() {
         return featureTypeName;
     }
@@ -146,7 +146,7 @@ public class DefaultFeatureTypeInfo exte
      */
     @Override
     @ValueRange(minimum = 1)
-/// @XmlElement(name = "featureInstanceCount")
+    @XmlElement(name = "featureInstanceCount")
     public Integer getFeatureInstanceCount() {
         return featureInstanceCount;
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java?rev=1605894&r1=1605893&r2=1605894&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
[UTF-8] Thu Jun 26 19:57:14 2014
@@ -36,10 +36,10 @@ import org.apache.sis.metadata.iso.ISOMe
  * @module
  */
 @XmlType(name = "MD_AssociatedResource_Type", propOrder = {
-/// "name",
-/// "associationType",
-/// "initiativeType",
-/// "metadataReference"
+    "name",
+    "associationType",
+    "initiativeType",
+    "metadataReference"
 })
 @XmlRootElement(name = "MD_AssociatedResource")
 public class DefaultAssociatedResource extends ISOMetadata implements AssociatedResource
{
@@ -134,7 +134,7 @@ public class DefaultAssociatedResource e
      * @return Citation information about the associated resource, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "name")
+    @XmlElement(name = "name")
     public Citation getName() {
         return name;
     }
@@ -155,7 +155,7 @@ public class DefaultAssociatedResource e
      * @return Type of relation between the resources.
      */
     @Override
-/// @XmlElement(name = "associationType", required = true)
+    @XmlElement(name = "associationType", required = true)
     public AssociationType getAssociationType() {
         return associationType;
     }
@@ -176,7 +176,7 @@ public class DefaultAssociatedResource e
      * @return The type of initiative under which the associated resource was produced, or
{@code null} if none.
      */
     @Override
-/// @XmlElement(name = "initiativeType")
+    @XmlElement(name = "initiativeType")
     public InitiativeType getInitiativeType() {
         return initiativeType;
     }
@@ -197,7 +197,7 @@ public class DefaultAssociatedResource e
      * @return Reference to the metadata of the associated resource, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "metadataReference")
+    @XmlElement(name = "metadataReference")
     public Citation getMetadataReference() {
         return metadataReference;
     }



Mime
View raw message