sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1459832 - in /sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis: internal/jaxb/gmi/ metadata/iso/extent/
Date Fri, 22 Mar 2013 15:06:29 GMT
Author: desruisseaux
Date: Fri Mar 22 15:06:29 2013
New Revision: 1459832

URL: http://svn.apache.org/r1459832
Log:
Replaced call to super(metadata) by shallowCopy(metadata) for now, since copy contructors
are not yet implemented.
With this commit, the JDK7 branch is back to a compilable state but the tests do not yet pass.

Modified:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class LE_ProcessStep extends Defa
      * @param original The original metadata to copy.
      */
     public LE_ProcessStep(final ProcessStep original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -53,7 +53,7 @@ public class LE_Source extends DefaultSo
      * @param original The original metadata to copy.
      */
     public LE_Source(final Source original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -53,7 +53,7 @@ public class MI_Band extends DefaultBand
      * @param original The original metadata to copy.
      */
     public MI_Band(final Band original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class MI_CoverageDescription exte
      * @param original The original metadata to copy.
      */
     public MI_CoverageDescription(final CoverageDescription original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class MI_Georectified extends Def
      * @param original The original metadata to copy.
      */
     public MI_Georectified(final Georectified original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class MI_Georeferenceable  extend
      * @param original The original metadata to copy.
      */
     public MI_Georeferenceable(final Georeferenceable original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class MI_ImageDescription extends
      * @param original The original metadata to copy.
      */
     public MI_ImageDescription(final ImageDescription original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -55,7 +55,7 @@ public class MI_Metadata extends Default
      * @param original The original metadata to copy.
      */
     public MI_Metadata(final Metadata original) {
-        super(original);
+        shallowCopy(original);
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java?rev=1459832&r1=1459831&r2=1459832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
[UTF-8] Fri Mar 22 15:06:29 2013
@@ -66,7 +66,7 @@ public class DefaultGeographicDescriptio
     public DefaultGeographicDescription(final Citation authority, final String code) {
         super(true);
         if (authority != null || code != null) {
-            this.geographicIdentifier = new DefaultIdentifier(authority, code);
+            this.geographicIdentifier = new DefaultIdentifier(code, authority);
         }
     }
 



Mime
View raw message