Changeset 631:5d962827712b

Timestamp:

10/02/09 16:49:52 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@632

Message:

commented out some code that should be useless now that there is no more servlet forwarding

Files:

• src/org/w3c/unicorn/action/IndexAction.java (modified) (6 diffs)

src/org/w3c/unicorn/action/IndexAction.java

@@ -1 @@
-// $Id: IndexAction.java,v 1.23 2009-09-30 09:32:00 tgambet Exp $
+// $Id: IndexAction.java,v 1.24 2009-10-02 16:49:52 tgambet Exp $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -9 +9 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -30 +29 @@
         //private static Log logger = LogFactory.getLog(IndexAction.class);
         
-        private VelocityContext velocityContext;
+        //private VelocityContext velocityContext;
         
         @Override
@@ -51 +50 @@
                 String task;
                 String queryString = "./" + getQueryStringWithout(paramPrefix + "lang", req);
-                if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
+                /*if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
                         Map<?, ?> reqParams = (Map<?, ?>) req.getAttribute("unicorn_parameters");
                         lang = getLanguage((String) reqParams.get(paramPrefix + "lang"), req, messages);
                         task = getTask((String) reqParams.get(paramPrefix + "task"), null);
-                } else {
+                } else {*/
                         lang = getLanguage((String) req.getParameter(paramPrefix + "lang"), req, messages);
                         task = getTask((String) req.getParameter(paramPrefix + "task"), null);
-                }
+                //}
                 
-                if (req.getAttribute("unicorn_messages") != null) {
+                /*if (req.getAttribute("unicorn_messages") != null) {
                         ArrayList<?> ucnMessages = (ArrayList<?>) req.getAttribute("unicorn_messages");
                         for (Object mess : ucnMessages)
                                 messages.add((Message) mess);
-                }
+                }*/
                 
-                velocityContext = new VelocityContext(Language.getContext(lang));
+                VelocityContext velocityContext = new VelocityContext(Language.getContext(lang));
                 velocityContext.put("queryString", queryString);
                 velocityContext.put("messages", messages);
@@ -95 +94 @@
                 }
                 
-                if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
+                /*if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
                         Map<?, ?> reqParams = (Map<?, ?>) req.getAttribute("unicorn_parameters");
                         
@@ -118 +117 @@
                                 }
                         }
-                }
+                }*/
                 
                 PrintWriter writer = resp.getWriter();