You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/07/23 23:27:40 UTC

svn commit: r424826 - in /lenya/trunk/src: java/org/apache/lenya/cms/metadata/MetaData.java modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java

Author: andreas
Date: Sun Jul 23 14:27:39 2006
New Revision: 424826

URL: http://svn.apache.org/viewvc?rev=424826&view=rev
Log:
Don't allow multiple values for non-multiple meta data elements

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java
    lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java?rev=424826&r1=424825&r2=424826&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java Sun Jul 23 14:27:39 2006
@@ -59,7 +59,7 @@
      * Addds a value for a certain key. The existing values will not be removed.
      * @param key The key.
      * @param value The value to add.
-     * @throws MetaDataException when something went wrong.
+     * @throws MetaDataException if there's already a value set and the element doesn't support multiple values.
      */
     void addValue(String key, String value) throws MetaDataException;
 

Modified: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java?rev=424826&r1=424825&r2=424826&view=diff
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java Sun Jul 23 14:27:39 2006
@@ -104,6 +104,10 @@
 
     public void addValue(String key, String value) throws MetaDataException {
         checkKey(key);
+        if (!getElementSet().getElement(key).isMultiple() && getValues(key).length > 0) {
+            throw new MetaDataException("The element [" + key
+                    + "] doesn't support multiple values!");
+        }
         this.node.addValue(this.namespaceUri, key, value);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org