sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1605353 - in /sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso: citation/AbstractParty.java identification/DefaultAssociatedResource.java
Date Wed, 25 Jun 2014 11:36:25 GMT
Author: desruisseaux
Date: Wed Jun 25 11:36:24 2014
New Revision: 1605353

URL: http://svn.apache.org/r1605353
Log:
Declares the new metadata class as an implementation of GeoAPI interfaces.

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/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=1605353&r1=1605352&r2=1605353&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] Wed Jun 25 11:36:24 2014
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlType;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.opengis.metadata.citation.Contact;
-///import org.opengis.metadata.citation.Party;
+import org.opengis.metadata.citation.Party;
 import org.opengis.util.InternationalString;
 
 
@@ -40,7 +40,7 @@ import org.opengis.util.InternationalStr
 /// "contactInfo"
 })
 @XmlRootElement(name = "CI_Party")
-public class AbstractParty extends ISOMetadata /*implements Party*/ {
+public class AbstractParty extends ISOMetadata implements Party {
     /**
      * Serial number for compatibility with different versions.
      */
@@ -82,7 +82,7 @@ public class AbstractParty extends ISOMe
      *
      * @see #castOrCopy(Party)
      */
-    public AbstractParty(final AbstractParty object) {
+    public AbstractParty(final Party object) {
         super(object);
         if (object != null) {
             name        = object.getName();
@@ -108,7 +108,7 @@ public class AbstractParty extends ISOMe
      * @return A SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
-    public static AbstractParty castOrCopy(final AbstractParty object) {
+    public static AbstractParty castOrCopy(final Party object) {
         if (object == null || object instanceof AbstractParty) {
             return (AbstractParty) object;
         }
@@ -120,7 +120,7 @@ public class AbstractParty extends ISOMe
      *
      * @return Name of the party.
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "name")
     public InternationalString getName() {
         return name;
@@ -141,7 +141,7 @@ public class AbstractParty extends ISOMe
      *
      * @return Contact information for the party, or {@code null} if none.
      */
-/// @Override
+    @Override
 /// @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/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=1605353&r1=1605352&r2=1605353&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] Wed Jun 25 11:36:24 2014
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlType;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.opengis.metadata.citation.Citation;
-///import org.opengis.metadata.identification.AssociatedResource;
+import org.opengis.metadata.identification.AssociatedResource;
 import org.opengis.metadata.identification.AssociationType;
 import org.opengis.metadata.identification.InitiativeType;
 
@@ -42,10 +42,11 @@ import org.opengis.metadata.identificati
 /// "metadataReference"
 })
 @XmlRootElement(name = "MD_AssociatedResource")
-public class DefaultAssociatedResource extends ISOMetadata /*implements AssociatedResource*/
{
+public class DefaultAssociatedResource extends ISOMetadata implements AssociatedResource
{
     /**
      * Serial number for compatibility with different versions.
      */
+    private static final long serialVersionUID = -803259032236939135L;
 
     /**
      * Citation information about the associated resource.
@@ -93,7 +94,7 @@ public class DefaultAssociatedResource e
      *
      * @see #castOrCopy(AssociatedResource)
      */
-    public DefaultAssociatedResource(final DefaultAssociatedResource object) {
+    public DefaultAssociatedResource(final AssociatedResource object) {
         if (object != null) {
             this.name              = object.getName();
             this.associationType   = object.getAssociationType();
@@ -120,7 +121,7 @@ public class DefaultAssociatedResource e
      * @return A SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
-    public static DefaultAssociatedResource castOrCopy(final DefaultAssociatedResource object)
{
+    public static DefaultAssociatedResource castOrCopy(final AssociatedResource object) {
         if (object == null || object instanceof DefaultAssociatedResource) {
             return (DefaultAssociatedResource) object;
         }
@@ -132,7 +133,7 @@ public class DefaultAssociatedResource e
      *
      * @return Citation information about the associated resource, or {@code null} if none.
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "name")
     public Citation getName() {
         return name;
@@ -153,7 +154,7 @@ public class DefaultAssociatedResource e
      *
      * @return Type of relation between the resources.
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "associationType", required = true)
     public AssociationType getAssociationType() {
         return associationType;
@@ -174,7 +175,7 @@ public class DefaultAssociatedResource e
      *
      * @return The type of initiative under which the associated resource was produced, or
{@code null} if none.
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "initiativeType")
     public InitiativeType getInitiativeType() {
         return initiativeType;
@@ -195,7 +196,7 @@ public class DefaultAssociatedResource e
      *
      * @return Reference to the metadata of the associated resource, or {@code null} if none.
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "metadataReference")
     public Citation getMetadataReference() {
         return metadataReference;



Mime
View raw message