[Yanel-commits] rev 40305 - public/yanel/trunk/src/resources/odt/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2008-12-08 15:46:10 +0100 (Mon, 08 Dec 2008)
New Revision: 40305

Modified:
   public/yanel/trunk/src/resources/odt/src/java/org/wyona/yanel/impl/resources/ODTResource.java
Log:
obsolete imports removed and formatting

Modified: public/yanel/trunk/src/resources/odt/src/java/org/wyona/yanel/impl/resources/ODTResource.java
===================================================================
--- public/yanel/trunk/src/resources/odt/src/java/org/wyona/yanel/impl/resources/ODTResource.java	2008-12-08 14:45:34 UTC (rev 40304)
+++ public/yanel/trunk/src/resources/odt/src/java/org/wyona/yanel/impl/resources/ODTResource.java	2008-12-08 14:46:10 UTC (rev 40305)
@@ -23,15 +23,12 @@
 import org.wyona.yanel.core.api.attributes.ViewableV2;
 import org.wyona.yanel.core.attributes.viewable.View;
 import org.wyona.yanel.core.attributes.viewable.ViewDescriptor;
-import org.wyona.yanel.core.util.PathUtil;
 
 import org.wyona.yarep.core.Node;
 import org.wyona.yarep.core.Repository;
 import org.wyona.yarep.core.RepositoryFactory;
 import org.wyona.yarep.util.RepoPath;
 
-import javax.servlet.http.HttpServletRequest;
-
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
@@ -89,7 +86,7 @@
                 log.debug("XSLT file: " + xsltFile);
                 Transformer transformer = TransformerFactory.newInstance()
                         .newTransformer(new StreamSource(xsltFile));
-                transformer.setParameter("yanel.path.name", PathUtil.getName(getPath()));
+                transformer.setParameter("yanel.path.name", org.wyona.commons.io.PathUtil.getName(getPath()));
                 // TODO: Is this the best way to generate an InputStream from an OutputStream?
                 java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
                 transformer.transform(new StreamSource(getContentXML(dataRepo)), new StreamResult(baos));
@@ -137,7 +134,7 @@
 
         }
 
-        String suffix = PathUtil.getSuffix(getPath());
+        String suffix = org.wyona.commons.io.PathUtil.getSuffix(getPath());
         if (suffix != null) {
             log.debug("SUFFIX: " + suffix);
             if (suffix.equals("html")) {