sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1470197 [1/5] - in /sis/branches/JDK6: ./ sis-metadata/src/main/java/org/apache/sis/metadata/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/ sis-metadata/src/main...
Date Sat, 20 Apr 2013 17:16:13 GMT
Author: desruisseaux
Date: Sat Apr 20 17:16:11 2013
New Revision: 1470197

URL: http://svn.apache.org/r1470197
Log:
Merged the metadata synchronization removal (SIS-85) from the JDK7 branch.

Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/Cloner.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
    sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
    sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedArrayList.java
    sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedHashSet.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1470055-1470195

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -39,11 +39,6 @@ import static org.apache.sis.util.Argume
  * Those methods are implemented using Java reflection for invoking the getter methods
  * defined by the {@code MetadataStandard}.</p>
  *
- * {@note This class does not synchronize the methods that perform deep traversal of the metadata tree
- * (like <code>equals(Object)</code>, <code>hashCode()</code> or <code>toString()</code>) because such
- * synchronizations are deadlock prone. For example if subclasses synchronize their getter methods,
- * then many locks may be acquired in various orders.}
- *
  * {@code AbstractMetadata} subclasses may be read-only or read/write, at implementation choice.
  * The methods that modify the metadata may throw {@link UnmodifiableMetadataException} if the
  * metadata does not support the operation. Those methods are:
@@ -63,6 +58,11 @@ import static org.apache.sis.util.Argume
  *   <li>{@link #equals(Object, ComparisonMode)}</li>
  * </ul>
  *
+ * Instances of this class are <strong>not</strong> synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility. Note that synchronization locks
+ * are not necessarily the metadata instances. For example an other common approach is to
+ * use a single lock for the whole metadata tree (including children).
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-2.4)
  * @version 0.3
@@ -194,7 +194,7 @@ public abstract class AbstractMetadata i
      *
      * @see MetadataStandard#asValueMap(Object, KeyNamePolicy, ValueExistencePolicy)
      */
-    public synchronized Map<String,Object> asMap() {
+    public Map<String,Object> asMap() {
         if (asMap == null) {
             asMap = getStandard().asValueMap(this, KeyNamePolicy.JAVABEANS_PROPERTY, ValueExistencePolicy.NON_EMPTY);
         }
@@ -241,17 +241,6 @@ public abstract class AbstractMetadata i
                 return false;
             }
         }
-        /*
-         * DEADLOCK WARNING: A deadlock may occur if the same pair of objects is being compared
-         * in an other thread (see http://jira.codehaus.org/browse/GEOT-1777). Ideally we would
-         * synchronize on 'this' and 'object' atomically (RFE #4210659). Since we can't in Java
-         * a workaround is to always get the locks in the same order. Unfortunately we have no
-         * guarantee that the caller didn't looked the object himself. For now the safest approach
-         * is to not synchronize at all.
-         *
-         * Edit: actually, even if we could synchronize the two objects atomically, a deadlock
-         *       risk would still exists for the reason documented in this class's javadoc.
-         */
         return standard.equals(this, object, mode);
     }
 

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/Cloner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/Cloner.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/Cloner.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/Cloner.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -98,8 +98,8 @@ final class Cloner extends org.apache.si
                 for (int i=0; i<array.length; i++) {
                     array[i] = clone(array[i]);
                 }
