[Yanel-commits] rev 40380 - public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2008-12-09 16:16:40 +0100 (Tue, 09 Dec 2008)
New Revision: 40380

Modified:
   public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
Log:
not used variable commented

Modified: public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java	2008-12-09 15:15:58 UTC (rev 40379)
+++ public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java	2008-12-09 15:16:40 UTC (rev 40380)
@@ -54,14 +54,10 @@
 import org.wyona.yanel.core.attributes.viewable.ViewDescriptor;
 import org.wyona.yanel.core.serialization.SerializerFactory;
 import org.wyona.yanel.core.source.ResourceResolver;
-import org.wyona.yanel.core.transformation.I18nTransformer;
 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.core.RepositoryException;
 import org.wyona.yarep.core.Repository;
-import org.wyona.yarep.util.RepoPath;
 
 import org.wyona.security.core.api.Identity;
 
@@ -132,7 +128,7 @@
                 File xsltFile = org.wyona.commons.io.FileUtil.file(getRTD().getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "wiki2xhtml.xsl");
                 log.debug("XSLT file: " + xsltFile);
                 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()));
                 transformer.setParameter("yanel.path", getPath());
                 transformer.setParameter("yanel.last.modified", new java.util.Date(getLastModified()));
                 defaultView.setMimeType("application/xhtml+xml");
@@ -164,7 +160,7 @@
                 SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
                 xsltHandler = tf.newTransformerHandler(new StreamSource(dataRepo.getInputStream(new org.wyona.yarep.core.Path(getXSLTPath().toString()))));
                 transformer = xsltHandler.getTransformer();
-                transformer.setParameter("yanel.path.name", PathUtil.getName(getPath()));
+                transformer.setParameter("yanel.path.name", org.wyona.commons.io.PathUtil.getName(getPath()));
                 transformer.setParameter("yanel.path", getPath());
                 transformer.setParameter("yanel.back2context", PathUtil.backToContext(realm, getPath()));
                 transformer.setParameter("yarep.back2realm", PathUtil.backToRealm(getPath()));
@@ -220,13 +216,13 @@
      *
      */
     public View getView(HttpServletRequest request, String viewId) {
-        String _language = getRealm().getDefaultLanguage();
-        try {
-            _language = request.getParameter("yanel.meta.language");
-        } catch(Exception e) {
-            //use fallback language
-            _language = getRealm().getDefaultLanguage();
-        }
+//        String _language = getRealm().getDefaultLanguage();
+//        try {
+//            _language = request.getParameter("yanel.meta.language");
+//        } catch(Exception e) {
+//            //use fallback language
+//            _language = getRealm().getDefaultLanguage();
+//        }
         //if(_language == null || ("").equals(_language)) _language = language;
         //else language = _language;
         return getView(new Path(request.getServletPath()), viewId);