[Yanel-commits] rev 40403 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation

[michi at wyona.com]

Author: michi
Date: 2008-12-09 16:33:00 +0100 (Tue, 09 Dec 2008)
New Revision: 40403

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/SitetreeDOMImpl.java
Log:
obsolete import ane else and log statements fixed

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/SitetreeDOMImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/SitetreeDOMImpl.java	2008-12-09 15:32:10 UTC (rev 40402)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/SitetreeDOMImpl.java	2008-12-09 15:33:00 UTC (rev 40403)
@@ -16,7 +16,6 @@
 
 package org.wyona.yanel.impl.navigation;
 
-import org.wyona.yanel.core.Path;
 import org.wyona.yanel.core.map.Realm;
 import org.wyona.yanel.core.map.RealmConfigPathResolver;
 import org.wyona.yanel.core.navigation.Node;
@@ -53,8 +52,9 @@
         NodeList nl = configDoc.getDocumentElement().getElementsByTagName("src");
         if (nl.getLength() == 1) {
             src = nl.item(0).getFirstChild().getNodeValue();
-            if(log.isDebugEnabled()) log.debug("src: " + src + ", " + nl.item(0).getNodeName());
-            log.error("DEBUG: src: " + src + ", " + nl.item(0).getNodeName());
+            if(log.isDebugEnabled()) {
+                log.debug("src: " + src + ", " + nl.item(0).getNodeName());
+            }
             try {
                 javax.xml.transform.Source source = resolver.resolve(src, null);
                 javax.xml.parsers.DocumentBuilderFactory dbf= javax.xml.parsers.DocumentBuilderFactory.newInstance();
@@ -89,10 +89,9 @@
                 Element element = getElement(sitetreeDoc.getDocumentElement(), path);
                 if (element != null) {
                     return new NodeDOMImpl(element, this);
-                } else {
-                    log.error("No node for path: " + path);
-                    return null;
                 }
+                log.error("No node for path: " + path);
+                return null;
             } else {
                 log.error("Path is not valid: " + path);
                 return null;
@@ -158,13 +157,11 @@
                    return getElement(child, subtreePath);
                }
                return child;
-           } else {
-               log.error("No such node: " + path);
-               return null;
            }
-       } else {
-           return sitetreeDoc.getDocumentElement();
+        log.error("No such node: " + path);
+           return null;
        }
+    return sitetreeDoc.getDocumentElement();
     }
 
     /**