svn commit: r920895 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java

[mir]

Author: mir
Date: Tue Mar  9 14:36:14 2010
New Revision: 920895

URL: http://svn.apache.org/viewvc?rev=920895&view=rev
Log:
CLEREZZA-155: now catches the new exception

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java?rev=920895&r1=920894&r2=920895&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.menumanager/src/main/java/org/apache/clerezza/platform/menumanager/MenuManager.java
 Tue Mar  9 14:36:14 2010
@@ -34,6 +34,7 @@ import org.apache.clerezza.platform.cont
 import org.apache.clerezza.platform.content.hierarchy.HierarchyNode;
 import org.apache.clerezza.platform.content.hierarchy.HierarchyService;
 import 
org.apache.clerezza.platform.content.hierarchy.NodeDoesNotExistException;
+import org.apache.clerezza.platform.content.hierarchy.UnknownRootExcetpion;
 import org.apache.clerezza.rdf.ontologies.MENU;
 import org.apache.clerezza.rdf.ontologies.RDF;
 
@@ -75,6 +76,9 @@ public class MenuManager {
                        node = hierarchyService.getHierarchyNode(hierarchyNode);
                } catch (NodeDoesNotExistException ex) {
                        return getResourceNotExistingResponse(hierarchyNode);
+               } catch (UnknownRootExcetpion ex) {
+                       return Response.status(Response.Status.BAD_REQUEST)
+                                       
.entity(ex.toString()).type(MediaType.TEXT_PLAIN_TYPE).build();
                }
                markHierarchyNode(node);
                return Response.ok().build();
@@ -115,6 +119,9 @@ public class MenuManager {
                        node = hierarchyService.getHierarchyNode(hierarchyNode);
                } catch (NodeDoesNotExistException ex) {
                        return getResourceNotExistingResponse(hierarchyNode);
+               } catch (UnknownRootExcetpion ex) {
+                       return Response.status(Response.Status.BAD_REQUEST)
+                                       
.entity(ex.toString()).type(MediaType.TEXT_PLAIN_TYPE).build();
                }
                markHierarchyNodeInclusiveMembers(node);
                return Response.ok().build();
@@ -147,6 +154,9 @@ public class MenuManager {
                        node = hierarchyService.getHierarchyNode(hierarchyNode);
                } catch (NodeDoesNotExistException ex) {
                        return getResourceNotExistingResponse(hierarchyNode);
+               } catch (UnknownRootExcetpion ex) {
+                       return Response.status(Response.Status.BAD_REQUEST)
+                                       
.entity(ex.toString()).type(MediaType.TEXT_PLAIN_TYPE).build();
                }
                unmarkHierarchyNode(node);
                return Response.ok().build();
@@ -169,6 +179,9 @@ public class MenuManager {
                        node = hierarchyService.getHierarchyNode(hierarchyNode);
                } catch (NodeDoesNotExistException ex) {
                        return getResourceNotExistingResponse(hierarchyNode);
+               } catch (UnknownRootExcetpion ex) {
+                       return Response.status(Response.Status.BAD_REQUEST)
+                                       
.entity(ex.toString()).type(MediaType.TEXT_PLAIN_TYPE).build();
                }
                unmarkHierarchyNodeInclusiveMembers(node);
                return Response.ok().build();