[Yanel-commits] rev 23505 - in public/yanel/trunk/src/core/java/org/wyona/yanel: core servlet

[michi at wyona.com]

Author: michi
Date: 2007-03-29 16:42:11 +0200 (Thu, 29 Mar 2007)
New Revision: 23505

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
exception handling re resource registration fixed and new language menu item added

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java	2007-03-29 13:57:07 UTC (rev 23504)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java	2007-03-29 14:42:11 UTC (rev 23505)
@@ -170,7 +170,10 @@
     /**
      *
      */
-    public ResourceTypeDefinition getResourceTypeDefinition(String universalName) {
+    public ResourceTypeDefinition getResourceTypeDefinition(String universalName) throws Exception {
+        if (!hm.containsKey(universalName)) {
+            throw new Exception("Unknown resource type: " + universalName);
+        }
         return (ResourceTypeDefinition) hm.get(universalName);
     }
 
@@ -184,7 +187,7 @@
         int i = 0;
         while (keysIterator.hasNext()) {
             String universalName = (String) keysIterator.next();
-            rtds[i] = getResourceTypeDefinition(universalName);
+            rtds[i] = (ResourceTypeDefinition)hm.get(universalName);
             i++;
         }
         return rtds;

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-29 13:57:07 UTC (rev 23504)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-29 14:42:11 UTC (rev 23505)
@@ -807,7 +807,7 @@
     /**
      *
      */
-    private Resource getResource(HttpServletRequest request, HttpServletResponse response) {
+    private Resource getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         try {
             Realm realm = map.getRealm(request.getServletPath());
             String path = map.getPath(realm, request.getServletPath());
@@ -817,8 +817,10 @@
             
             return res;
         } catch(Exception e) {
-            log.error(e.getMessage(), e);
-            return null;
+            String errorMsg = "Could not get resource for request: " + request.getServletPath() + 
+                    ": " + e.getMessage();
+            log.error(errorMsg, e);
+            throw new ServletException(errorMsg, e);
         }
     }
 
@@ -1794,6 +1796,7 @@
 
         sb.append("<div id=\"menutitle\">File</div><ul>");
         sb.append("<li><a href=\"" + backToRealm + "create-new-page.html\">New</a></li>");
+        sb.append("<li>New language&#160;&#160;><ul><li>German</li><li>Mandarin</li></ul></li>");
         sb.append("</ul></li></ul>");
 
         sb.append("<ul><li>");