[Yanel-commits] rev 40300 - public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2008-12-08 15:42:27 +0100 (Mon, 08 Dec 2008)
New Revision: 40300

Modified:
   public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java
Log:
obsolete imports and else statements removed

Modified: public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java
===================================================================
--- public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java	2008-12-08 14:37:11 UTC (rev 40299)
+++ public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java	2008-12-08 14:42:27 UTC (rev 40300)
@@ -19,17 +19,12 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
 import java.util.Enumeration;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
@@ -38,8 +33,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.w3c.dom.Document;
 
 import org.apache.commons.io.FileUtils;
@@ -54,22 +47,15 @@
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.apache.xml.serializer.Serializer;
 
-import org.wyona.yanel.core.Path;
 import org.wyona.yanel.core.Resource;
-import org.wyona.yanel.core.ResourceConfiguration;
 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.yarep.core.NoSuchNodeException;
-import org.wyona.yarep.core.Repository;
-import org.wyona.yarep.core.RepositoryFactory;
 import org.wyona.yanel.core.serialization.SerializerFactory;
 import org.wyona.yanel.core.source.ResourceResolver;
 import org.wyona.yanel.core.transformation.I18nTransformer2;
 import org.wyona.yanel.core.transformation.XIncludeTransformer;
 import org.wyona.yanel.core.util.PathUtil;
-import org.wyona.yarep.util.RepoPath;
-import org.wyona.yarep.util.YarepUtil;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -154,8 +140,7 @@
                 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()));
@@ -197,11 +182,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);
         }
@@ -228,20 +212,16 @@
         StringBuffer sbContent = new StringBuffer();
         Enumeration parameters = request.getParameterNames();
         if (request.getSession().getAttribute("tmpResultDir") != null) {
-            if (request.getParameterValues("ajaxshowprogress") != null) {
+            if (request.getParameterValues("ajaxshowprogress") != null)
                 return showProgress().toString();
-            } else {
-                sbContent.append(showProgress());
-            }
+            sbContent.append(showProgress());
         } else if (!parameters.hasMoreElements()) {
             sbContent.append(getPlainRequest());
         } else {
             if (request.getParameterValues("testnames") != null) {
-                if (request.getParameterValues("ajaxexecutetest") != null) {
+                if (request.getParameterValues("ajaxexecutetest") != null)
                     return executeTests().toString();
-                }else {
-                    sbContent.append(executeTests());
-                }
+                sbContent.append(executeTests());
             } else {
                 log.info("Fallback ...");
                 sbContent.append(getPlainRequest());