You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/02/11 11:34:58 UTC
svn commit: r908913 -
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java
Author: ito
Date: Thu Feb 11 10:34:57 2010
New Revision: 908913
URL: http://svn.apache.org/viewvc?rev=908913&view=rev
Log:
CLEREZZA-116: Added additional createCollectionNode and createNonCollectioNode methods to HierarchyService
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java?rev=908913&r1=908912&r2=908913&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java Thu Feb 11 10:34:57 2010
@@ -18,9 +18,7 @@
*/
package org.apache.clerezza.platform.content.hierarchy;
-import java.io.UnsupportedEncodingException;
import java.net.URI;
-import java.net.URLEncoder;
import java.util.Iterator;
import java.util.List;
import javax.ws.rs.FormParam;
@@ -86,7 +84,7 @@
@FormParam(value = "parentCollectionUri") UriRef parentCollectionUri,
@FormParam(value = "pos") Integer pos,
@FormParam(value = "name") String name) {
- UriRef resourceUri = createNonCollectionUri(parentCollectionUri, name);
+ UriRef resourceUri = hierarchyService.createNonCollectionUri(parentCollectionUri, name);
try {
HierarchyNode node;
if (pos == null) {
@@ -125,7 +123,7 @@
@FormParam(value = "parentCollectionUri") UriRef parentCollectionUri,
@FormParam(value = "pos") Integer pos,
@FormParam(value = "name") String name) {
- UriRef collectionUri = createCollectionUri(parentCollectionUri, name);
+ UriRef collectionUri = hierarchyService.createCollectionUri(parentCollectionUri, name);
try {
CollectionNode node;
if (pos == null) {
@@ -294,24 +292,4 @@
}
return count;
}
-
- /**
- * Creates a uri that ends with a slash ('/').
- * @param parrentCollectionUri the URI of the parent collection
- * @param name the name of the collection
- * @return
- */
- private UriRef createCollectionUri(UriRef parrentCollectionUri, String name) {
- return new UriRef(
- createNonCollectionUri(parrentCollectionUri, name).getUnicodeString() + "/");
- }
-
- private UriRef createNonCollectionUri(UriRef parentCollectionUri, String name) {
- try {
- return new UriRef(parentCollectionUri.getUnicodeString() +
- URLEncoder.encode(name, "UTF-8"));
- } catch (UnsupportedEncodingException ex) {
- throw new RuntimeException(ex);
- }
- }
}