[Yanel-commits] rev 40389 - public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2008-12-09 16:24:41 +0100 (Tue, 09 Dec 2008)
New Revision: 40389

Modified:
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
Log:
obsolete imports and else statements removed

Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2008-12-09 15:24:05 UTC (rev 40388)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2008-12-09 15:24:41 UTC (rev 40389)
@@ -26,11 +26,8 @@
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.apache.xml.serializer.Serializer;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
 import java.util.Enumeration;
 
 import javax.servlet.http.HttpServletRequest;
@@ -117,7 +114,7 @@
                 TransformerHandler[] xsltHandlers = new TransformerHandler[xsltPath.length];
                 for (int i = 0; i < xsltPath.length; i++) {
                     xsltHandlers[i] = tf.newTransformerHandler(new StreamSource(repo.getNode(xsltPath[i]).getInputStream()));
-                    xsltHandlers[i].getTransformer().setParameter("yanel.path.name", PathUtil.getName(getPath()));
+                    xsltHandlers[i].getTransformer().setParameter("yanel.path.name", org.wyona.commons.io.PathUtil.getName(getPath()));
                     xsltHandlers[i].getTransformer().setParameter("yanel.path", getPath());
                     xsltHandlers[i].getTransformer().setParameter("yanel.back2context", PathUtil.backToContext(realm, getPath()));
                     xsltHandlers[i].getTransformer().setParameter("yarep.back2realm", PathUtil.backToRealm(getPath()));
@@ -154,11 +151,10 @@
                 // write result into view:
                 view.setInputStream(new ByteArrayInputStream(baos.toByteArray()));
                 return view;
-            } else {
-                log.debug("Mime-Type: " + mimeType);
-                view.setInputStream(new java.io.StringBufferInputStream(getScreen()));
-                return view;
             }
+            log.debug("Mime-Type: " + mimeType);
+            view.setInputStream(new java.io.StringBufferInputStream(getScreen()));
+            return view;
         } catch(Exception e) {
             log.error(e + " (" + getPath() + ", " + getRealm() + ")", e);
         }
@@ -510,10 +506,10 @@
      */
     private void addToSitetree(Resource newResource) throws Exception {
         org.wyona.yanel.core.navigation.Sitetree sitetree = getRealm().getRepoNavigation();
-        String parentPath = PathUtil.getParent(newResource.getPath());
+        String parentPath = org.wyona.commons.io.PathUtil.getParent(newResource.getPath());
         org.wyona.yanel.core.navigation.Node parentNode = sitetree.getNode(getRealm(), parentPath);
         if (parentNode != null) {
-            String nodeName = PathUtil.getName(newResource.getPath());
+            String nodeName = org.wyona.commons.io.PathUtil.getName(newResource.getPath());
             String label = nodeName;
             parentNode.appendChild(sitetree.createNode(nodeName, label));
         } else {
@@ -639,10 +635,9 @@
                     // TODO: It seems like document does not contain text nodes ...
                     if (log.isDebugEnabled()) log.debug("Display name: " + displayNameElement + " :: " + displayNameElement.getText() + " :: " + displayNameElement.getName());
                     return displayNameElement.getText();
-                } else {
-                    log.warn("No display name: " + resName);
-                    return resName;
                 }
+                log.warn("No display name: " + resName);
+                return resName;
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
                 return resName;