-                // Do not use the SIS Checked* classes since we don't
-                // need synchronization or type checking anymore.
+                // Do not use the SIS Checked* classes since
+                // we don't need type checking anymore.
                 if (isSet) {
                     collection = CollectionsExt.immutableSet(array);
                 } else {

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -46,11 +46,11 @@ import static org.apache.sis.internal.ja
  *     public class MyMetadata {
  *         private Foo property;
  *
- *         public synchronized Foo getProperty() {
+ *         public Foo getProperty() {
  *             return property;
  *         }
  *
- *         public synchronized void setProperty(Foo newValue) {
+ *         public void setProperty(Foo newValue) {
  *             checkWritePermission();
  *             property = newValue;
  *         }
@@ -63,11 +63,11 @@ import static org.apache.sis.internal.ja
  *     public class MyMetadata {
  *         private Collection<Foo> properties;
  *
- *         public synchronized Collection<Foo> getProperties() {
+ *         public Collection<Foo> getProperties() {
  *             return properties = nonNullCollection(properties, Foo.class);
  *         }
  *
- *         public synchronized void setProperties(Collection<Foo> newValues) {
+ *         public void setProperties(Collection<Foo> newValues) {
  *             properties = writeCollection(newValues, properties, Foo.class);
  *         }
  *     }
@@ -123,7 +123,7 @@ public abstract class ModifiableMetadata
      * @see #freeze()
      * @see #checkWritePermission()
      */
-    public final synchronized boolean isModifiable() {
+    public final boolean isModifiable() {
         return unmodifiable != this;
     }
 
@@ -157,7 +157,7 @@ public abstract class ModifiableMetadata
      *
      * @return An unmodifiable copy of this metadata.
      */
-    public synchronized AbstractMetadata unmodifiable() {
+    public AbstractMetadata unmodifiable() {
         // Reminder: 'unmodifiable' is reset to null by checkWritePermission().
         if (unmodifiable == null) {
             final ModifiableMetadata candidate;
@@ -196,7 +196,7 @@ public abstract class ModifiableMetadata
      * @see #isModifiable()
      * @see #checkWritePermission()
      */
-    public synchronized void freeze() {
+    public void freeze() {
         if (isModifiable()) {
             ModifiableMetadata success = null;
             try {
@@ -220,7 +220,6 @@ public abstract class ModifiableMetadata
      * @see #freeze()
      */
     protected void checkWritePermission() throws UnmodifiableMetadataException {
-        assert Thread.holdsLock(this);
         if (!isModifiable()) {
             throw new UnmodifiableMetadataException(Errors.format(Errors.Keys.UnmodifiableMetadata));
         }
@@ -497,7 +496,6 @@ public abstract class ModifiableMetadata
      * @return {@code c}, or a new list if {@code c} is null.
      */
     protected final <E> List<E> nonNullList(final List<E> c, final Class<E> elementType) {
-        assert Thread.holdsLock(this);
         if (c != null) {
             return c.isEmpty() && isMarshalling() ? null : c;
         }
@@ -520,7 +518,6 @@ public abstract class ModifiableMetadata
      * @return {@code c}, or a new set if {@code c} is null.
      */
     protected final <E> Set<E> nonNullSet(final Set<E> c, final Class<E> elementType) {
-        assert Thread.holdsLock(this);
         if (c != null) {
             return c.isEmpty() && isMarshalling() ? null : c;
         }
@@ -551,7 +548,6 @@ public abstract class ModifiableMetadata
      * @return {@code c}, or a new collection if {@code c} is null.
      */
     protected final <E> Collection<E> nonNullCollection(final Collection<E> c, final Class<E> elementType) {
-        assert Thread.holdsLock(this);
         if (c != null) {
             assert collectionType(elementType).isInstance(c);
             return c.isEmpty() && isMarshalling() ? null : c;
@@ -576,8 +572,7 @@ public abstract class ModifiableMetadata
     }
 
     /**
-     * A checked set synchronized on the enclosing {@link ModifiableMetadata}.
-     * Used for mutable sets only.
+     * A set checking element validity and write permission before to change any value.
      */
     private final class MutableSet<E> extends CheckedHashSet<E> {
         private static final long serialVersionUID = 3032602282358733056L;
@@ -591,11 +586,6 @@ public abstract class ModifiableMetadata
         }
 
         @Override
-        protected Object getLock() {
-            return ModifiableMetadata.this;
-        }
-
-        @Override
         protected void checkWritePermission() throws UnsupportedOperationException {
             ModifiableMetadata.this.checkWritePermission();
         }
@@ -608,8 +598,7 @@ public abstract class ModifiableMetadata
     }
 
     /**
-     * A checked list synchronized on the enclosing {@link ModifiableMetadata}.
-     * Used for mutable lists only.
+     * A list checking element validity and write permission before to change any value.
      */
     private final class MutableList<E> extends CheckedArrayList<E> {
         private static final long serialVersionUID = 5800381255701183058L;
@@ -623,11 +612,6 @@ public abstract class ModifiableMetadata
         }
 
         @Override
-        protected Object getLock() {
-            return ModifiableMetadata.this;
-        }
-
-        @Override
         protected void checkWritePermission() throws UnsupportedOperationException {
             ModifiableMetadata.this.checkWritePermission();
         }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -92,7 +92,7 @@ abstract class PropertyMap<V> extends Ab
      * if they define a different entries set class than the default {@link Entries} inner class.
      */
     @Override
-    public synchronized Set<Map.Entry<String,V>> entrySet() {
+    public Set<Map.Entry<String,V>> entrySet() {
         if (entrySet == null) {
             entrySet = new Entries();
         }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -158,7 +158,7 @@ final class ValueMap extends PropertyMap
      * Returns a view of the mappings contained in this map.
      */
     @Override
-    public synchronized Set<Map.Entry<String,Object>> entrySet() {
+    public Set<Map.Entry<String,Object>> entrySet() {
         if (entrySet == null) {
             entrySet = new Entries();
         }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -159,7 +159,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "name", required = true)
-    public synchronized Citation getName() {
+    public Citation getName() {
         return name;
     }
 
@@ -168,7 +168,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new name.
      */
-    public synchronized void setName(final Citation newValue) {
+    public void setName(final Citation newValue) {
         checkWritePermission();
         name = newValue;
     }
@@ -178,7 +178,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "schemaLanguage", required = true)
-    public synchronized String getSchemaLanguage() {
+    public String getSchemaLanguage() {
         return schemaLanguage;
     }
 
@@ -187,7 +187,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new schema language.
      */
-    public synchronized void setSchemaLanguage(final String newValue) {
+    public void setSchemaLanguage(final String newValue) {
         checkWritePermission();
         schemaLanguage = newValue;
     }
@@ -197,7 +197,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "constraintLanguage", required = true)
-    public synchronized String getConstraintLanguage()  {
+    public String getConstraintLanguage()  {
         return constraintLanguage;
     }
 
@@ -206,7 +206,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new constraint language.
      */
-    public synchronized void setConstraintLanguage(final String newValue) {
+    public void setConstraintLanguage(final String newValue) {
         checkWritePermission();
         constraintLanguage = newValue;
     }
@@ -216,7 +216,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "schemaAscii")
-    public synchronized URI getSchemaAscii()  {
+    public URI getSchemaAscii()  {
         return schemaAscii;
     }
 
@@ -225,7 +225,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new ASCII file.
      */
-    public synchronized void setSchemaAscii(final URI newValue) {
+    public void setSchemaAscii(final URI newValue) {
         checkWritePermission();
         schemaAscii = newValue;
     }
@@ -235,7 +235,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "graphicsFile")
-    public synchronized URI getGraphicsFile()  {
+    public URI getGraphicsFile()  {
         return graphicsFile;
     }
 
@@ -244,7 +244,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new graphics file.
      */
-    public synchronized void setGraphicsFile(final URI newValue) {
+    public void setGraphicsFile(final URI newValue) {
         checkWritePermission();
         graphicsFile = newValue;
     }
@@ -254,7 +254,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "softwareDevelopmentFile")
-    public synchronized URI getSoftwareDevelopmentFile()  {
+    public URI getSoftwareDevelopmentFile()  {
         return softwareDevelopmentFile;
     }
 
@@ -263,7 +263,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new software development file.
      */
-    public synchronized void setSoftwareDevelopmentFile(final URI newValue) {
+    public void setSoftwareDevelopmentFile(final URI newValue) {
         checkWritePermission();
         softwareDevelopmentFile = newValue;
     }
@@ -273,7 +273,7 @@ public class DefaultApplicationSchemaInf
      */
     @Override
     @XmlElement(name = "softwareDevelopmentFileFormat")
-    public synchronized String getSoftwareDevelopmentFileFormat()  {
+    public String getSoftwareDevelopmentFileFormat()  {
         return softwareDevelopmentFileFormat;
     }
 
@@ -282,7 +282,7 @@ public class DefaultApplicationSchemaInf
      *
      * @param newValue The new software development file format.
      */
-    public synchronized void setSoftwareDevelopmentFileFormat(final String newValue) {
+    public void setSoftwareDevelopmentFileFormat(final String newValue) {
         checkWritePermission();
         softwareDevelopmentFileFormat = newValue;
     }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -231,7 +231,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "name", required = true)
-    public synchronized String getName() {
+    public String getName() {
         return name;
     }
 
@@ -240,7 +240,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new name.
      */
-    public synchronized void setName(final String newValue) {
+    public void setName(final String newValue) {
         checkWritePermission();
         name = newValue;
     }
@@ -250,7 +250,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "shortName")
-    public synchronized String getShortName()  {
+    public String getShortName()  {
         return shortName;
     }
 
@@ -259,7 +259,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new short name.
      */
-    public synchronized void setShortName(final String newValue)  {
+    public void setShortName(final String newValue)  {
         checkWritePermission();
         shortName = newValue;
     }
@@ -271,7 +271,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "domainCode")
-    public synchronized Integer getDomainCode() {
+    public Integer getDomainCode() {
         return domainCode;
     }
 
@@ -280,7 +280,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new domain code.
      */
-    public synchronized void setDomainCode(final Integer newValue) {
+    public void setDomainCode(final Integer newValue) {
         checkWritePermission();
         domainCode = newValue;
     }
@@ -290,7 +290,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "definition", required = true)
-    public synchronized InternationalString getDefinition()  {
+    public InternationalString getDefinition()  {
         return definition;
     }
 
@@ -299,7 +299,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new definition.
      */
-    public synchronized void setDefinition(final InternationalString newValue)  {
+    public void setDefinition(final InternationalString newValue)  {
         checkWritePermission();
         definition = newValue;
     }
@@ -309,7 +309,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "obligation")
-    public synchronized Obligation getObligation()  {
+    public Obligation getObligation()  {
         return obligation;
     }
 
@@ -318,7 +318,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new obligation.
      */
-    public synchronized void setObligation(final Obligation newValue)  {
+    public void setObligation(final Obligation newValue)  {
         checkWritePermission();
         obligation = newValue;
     }
@@ -330,7 +330,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "condition")
-    public synchronized InternationalString getCondition() {
+    public InternationalString getCondition() {
         return condition;
     }
 
@@ -339,7 +339,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new condition.
      */
-    public synchronized void setCondition(final InternationalString newValue) {
+    public void setCondition(final InternationalString newValue) {
         checkWritePermission();
         condition = newValue;
     }
@@ -349,7 +349,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "dataType", required = true)
-    public synchronized Datatype getDataType() {
+    public Datatype getDataType() {
         return dataType;
     }
 
@@ -358,7 +358,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new data type.
      */
-    public synchronized void setDataType(final Datatype newValue) {
+    public void setDataType(final Datatype newValue) {
         checkWritePermission();
         dataType = newValue;
     }
@@ -373,7 +373,7 @@ public class DefaultExtendedElementInfor
     @Override
     @ValueRange(minimum=0)
     @XmlElement(name = "maximumOccurrence")
-    public synchronized Integer getMaximumOccurrence() {
+    public Integer getMaximumOccurrence() {
         return maximumOccurrence;
     }
 
@@ -382,7 +382,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new maximum occurrence.
      */
-    public synchronized void setMaximumOccurrence(final Integer newValue) {
+    public void setMaximumOccurrence(final Integer newValue) {
         checkWritePermission();
         maximumOccurrence = newValue;
     }
@@ -396,7 +396,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "domainValue")
-    public synchronized InternationalString getDomainValue() {
+    public InternationalString getDomainValue() {
         return domainValue;
     }
 
@@ -405,7 +405,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new domain value.
      */
-    public synchronized void setDomainValue(final InternationalString newValue) {
+    public void setDomainValue(final InternationalString newValue) {
         checkWritePermission();
         domainValue = newValue;
     }
@@ -416,7 +416,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "parentEntity", required = true)
-    public synchronized Collection<String> getParentEntity() {
+    public Collection<String> getParentEntity() {
         return parentEntity = nonNullCollection(parentEntity, String.class);
     }
 
@@ -425,7 +425,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValues The new parent entity.
      */
-    public synchronized void setParentEntity(final Collection<? extends String> newValues) {
+    public void setParentEntity(final Collection<? extends String> newValues) {
         parentEntity = writeCollection(newValues, parentEntity, String.class);
     }
 
@@ -434,7 +434,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "rule", required = true)
-    public synchronized InternationalString getRule() {
+    public InternationalString getRule() {
         return rule;
     }
 
@@ -443,7 +443,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValue The new rule.
      */
-    public synchronized void setRule(final InternationalString newValue) {
+    public void setRule(final InternationalString newValue) {
         checkWritePermission();
         rule = newValue;
     }
@@ -453,7 +453,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "rationale")
-    public synchronized Collection<InternationalString> getRationales() {
+    public Collection<InternationalString> getRationales() {
         return rationales = nonNullCollection(rationales, InternationalString.class);
     }
 
@@ -462,7 +462,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValues The new rationales.
      */
-    public synchronized void setRationales(final Collection<? extends InternationalString> newValues) {
+    public void setRationales(final Collection<? extends InternationalString> newValues) {
         rationales = writeCollection(newValues, rationales, InternationalString.class);
     }
 
@@ -471,7 +471,7 @@ public class DefaultExtendedElementInfor
      */
     @Override
     @XmlElement(name = "source", required = true)
-    public synchronized Collection<ResponsibleParty> getSources() {
+    public Collection<ResponsibleParty> getSources() {
         return sources = nonNullCollection(sources, ResponsibleParty.class);
     }
 
@@ -480,7 +480,7 @@ public class DefaultExtendedElementInfor
      *
      * @param newValues The new sources.
      */
-    public synchronized void setSources(final Collection<? extends ResponsibleParty> newValues) {
+    public void setSources(final Collection<? extends ResponsibleParty> newValues) {
         sources = writeCollection(newValues, sources, ResponsibleParty.class);
     }
 }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -115,7 +115,7 @@ public class DefaultFeatureTypeList exte
      */
     @Override
     @XmlElement(name = "spatialObject", required = true)
-    public synchronized String getSpatialObject() {
+    public String getSpatialObject() {
         return spatialObject;
     }
 
@@ -124,7 +124,7 @@ public class DefaultFeatureTypeList exte
      *
      * @param newValue The new spatial object.
      */
-    public synchronized void setSpatialObject(final String newValue) {
+    public void setSpatialObject(final String newValue) {
         checkWritePermission();
         spatialObject = newValue;
     }
@@ -134,7 +134,7 @@ public class DefaultFeatureTypeList exte
      */
     @Override
     @XmlElement(name = "spatialSchemaName", required = true)
-    public synchronized String getSpatialSchemaName() {
+    public String getSpatialSchemaName() {
         return spatialSchemaName;
     }
 
@@ -143,7 +143,7 @@ public class DefaultFeatureTypeList exte
      *
      * @param newValue The new spatial schema.
      */
-    public synchronized void setSpatialSchemaName(final String newValue) {
+    public void setSpatialSchemaName(final String newValue) {
         checkWritePermission();
         spatialSchemaName = newValue;
     }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -139,7 +139,7 @@ public class DefaultIdentifier extends I
      */
     @Override
     @XmlElement(name = "code", required = true)
-    public synchronized String getCode() {
+    public String getCode() {
         return code;
     }
 
@@ -148,7 +148,7 @@ public class DefaultIdentifier extends I
      *
      * @param newValue The new code, or {@code null}.
      */
-    public synchronized void setCode(final String newValue) {
+    public void setCode(final String newValue) {
         checkWritePermission();
         code = newValue;
     }
@@ -161,7 +161,7 @@ public class DefaultIdentifier extends I
      *
      * @return The version, or {@code null} if not available.
      */
-    public synchronized String getVersion() {
+    public String getVersion() {
         return version;
     }
 
@@ -170,7 +170,7 @@ public class DefaultIdentifier extends I
      *
      * @param newValue The new version.
      */
-    public synchronized void setVersion(final String newValue) {
+    public void setVersion(final String newValue) {
         checkWritePermission();
         version = newValue;
     }
@@ -183,7 +183,7 @@ public class DefaultIdentifier extends I
      */
     @Override
     @XmlElement(name = "authority")
-    public synchronized Citation getAuthority() {
+    public Citation getAuthority() {
         return authority;
     }
 
@@ -193,7 +193,7 @@ public class DefaultIdentifier extends I
      *
      * @param newValue The new authority.
      */
-    public synchronized void setAuthority(final Citation newValue) {
+    public void setAuthority(final Citation newValue) {
         checkWritePermission();
         authority = newValue;
     }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -315,7 +315,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "fileIdentifier")
-    public synchronized String getFileIdentifier() {
+    public String getFileIdentifier() {
         return fileIdentifier;
     }
 
@@ -324,7 +324,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new identifier.
      */
-    public synchronized void setFileIdentifier(final String newValue) {
+    public void setFileIdentifier(final String newValue) {
         checkWritePermission();
         fileIdentifier = newValue;
     }
@@ -336,7 +336,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "language")
-    public synchronized Locale getLanguage() {
+    public Locale getLanguage() {
         return language;
     }
 
@@ -349,7 +349,7 @@ public class DefaultMetadata extends ISO
      *
      * @see org.apache.sis.xml.XML#LOCALE
      */
-    public synchronized void setLanguage(final Locale newValue) {
+    public void setLanguage(final Locale newValue) {
         checkWritePermission();
         language = newValue;
         // The "magik" applying this language to every children
@@ -363,7 +363,7 @@ public class DefaultMetadata extends ISO
     @Override
     @XmlElement(name = "locale")
 //    @XmlJavaTypeAdapter(PT_Locale.class) // TODO
-    public synchronized Collection<Locale> getLocales() {
+    public Collection<Locale> getLocales() {
         return locales = nonNullCollection(locales, Locale.class);
     }
 
@@ -373,7 +373,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new locales.
      */
-    public synchronized void setLocales(final Collection<? extends Locale> newValues) {
+    public void setLocales(final Collection<? extends Locale> newValues) {
         locales = writeCollection(newValues, locales, Locale.class);
     }
 
@@ -382,7 +382,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "characterSet")
-    public synchronized CharacterSet getCharacterSet()  {
+    public CharacterSet getCharacterSet()  {
         return characterSet;
     }
 
@@ -391,7 +391,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new character set.
      */
-    public synchronized void setCharacterSet(final CharacterSet newValue) {
+    public void setCharacterSet(final CharacterSet newValue) {
         checkWritePermission();
         characterSet = newValue;
     }
@@ -401,7 +401,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "parentIdentifier")
-    public synchronized String getParentIdentifier() {
+    public String getParentIdentifier() {
         return parentIdentifier;
     }
 
@@ -410,7 +410,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new parent identifier.
      */
-    public synchronized void setParentIdentifier(final String newValue) {
+    public void setParentIdentifier(final String newValue) {
         checkWritePermission();
         parentIdentifier = newValue;
     }
@@ -420,7 +420,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "hierarchyLevel")
-    public synchronized Collection<ScopeCode> getHierarchyLevels() {
+    public Collection<ScopeCode> getHierarchyLevels() {
         return hierarchyLevels = nonNullCollection(hierarchyLevels, ScopeCode.class);
     }
 
@@ -429,7 +429,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new hierarchy levels.
      */
-    public synchronized void setHierarchyLevels(final Collection<? extends ScopeCode> newValues) {
+    public void setHierarchyLevels(final Collection<? extends ScopeCode> newValues) {
         hierarchyLevels = writeCollection(newValues, hierarchyLevels, ScopeCode.class);
     }
 
@@ -438,7 +438,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "hierarchyLevelName")
-    public synchronized Collection<String> getHierarchyLevelNames() {
+    public Collection<String> getHierarchyLevelNames() {
         return hierarchyLevelNames = nonNullCollection(hierarchyLevelNames, String.class);
     }
 
@@ -447,7 +447,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new hierarchy level names.
      */
-    public synchronized void setHierarchyLevelNames(final Collection<? extends String> newValues) {
+    public void setHierarchyLevelNames(final Collection<? extends String> newValues) {
         hierarchyLevelNames = writeCollection(newValues, hierarchyLevelNames, String.class);
     }
 
@@ -456,7 +456,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "contact", required = true)
-    public synchronized Collection<ResponsibleParty> getContacts() {
+    public Collection<ResponsibleParty> getContacts() {
         return contacts = nonNullCollection(contacts, ResponsibleParty.class);
     }
 
@@ -465,7 +465,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new contacts.
      */
-    public synchronized void setContacts(final Collection<? extends ResponsibleParty> newValues) {
+    public void setContacts(final Collection<? extends ResponsibleParty> newValues) {
         checkWritePermission();
         contacts = writeCollection(newValues, contacts, ResponsibleParty.class);
     }
@@ -475,7 +475,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "dateStamp", required = true)
-    public synchronized Date getDateStamp() {
+    public Date getDateStamp() {
         return toDate(dateStamp);
     }
 
@@ -484,7 +484,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new date stamp.
      */
-    public synchronized void setDateStamp(final Date newValue) {
+    public void setDateStamp(final Date newValue) {
         checkWritePermission();
         dateStamp = toMilliseconds(newValue);
     }
@@ -494,7 +494,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "metadataStandardName")
-    public synchronized String getMetadataStandardName() {
+    public String getMetadataStandardName() {
         return metadataStandardName;
     }
 
@@ -503,7 +503,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new metadata standard name.
      */
-    public synchronized void setMetadataStandardName(final String newValue) {
+    public void setMetadataStandardName(final String newValue) {
         checkWritePermission();
         metadataStandardName = newValue;
     }
@@ -513,7 +513,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "metadataStandardVersion")
-    public synchronized String getMetadataStandardVersion() {
+    public String getMetadataStandardVersion() {
         return metadataStandardVersion;
     }
 
@@ -522,7 +522,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new metadata standard version.
      */
-    public synchronized void setMetadataStandardVersion(final String newValue) {
+    public void setMetadataStandardVersion(final String newValue) {
         checkWritePermission();
         metadataStandardVersion = newValue;
     }
@@ -532,7 +532,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "dataSetURI")
-    public synchronized String getDataSetUri() {
+    public String getDataSetUri() {
         return dataSetUri;
     }
 
@@ -541,7 +541,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new data set URI.
      */
-    public synchronized void setDataSetUri(final String newValue) {
+    public void setDataSetUri(final String newValue) {
         checkWritePermission();
         dataSetUri = newValue;
     }
@@ -551,7 +551,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "spatialRepresentationInfo")
-    public synchronized Collection<SpatialRepresentation> getSpatialRepresentationInfo() {
+    public Collection<SpatialRepresentation> getSpatialRepresentationInfo() {
         return spatialRepresentationInfo = nonNullCollection(spatialRepresentationInfo, SpatialRepresentation.class);
     }
 
@@ -560,7 +560,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new spatial representation info.
      */
-    public synchronized void setSpatialRepresentationInfo(final Collection<? extends SpatialRepresentation> newValues) {
+    public void setSpatialRepresentationInfo(final Collection<? extends SpatialRepresentation> newValues) {
         spatialRepresentationInfo = writeCollection(newValues, spatialRepresentationInfo, SpatialRepresentation.class);
     }
 
@@ -569,7 +569,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "referenceSystemInfo")
-    public synchronized Collection<ReferenceSystem> getReferenceSystemInfo() {
+    public Collection<ReferenceSystem> getReferenceSystemInfo() {
         return referenceSystemInfo = nonNullCollection(referenceSystemInfo, ReferenceSystem.class);
     }
 
@@ -578,7 +578,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new reference system info.
      */
-    public synchronized void setReferenceSystemInfo(final Collection<? extends ReferenceSystem> newValues) {
+    public void setReferenceSystemInfo(final Collection<? extends ReferenceSystem> newValues) {
         referenceSystemInfo = writeCollection(newValues, referenceSystemInfo, ReferenceSystem.class);
     }
 
@@ -587,7 +587,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "metadataExtensionInfo")
-    public synchronized Collection<MetadataExtensionInformation> getMetadataExtensionInfo() {
+    public Collection<MetadataExtensionInformation> getMetadataExtensionInfo() {
         return metadataExtensionInfo = nonNullCollection(metadataExtensionInfo, MetadataExtensionInformation.class);
     }
 
@@ -596,7 +596,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new metadata extension info.
      */
-    public synchronized void setMetadataExtensionInfo(final Collection<? extends MetadataExtensionInformation> newValues) {
+    public void setMetadataExtensionInfo(final Collection<? extends MetadataExtensionInformation> newValues) {
         metadataExtensionInfo = writeCollection(newValues, metadataExtensionInfo, MetadataExtensionInformation.class);
     }
 
@@ -605,7 +605,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "identificationInfo", required = true)
-    public synchronized Collection<Identification> getIdentificationInfo() {
+    public Collection<Identification> getIdentificationInfo() {
         return identificationInfo = nonNullCollection(identificationInfo, Identification.class);
     }
 
@@ -614,7 +614,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new identification info.
      */
-    public synchronized void setIdentificationInfo(final Collection<? extends Identification> newValues) {
+    public void setIdentificationInfo(final Collection<? extends Identification> newValues) {
         identificationInfo = writeCollection(newValues, identificationInfo, Identification.class);
     }
 
@@ -624,7 +624,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "contentInfo")
-    public synchronized Collection<ContentInformation> getContentInfo() {
+    public Collection<ContentInformation> getContentInfo() {
         return contentInfo = nonNullCollection(contentInfo, ContentInformation.class);
     }
 
@@ -634,7 +634,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new content info.
      */
-    public synchronized void setContentInfo(final Collection<? extends ContentInformation> newValues) {
+    public void setContentInfo(final Collection<? extends ContentInformation> newValues) {
         contentInfo = writeCollection(newValues, contentInfo, ContentInformation.class);
     }
 
@@ -643,7 +643,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "distributionInfo")
-    public synchronized Distribution getDistributionInfo() {
+    public Distribution getDistributionInfo() {
         return distributionInfo;
     }
 
@@ -652,7 +652,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new distribution info.
      */
-    public synchronized void setDistributionInfo(final Distribution newValue) {
+    public void setDistributionInfo(final Distribution newValue) {
         checkWritePermission();
         distributionInfo = newValue;
     }
@@ -662,7 +662,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "dataQualityInfo")
-    public synchronized Collection<DataQuality> getDataQualityInfo() {
+    public Collection<DataQuality> getDataQualityInfo() {
         return dataQualityInfo = nonNullCollection(dataQualityInfo, DataQuality.class);
     }
 
@@ -671,7 +671,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new data quality info.
      */
-    public synchronized void setDataQualityInfo(final Collection<? extends DataQuality> newValues) {
+    public void setDataQualityInfo(final Collection<? extends DataQuality> newValues) {
         dataQualityInfo = writeCollection(newValues, dataQualityInfo, DataQuality.class);
     }
 
@@ -681,7 +681,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "portrayalCatalogueInfo")
-    public synchronized Collection<PortrayalCatalogueReference> getPortrayalCatalogueInfo() {
+    public Collection<PortrayalCatalogueReference> getPortrayalCatalogueInfo() {
         return portrayalCatalogueInfo = nonNullCollection(portrayalCatalogueInfo, PortrayalCatalogueReference.class);
     }
 
@@ -690,7 +690,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new portrayal catalog info.
      */
-    public synchronized void setPortrayalCatalogueInfo(
+    public void setPortrayalCatalogueInfo(
             final Collection<? extends PortrayalCatalogueReference> newValues)
     {
         portrayalCatalogueInfo = writeCollection(newValues, portrayalCatalogueInfo, PortrayalCatalogueReference.class);
@@ -701,7 +701,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "metadataConstraints")
-    public synchronized Collection<Constraints> getMetadataConstraints() {
+    public Collection<Constraints> getMetadataConstraints() {
         return metadataConstraints = nonNullCollection(metadataConstraints, Constraints.class);
     }
 
@@ -710,7 +710,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new metadata constraints.
      */
-    public synchronized void setMetadataConstraints(final Collection<? extends Constraints> newValues) {
+    public void setMetadataConstraints(final Collection<? extends Constraints> newValues) {
         metadataConstraints = writeCollection(newValues, metadataConstraints, Constraints.class);
     }
 
@@ -719,7 +719,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "applicationSchemaInfo")
-    public synchronized Collection<ApplicationSchemaInformation> getApplicationSchemaInfo() {
+    public Collection<ApplicationSchemaInformation> getApplicationSchemaInfo() {
         return applicationSchemaInfo = nonNullCollection(applicationSchemaInfo, ApplicationSchemaInformation.class);
     }
 
@@ -728,7 +728,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new application schema info.
      */
-    public synchronized void setApplicationSchemaInfo(final Collection<? extends ApplicationSchemaInformation> newValues) {
+    public void setApplicationSchemaInfo(final Collection<? extends ApplicationSchemaInformation> newValues) {
         applicationSchemaInfo = writeCollection(newValues, applicationSchemaInfo, ApplicationSchemaInformation.class);
     }
 
@@ -737,7 +737,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "metadataMaintenance")
-    public synchronized MaintenanceInformation getMetadataMaintenance() {
+    public MaintenanceInformation getMetadataMaintenance() {
         return metadataMaintenance;
     }
 
@@ -746,7 +746,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValue The new metadata maintenance.
      */
-    public synchronized void setMetadataMaintenance(final MaintenanceInformation newValue) {
+    public void setMetadataMaintenance(final MaintenanceInformation newValue) {
         checkWritePermission();
         metadataMaintenance = newValue;
     }
@@ -756,7 +756,7 @@ public class DefaultMetadata extends ISO
      */
     @Override
     @XmlElement(name = "acquisitionInformation", namespace = Namespaces.GMI)
-    public synchronized Collection<AcquisitionInformation> getAcquisitionInformation() {
+    public Collection<AcquisitionInformation> getAcquisitionInformation() {
         return acquisitionInformation = nonNullCollection(acquisitionInformation, AcquisitionInformation.class);
     }
 
@@ -765,7 +765,7 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new acquisition information.
      */
-    public synchronized void setAcquisitionInformation(final Collection<? extends AcquisitionInformation> newValues) {
+    public void setAcquisitionInformation(final Collection<? extends AcquisitionInformation> newValues) {
         acquisitionInformation = writeCollection(newValues, acquisitionInformation, AcquisitionInformation.class);
     }
 

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -112,7 +112,7 @@ public class DefaultMetadataExtensionInf
      */
     @Override
     @XmlElement(name = "extensionOnLineResource")
-    public synchronized OnlineResource getExtensionOnLineResource() {
+    public OnlineResource getExtensionOnLineResource() {
         return extensionOnLineResource;
     }
 
@@ -121,7 +121,7 @@ public class DefaultMetadataExtensionInf
      *
      * @param newValue The new extension online resource.
      */
-    public synchronized void setExtensionOnLineResource(final OnlineResource newValue) {
+    public void setExtensionOnLineResource(final OnlineResource newValue) {
         checkWritePermission();
         this.extensionOnLineResource = newValue;
     }
@@ -132,7 +132,7 @@ public class DefaultMetadataExtensionInf
      */
     @Override
     @XmlElement(name = "extendedElementInformation")
-    public synchronized Collection<ExtendedElementInformation> getExtendedElementInformation() {
+    public Collection<ExtendedElementInformation> getExtendedElementInformation() {
         return extendedElementInformation = nonNullCollection(extendedElementInformation, ExtendedElementInformation.class);
     }
 
@@ -141,7 +141,7 @@ public class DefaultMetadataExtensionInf
      *
      * @param newValues The new extended element information.
      */
-    public synchronized void setExtendedElementInformation(final Collection<? extends ExtendedElementInformation> newValues) {
+    public void setExtendedElementInformation(final Collection<? extends ExtendedElementInformation> newValues) {
         extendedElementInformation = writeCollection(newValues, extendedElementInformation, ExtendedElementInformation.class);
     }
 }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -108,7 +108,7 @@ public class DefaultPortrayalCatalogueRe
      */
     @Override
     @XmlElement(name = "portrayalCatalogueCitation", required = true)
-    public synchronized Collection<Citation> getPortrayalCatalogueCitations() {
+    public Collection<Citation> getPortrayalCatalogueCitations() {
         return portrayalCatalogueCitations = nonNullCollection(portrayalCatalogueCitations, Citation.class);
     }
 
@@ -117,7 +117,7 @@ public class DefaultPortrayalCatalogueRe
      *
      * @param newValues The new portrayal catalogue citations.
      */
-    public synchronized void setPortrayalCatalogueCitations(Collection<? extends Citation> newValues) {
+    public void setPortrayalCatalogueCitations(Collection<? extends Citation> newValues) {
         portrayalCatalogueCitations = writeCollection(newValues, portrayalCatalogueCitations, Citation.class);
     }
 }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -95,7 +95,7 @@ public class ISOMetadata extends Modifia
      * {@inheritDoc}
      */
     @Override
-    public synchronized Collection<Identifier> getIdentifiers() {
+    public Collection<Identifier> getIdentifiers() {
         return identifiers = nonNullCollection(identifiers, Identifier.class);
     }
 
@@ -107,7 +107,7 @@ public class ISOMetadata extends Modifia
      * and conversely.</p>
      */
     @Override
-    public synchronized IdentifierMap getIdentifierMap() {
+    public IdentifierMap getIdentifierMap() {
         if (identifierMap == null) {
             final Collection<Identifier> identifiers = getIdentifiers();
             if (identifiers == null) {

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -148,7 +148,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "acquisitionPlan")
-    public synchronized Collection<Plan> getAcquisitionPlans() {
+    public Collection<Plan> getAcquisitionPlans() {
         return acquisitionPlans = nonNullCollection(acquisitionPlans, Plan.class);
     }
 
@@ -157,7 +157,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new plan values.
      */
-    public synchronized void setAcquisitionPlans(final Collection<? extends Plan> newValues) {
+    public void setAcquisitionPlans(final Collection<? extends Plan> newValues) {
         acquisitionPlans = writeCollection(newValues, acquisitionPlans, Plan.class);
     }
 
@@ -166,7 +166,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "acquisitionRequirement")
-    public synchronized Collection<Requirement> getAcquisitionRequirements() {
+    public Collection<Requirement> getAcquisitionRequirements() {
         return acquisitionRequirements = nonNullCollection(acquisitionRequirements, Requirement.class);
     }
 
@@ -175,7 +175,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new acquisition requirements values.
      */
-    public synchronized void setAcquisitionRequirements(final Collection<? extends Requirement> newValues) {
+    public void setAcquisitionRequirements(final Collection<? extends Requirement> newValues) {
         acquisitionRequirements = writeCollection(newValues, acquisitionRequirements, Requirement.class);
     }
 
@@ -185,7 +185,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "environmentalConditions")
-    public synchronized EnvironmentalRecord getEnvironmentalConditions() {
+    public EnvironmentalRecord getEnvironmentalConditions() {
         return environmentalConditions;
     }
 
@@ -194,7 +194,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValue The new environmental record value.
      */
-    public synchronized void setEnvironmentalConditions(final EnvironmentalRecord newValue) {
+    public void setEnvironmentalConditions(final EnvironmentalRecord newValue) {
         checkWritePermission();
         environmentalConditions = newValue;
     }
@@ -204,7 +204,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "instrument")
-    public synchronized Collection<Instrument> getInstruments() {
+    public Collection<Instrument> getInstruments() {
         return instruments = nonNullCollection(instruments, Instrument.class);
     }
 
@@ -213,7 +213,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new instruments values.
      */
-    public synchronized void setInstruments(final Collection<? extends Instrument> newValues) {
+    public void setInstruments(final Collection<? extends Instrument> newValues) {
         instruments = writeCollection(newValues, instruments, Instrument.class);
     }
 
@@ -222,7 +222,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "objective")
-    public synchronized Collection<Objective> getObjectives() {
+    public Collection<Objective> getObjectives() {
         return objectives = nonNullCollection(objectives, Objective.class);
     }
 
@@ -231,7 +231,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new objectives values.
      */
-    public synchronized void setObjectives(final Collection<? extends Objective> newValues) {
+    public void setObjectives(final Collection<? extends Objective> newValues) {
         objectives = writeCollection(newValues, objectives, Objective.class);
     }
 
@@ -240,7 +240,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "operation")
-    public synchronized Collection<Operation> getOperations() {
+    public Collection<Operation> getOperations() {
         return operations = nonNullCollection(operations, Operation.class);
     }
 
@@ -249,7 +249,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new operations values.
      */
-    public synchronized void setOperations(final Collection<? extends Operation> newValues) {
+    public void setOperations(final Collection<? extends Operation> newValues) {
         operations = writeCollection(newValues, operations, Operation.class);
     }
 
@@ -258,7 +258,7 @@ public class DefaultAcquisitionInformati
      */
     @Override
     @XmlElement(name = "platform")
-    public synchronized Collection<Platform> getPlatforms() {
+    public Collection<Platform> getPlatforms() {
         return platforms = nonNullCollection(platforms, Platform.class);
     }
 
@@ -267,7 +267,7 @@ public class DefaultAcquisitionInformati
      *
      * @param newValues The new platforms values.
      */
-    public synchronized void setPlatforms(final Collection<? extends Platform> newValues) {
+    public void setPlatforms(final Collection<? extends Platform> newValues) {
         platforms = writeCollection(newValues, platforms, Platform.class);
     }
 }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -120,7 +120,7 @@ public class DefaultEnvironmentalRecord 
      */
     @Override
     @XmlElement(name = "averageAirTemperature", required = true)
-    public synchronized Double getAverageAirTemperature() {
+    public Double getAverageAirTemperature() {
         return averageAirTemperature;
     }
 
@@ -129,7 +129,7 @@ public class DefaultEnvironmentalRecord 
      *
      * @param newValue The new average air temperature value.
      */
-    public synchronized void setAverageAirTemperature(final Double newValue) {
+    public void setAverageAirTemperature(final Double newValue) {
         checkWritePermission();
         averageAirTemperature = newValue;
     }
@@ -140,7 +140,7 @@ public class DefaultEnvironmentalRecord 
     @Override
     @ValueRange(minimum=0, maximum=100)
     @XmlElement(name = "maxRelativeHumidity", required = true)
-    public synchronized Double getMaxRelativeHumidity() {
+    public Double getMaxRelativeHumidity() {
         return maxRelativeHumidity;
     }
 
@@ -149,7 +149,7 @@ public class DefaultEnvironmentalRecord 
      *
      * @param newValue The new maximum relative humidity.
      */
-    public synchronized void setMaxRelativeHumidity(final Double newValue) {
+    public void setMaxRelativeHumidity(final Double newValue) {
         checkWritePermission();
         maxRelativeHumidity = newValue;
     }
@@ -159,7 +159,7 @@ public class DefaultEnvironmentalRecord 
      */
     @Override
     @XmlElement(name = "maxAltitude", required = true)
-    public synchronized Double getMaxAltitude() {
+    public Double getMaxAltitude() {
         return maxAltitude;
     }
 
@@ -168,7 +168,7 @@ public class DefaultEnvironmentalRecord 
      *
      * @param newValue The new maximum altitude value.
      */
-    public synchronized void setMaxAltitude(final Double newValue) {
+    public void setMaxAltitude(final Double newValue) {
         checkWritePermission();
         maxAltitude = newValue;
     }
@@ -179,7 +179,7 @@ public class DefaultEnvironmentalRecord 
      */
     @Override
     @XmlElement(name = "meteorologicalConditions", required = true)
-    public synchronized InternationalString getMeteorologicalConditions() {
+    public InternationalString getMeteorologicalConditions() {
         return meteorologicalConditions;
     }
 
@@ -189,7 +189,7 @@ public class DefaultEnvironmentalRecord 
      *
      * @param newValue The meteorological conditions value.
      */
-    public synchronized void setMeteorologicalConditions(final InternationalString newValue) {
+    public void setMeteorologicalConditions(final InternationalString newValue) {
         checkWritePermission();
         meteorologicalConditions = newValue;
     }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -164,7 +164,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The event identifier value.
      */
-    public synchronized void setIdentifier(final Identifier newValue) {
+    public void setIdentifier(final Identifier newValue) {
         checkWritePermission();
         identifiers = nonNullCollection(identifiers, Identifier.class);
         NonMarshalledAuthority.setMarshallable(identifiers, newValue);
@@ -175,7 +175,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "trigger", required = true)
-    public synchronized Trigger getTrigger() {
+    public Trigger getTrigger() {
         return trigger;
     }
 
@@ -184,7 +184,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The new trigger value.
      */
-    public synchronized void setTrigger(final Trigger newValue) {
+    public void setTrigger(final Trigger newValue) {
         checkWritePermission();
         trigger = newValue;
     }
@@ -194,7 +194,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "context", required = true)
-    public synchronized Context getContext() {
+    public Context getContext() {
         return context;
     }
 
@@ -203,7 +203,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The new context value.
      */
-    public synchronized void setContext(final Context newValue) {
+    public void setContext(final Context newValue) {
         checkWritePermission();
         context = newValue;
     }
@@ -213,7 +213,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "sequence", required = true)
-    public synchronized Sequence getSequence() {
+    public Sequence getSequence() {
         return sequence;
     }
 
@@ -222,7 +222,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The new sequence value.
      */
-    public synchronized void setSequence(final Sequence newValue) {
+    public void setSequence(final Sequence newValue) {
         checkWritePermission();
         sequence = newValue;
     }
@@ -232,7 +232,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "time", required = true)
-    public synchronized Date getTime() {
+    public Date getTime() {
         return toDate(time);
     }
 
@@ -241,7 +241,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The new time value.
      */
-    public synchronized void setTime(final Date newValue) {
+    public void setTime(final Date newValue) {
         checkWritePermission();
         time = toMilliseconds(newValue);
     }
@@ -251,7 +251,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "expectedObjective")
-    public synchronized Collection<Objective> getExpectedObjectives() {
+    public Collection<Objective> getExpectedObjectives() {
         return expectedObjectives = nonNullCollection(expectedObjectives, Objective.class);
     }
 
@@ -260,7 +260,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValues The new expected objectives values.
      */
-    public synchronized void setExpectedObjectives(final Collection<? extends Objective> newValues) {
+    public void setExpectedObjectives(final Collection<? extends Objective> newValues) {
         expectedObjectives = writeCollection(newValues, expectedObjectives, Objective.class);
     }
 
@@ -269,7 +269,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "relatedPass")
-    public synchronized PlatformPass getRelatedPass() {
+    public PlatformPass getRelatedPass() {
         return relatedPass;
     }
 
@@ -278,7 +278,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValue The new platform pass value.
      */
-    public synchronized void setRelatedPass(final PlatformPass newValue) {
+    public void setRelatedPass(final PlatformPass newValue) {
         relatedPass = newValue;
     }
 
@@ -287,7 +287,7 @@ public class DefaultEvent extends ISOMet
      */
     @Override
     @XmlElement(name = "relatedSensor")
-    public synchronized Collection<? extends Instrument> getRelatedSensors() {
+    public Collection<? extends Instrument> getRelatedSensors() {
         return relatedSensors = nonNullCollection(relatedSensors, Instrument.class);
     }
 
@@ -296,7 +296,7 @@ public class DefaultEvent extends ISOMet
      *
      * @param newValues The new instrument values.
      */
-    public synchronized void setRelatedSensors(final Collection<? extends Instrument> newValues) {
+    public void setRelatedSensors(final Collection<? extends Instrument> newValues) {
         relatedSensors = writeCollection(newValues, relatedSensors, Instrument.class);
     }
 }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -126,7 +126,7 @@ public class DefaultInstrument extends I
      */
     @Override
     @XmlElement(name = "citation")
-    public synchronized Collection<Citation> getCitations() {
+    public Collection<Citation> getCitations() {
         return citations = nonNullCollection(citations, Citation.class);
     }
 
@@ -135,7 +135,7 @@ public class DefaultInstrument extends I
      *
      * @param newValues The new citation values.
      */
-    public synchronized void setCitations(final Collection<? extends Citation> newValues) {
+    public void setCitations(final Collection<? extends Citation> newValues) {
         citations = writeCollection(newValues, citations, Citation.class);
     }
 
@@ -153,7 +153,7 @@ public class DefaultInstrument extends I
      *
      * @param newValue The new identifier value.
      */
-    public synchronized void setIdentifier(final Identifier newValue) {
+    public void setIdentifier(final Identifier newValue) {
         checkWritePermission();
         identifiers = nonNullCollection(identifiers, Identifier.class);
         NonMarshalledAuthority.setMarshallable(identifiers, newValue);
@@ -164,7 +164,7 @@ public class DefaultInstrument extends I
      */
     @Override
     @XmlElement(name = "type", required = true)
-    public synchronized InternationalString getType() {
+    public InternationalString getType() {
         return type;
     }
 
@@ -173,7 +173,7 @@ public class DefaultInstrument extends I
      *
      * @param newValue The new type value.
      */
-    public synchronized void setType(final InternationalString newValue) {
+    public void setType(final InternationalString newValue) {
         checkWritePermission();
         type = newValue;
     }
@@ -183,7 +183,7 @@ public class DefaultInstrument extends I
      */
     @Override
     @XmlElement(name = "description")
-    public synchronized InternationalString getDescription() {
+    public InternationalString getDescription() {
         return description;
     }
 
@@ -192,7 +192,7 @@ public class DefaultInstrument extends I
      *
      * @param newValue The new description value.
      */
-    public synchronized void setDescription(final InternationalString newValue) {
+    public void setDescription(final InternationalString newValue) {
         checkWritePermission();
         description = newValue;
     }
@@ -202,7 +202,7 @@ public class DefaultInstrument extends I
      */
     @Override
     @XmlElement(name = "mountedOn")
-    public synchronized Platform getMountedOn() {
+    public Platform getMountedOn() {
         return mountedOn;
     }
 
@@ -211,7 +211,7 @@ public class DefaultInstrument extends I
      *
      * @param newValue The new platform value.
      */
-    public synchronized void setMountedOn(final Platform newValue) {
+    public void setMountedOn(final Platform newValue) {
         checkWritePermission();
         mountedOn = newValue;
     }

Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1470197&r1=1470196&r2=1470197&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Sat Apr 20 17:16:11 2013
@@ -161,7 +161,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "identifier", required = true)
-    public synchronized Collection<Identifier> getIdentifiers() {
+    public Collection<Identifier> getIdentifiers() {
         identifiers = nonNullCollection(identifiers, Identifier.class);
         return NonMarshalledAuthority.excludeOnMarshalling(identifiers);
     }
@@ -176,7 +176,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new identifiers values.
      */
-    public synchronized void setIdentifiers(final Collection<? extends Identifier> newValues) {
+    public void setIdentifiers(final Collection<? extends Identifier> newValues) {
         final Collection<Identifier> oldIds = NonMarshalledAuthority.filteredCopy(identifiers);
         identifiers = writeCollection(newValues, identifiers, Identifier.class);
         NonMarshalledAuthority.replace(identifiers, oldIds);
@@ -187,7 +187,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "priority")
-    public synchronized InternationalString getPriority() {
+    public InternationalString getPriority() {
         return priority;
     }
 
@@ -196,7 +196,7 @@ public class DefaultObjective extends IS
      *
      * @param newValue The new priority value.
      */
-    public synchronized void setPriority(final InternationalString newValue) {
+    public void setPriority(final InternationalString newValue) {
         checkWritePermission();
         priority = newValue;
     }
@@ -206,7 +206,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "type")
-    public synchronized Collection<ObjectiveType> getTypes() {
+    public Collection<ObjectiveType> getTypes() {
         return types = nonNullCollection(types, ObjectiveType.class);
     }
 
@@ -215,7 +215,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new types values.
      */
-    public synchronized void setTypes(final Collection<? extends ObjectiveType> newValues) {
+    public void setTypes(final Collection<? extends ObjectiveType> newValues) {
         types = writeCollection(newValues, types, ObjectiveType.class);
     }
 
@@ -224,7 +224,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "function")
-    public synchronized Collection<InternationalString> getFunctions() {
+    public Collection<InternationalString> getFunctions() {
         return functions = nonNullCollection(functions, InternationalString.class);
     }
 
@@ -233,7 +233,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new functions values.
      */
-    public synchronized void setFunctions(final Collection<? extends InternationalString> newValues) {
+    public void setFunctions(final Collection<? extends InternationalString> newValues) {
         functions = writeCollection(newValues, functions, InternationalString.class);
     }
 
@@ -243,7 +243,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "extent")
-    public synchronized Collection<Extent> getExtents() {
+    public Collection<Extent> getExtents() {
         return extents = nonNullCollection(extents, Extent.class);
     }
 
@@ -253,7 +253,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new extents values.
      */
-    public synchronized void setExtents(final Collection<? extends Extent> newValues) {
+    public void setExtents(final Collection<? extends Extent> newValues) {
         extents = writeCollection(newValues, extents, Extent.class);
     }
 
@@ -262,7 +262,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "objectiveOccurence", required = true)
-    public synchronized Collection<Event> getObjectiveOccurences() {
+    public Collection<Event> getObjectiveOccurences() {
         return objectiveOccurences = nonNullCollection(objectiveOccurences, Event.class);
     }
 
@@ -271,7 +271,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new objective occurrences values.
      */
-    public synchronized void setObjectiveOccurences(final Collection<? extends Event> newValues) {
+    public void setObjectiveOccurences(final Collection<? extends Event> newValues) {
         objectiveOccurences = writeCollection(newValues, objectiveOccurences, Event.class);
     }
 
@@ -280,7 +280,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "pass")
-    public synchronized Collection<PlatformPass> getPass() {
+    public Collection<PlatformPass> getPass() {
         return pass = nonNullCollection(pass, PlatformPass.class);
     }
 
@@ -289,7 +289,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new pass values.
      */
-    public synchronized void setPass(final Collection<? extends PlatformPass> newValues) {
+    public void setPass(final Collection<? extends PlatformPass> newValues) {
         pass = writeCollection(newValues, pass, PlatformPass.class);
     }
 
@@ -298,7 +298,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "sensingInstrument")
-    public synchronized Collection<Instrument> getSensingInstruments() {
+    public Collection<Instrument> getSensingInstruments() {
         return sensingInstruments = nonNullCollection(sensingInstruments, Instrument.class);
     }
 
@@ -307,7 +307,7 @@ public class DefaultObjective extends IS
      *
      * @param newValues The new sensing instruments values.
      */
-    public synchronized void setSensingInstruments(final Collection<? extends Instrument> newValues) {
+    public void setSensingInstruments(final Collection<? extends Instrument> newValues) {
         sensingInstruments = writeCollection(newValues, sensingInstruments, Instrument.class);
     }
 }



Mime
View raw message