sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1469409 - in /sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata: InformationMap.java MetadataMap.java PropertyMap.java ValueMap.java
Date Thu, 18 Apr 2013 16:23:01 GMT
Author: desruisseaux
Date: Thu Apr 18 16:23:01 2013
New Revision: 1469409

URL: http://svn.apache.org/r1469409
Log:
Renamed MetadataMap as PropertyMap.

Added:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
      - copied, changed from r1469405, sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataMap.java
Removed:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataMap.java
Modified:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java?rev=1469409&r1=1469408&r2=1469409&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
(original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
Thu Apr 18 16:23:01 2013
@@ -34,7 +34,7 @@ import org.opengis.metadata.ExtendedElem
  * @see PropertyInformation
  * @see MetadataStandard#asInformationMap(Class, KeyNamePolicy)
  */
-final class InformationMap extends MetadataMap<ExtendedElementInformation> {
+final class InformationMap extends PropertyMap<ExtendedElementInformation> {
     /**
      * Creates an information map for the specified accessor.
      *

Copied: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
(from r1469405, sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataMap.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?p2=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java&p1=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataMap.java&r1=1469405&r2=1469409&rev=1469409&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataMap.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
[UTF-8] Thu Apr 18 16:23:01 2013
@@ -24,7 +24,10 @@ import java.util.Iterator;
 
 
 /**
- * The base class of {@link Map} views.
+ * The base class of {@link Map} views of metadata properties.
+ * The map keys are fixed to the {@link String} type and will be the property names.
+ * The map values depend on the actual {@code PropertyMap} subclasses; they may be
+ * property values, property classes or property information.
  *
  * @param <V> The type of values in the map.
  *
@@ -32,8 +35,13 @@ import java.util.Iterator;
  * @since   0.3 (derived from geotk-3.04)
  * @version 0.3
  * @module
+ *
+ * @see ValueMap
+ * @see NameMap
+ * @see TypeMap
+ * @see InformationMap
  */
-abstract class MetadataMap<V> extends AbstractMap<String,V> {
+abstract class PropertyMap<V> extends AbstractMap<String,V> {
     /**
      * The accessor to use for the metadata.
      */
@@ -52,7 +60,7 @@ abstract class MetadataMap<V> extends Ab
     /**
      * Creates a new map backed by the given accessor.
      */
-    MetadataMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy) {
+    PropertyMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy) {
         this.accessor  = accessor;
         this.keyPolicy = keyPolicy;
     }
@@ -136,7 +144,7 @@ abstract class MetadataMap<V> extends Ab
          */
         @Override
         public final boolean isEmpty() {
-            return MetadataMap.this.isEmpty();
+            return PropertyMap.this.isEmpty();
         }
 
         /**
@@ -144,7 +152,7 @@ abstract class MetadataMap<V> extends Ab
          */
         @Override
         public final int size() {
-            return MetadataMap.this.size();
+            return PropertyMap.this.size();
         }
 
         /**
@@ -152,7 +160,7 @@ abstract class MetadataMap<V> extends Ab
          */
         @Override
         public final Iterator<Map.Entry<String,V>> iterator() {
-            return MetadataMap.this.iterator();
+            return PropertyMap.this.iterator();
         }
     }
 }

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java?rev=1469409&r1=1469408&r2=1469409&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8]
(original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8]
Thu Apr 18 16:23:01 2013
@@ -37,7 +37,7 @@ import java.util.Objects;
  *
  * @see MetadataStandard#asValueMap(Object, KeyNamePolicy, ValueExistencePolicy)
  */
-final class ValueMap extends MetadataMap<Object> {
+final class ValueMap extends PropertyMap<Object> {
     /**
      * The metadata object to wrap.
      */
@@ -279,7 +279,7 @@ final class ValueMap extends MetadataMap
      * @version 0.3
      * @module
      */
-    private final class Iter extends MetadataMap<Object>.Iter {
+    private final class Iter extends PropertyMap<Object>.Iter {
         /**
          * The current and the next property, or {@code null} if the iteration is over.
          */
@@ -376,7 +376,7 @@ final class ValueMap extends MetadataMap
      * @version 0.3
      * @module
      */
-    private final class Entries extends MetadataMap<Object>.Entries {
+    private final class Entries extends PropertyMap<Object>.Entries {
         /**
          * Creates an entry set.
          */



Mime
View raw message