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/24 11:44:59 UTC
svn commit: r424983 - in /lenya/trunk/src:
impl/test/org/apache/lenya/cms/metadata/ java/org/apache/lenya/cms/metadata/
modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/
modules/repository/java/src/org/apache/lenya/cms/repo/adapter...
Author: andreas
Date: Mon Jul 24 02:44:55 2006
New Revision: 424983
URL: http://svn.apache.org/viewvc?rev=424983&view=rev
Log:
Removed method MetaData.getAvailableKey2Value(). The semantics of this method is not clear (what about multiple values), and it is not appropriate for an interface.
Modified:
lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
lenya/trunk/src/java/org/apache/lenya/cms/metadata/MetaData.java
lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
lenya/trunk/src/modules/repository/java/src/org/apache/lenya/cms/repo/adapter/RepoMetaData.java
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java?rev=424983&r1=424982&r2=424983&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java Mon Jul 24 02:44:55 2006
@@ -72,6 +72,7 @@
e = e1;
}
assertNotNull(e);
+
}
}
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=424983&r1=424982&r2=424983&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 Mon Jul 24 02:44:55 2006
@@ -16,8 +16,6 @@
*/
package org.apache.lenya.cms.metadata;
-import java.util.HashMap;
-
/**
* Generic meta data interface.
*
@@ -76,11 +74,6 @@
String[] getPossibleKeys();
/**
- * @return All keys and values that exist in the metadata doc.
- */
- HashMap getAvailableKey2Value();
-
- /**
* Checks if a key represents a valid metadata attribute.
* @param key The key.
* @return A boolean value.
@@ -98,5 +91,12 @@
* @return The element set this meta data object belongs to.
*/
ElementSet getElementSet();
+
+ /**
+ * Removes all values for a certain key.
+ * @param key The key.
+ * @throws MetaDataException if the key is not supported.
+ */
+ void removeAllValues(String key) throws MetaDataException;
}
Modified: lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java?rev=424983&r1=424982&r2=424983&view=diff
==============================================================================
--- lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java (original)
+++ lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java Mon Jul 24 02:44:55 2006
@@ -228,12 +228,14 @@
}
public String[] getAvailableKeys() {
- // FIXME: Not implemented yet.
- return null;
+ throw new RuntimeException("not implemented");
}
public ElementSet getElementSet() {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("not implemented");
+ }
+
+ public void removeAllValues(String key) throws MetaDataException {
+ throw new RuntimeException("not implemented");
}
}
Modified: lenya/trunk/src/modules/repository/java/src/org/apache/lenya/cms/repo/adapter/RepoMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/repository/java/src/org/apache/lenya/cms/repo/adapter/RepoMetaData.java?rev=424983&r1=424982&r2=424983&view=diff
==============================================================================
--- lenya/trunk/src/modules/repository/java/src/org/apache/lenya/cms/repo/adapter/RepoMetaData.java (original)
+++ lenya/trunk/src/modules/repository/java/src/org/apache/lenya/cms/repo/adapter/RepoMetaData.java Mon Jul 24 02:44:55 2006
@@ -117,8 +117,11 @@
}
public ElementSet getElementSet() {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("not implemented");
+ }
+
+ public void removeAllValues(String key) throws MetaDataException {
+ throw new RuntimeException("not implemented");
}
}
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=424983&r1=424982&r2=424983&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 Mon Jul 24 02:44:55 2006
@@ -17,7 +17,6 @@
package org.apache.lenya.cms.repository;
import java.util.Arrays;
-import java.util.HashMap;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceManager;
@@ -127,25 +126,6 @@
return getAvailableKeys();
}
- public HashMap getAvailableKey2Value() {
- HashMap map = new HashMap();
- try {
- Element[] elements = getElementSet().getElements();
- for (int i = 0; i < elements.length; i++) {
- String key = elements[i].getName();
- String[] values = getValues(key);
- if (values.length == 1) {
- map.put(key, values[0]);
- } else if (values.length > 1) {
- map.put(key, Arrays.asList(values));
- }
- }
- } catch (MetaDataException e) {
- throw new RuntimeException(e);
- }
- return map;
- }
-
public boolean isValidAttribute(String key) {
return Arrays.asList(getAvailableKeys()).contains(key);
}
@@ -158,11 +138,6 @@
}
}
- /**
- * Removes all values for a certain key.
- * @param key The key.
- * @throws MetaDataException if an error occurs.
- */
public void removeAllValues(String key) throws MetaDataException {
checkKey(key);
this.node.removeAllValues(this.namespaceUri, key);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org