sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1546839 - in /sis/branches/JDK7/core: sis-metadata/src/main/java/org/apache/sis/metadata/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-referencing/src/main/java/org/apache/sis/io/wkt/
Date Sun, 01 Dec 2013 19:14:03 GMT
Author: desruisseaux
Date: Sun Dec  1 19:14:02 2013
New Revision: 1546839

URL: http://svn.apache.org/r1546839
Log:
Added @XmlTransient annotation on classes that are not part of standards.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1546839&r1=1546838&r2=1546839&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] Sun Dec  1 19:14:02 2013
@@ -18,6 +18,7 @@ package org.apache.sis.metadata;
 
 import java.util.Map;
 import java.util.logging.Logger;
+import javax.xml.bind.annotation.XmlTransient;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.collection.TreeTable;
@@ -73,6 +74,7 @@ import org.apache.sis.util.logging.Loggi
  *
  * @see MetadataStandard
  */
+@XmlTransient
 public abstract class AbstractMetadata implements LenientComparable {
     /**
      * The logger for messages related to metadata implementations.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1546839&r1=1546838&r2=1546839&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
[UTF-8] Sun Dec  1 19:14:02 2013
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.NoSuchElementException;
 import java.lang.reflect.Modifier;
+import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.util.CodeList;
 import org.apache.sis.util.ThreadSafe;
 import org.apache.sis.util.logging.Logging;
@@ -84,6 +85,7 @@ import static org.apache.sis.internal.ja
  * @module
  */
 @ThreadSafe
+@XmlTransient
 public abstract class ModifiableMetadata extends AbstractMetadata implements Cloneable {
     /**
      * Initial capacity of lists and sets. We use a small value because those

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1546839&r1=1546838&r2=1546839&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
[UTF-8] Sun Dec  1 19:14:02 2013
@@ -21,6 +21,7 @@ import java.util.logging.Logger;
 import java.io.Serializable;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import org.opengis.metadata.Identifier;
@@ -47,6 +48,7 @@ import static org.apache.sis.util.collec
  * @module
  */
 @ThreadSafe
+@XmlTransient
 public class ISOMetadata extends ModifiableMetadata implements IdentifiedObject, Serializable
{
     /**
      * Serial number for inter-operability with different versions.
@@ -93,6 +95,8 @@ public class ISOMetadata extends Modifia
      * {@note Subclasses shall not override this method in a way that depends on the object
state,
      *        since this method may be indirectly invoked by copy constructors (i.e. is may
be
      *        invoked before this metadata object is fully constructed).}
+     *
+     * @return The metadata standard, which is {@linkplain MetadataStandard#ISO_19115 ISO
19115} by default.
      */
     @Override
     public MetadataStandard getStandard() {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1546839&r1=1546838&r2=1546839&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
[UTF-8] Sun Dec  1 19:14:02 2013
@@ -18,6 +18,7 @@ package org.apache.sis.io.wkt;
 
 import java.io.Console;
 import java.io.PrintWriter;
+import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.GeneralParameterValue;
 import org.apache.sis.util.Debug;
 import org.apache.sis.util.Classes;
@@ -54,6 +55,7 @@ import org.apache.sis.internal.util.X364
  * @version 0.4
  * @module
  */
+@XmlTransient
 public class FormattableObject {
     /**
      * The formatter for the {@link #toWKT()} and {@link #toString()} methods.



Mime
View raw message