- From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 02 Oct 2009 16:49:54 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv24644/src/org/w3c/unicorn/action
Modified Files:
IndexAction.java
Log Message:
commented out some code that should be useless now that there is no more servlet forwarding
Index: IndexAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/IndexAction.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- IndexAction.java 30 Sep 2009 09:32:00 -0000 1.23
+++ IndexAction.java 2 Oct 2009 16:49:52 -0000 1.24
@@ -8,7 +8,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +28,7 @@
//private static Log logger = LogFactory.getLog(IndexAction.class);
- private VelocityContext velocityContext;
+ //private VelocityContext velocityContext;
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -50,22 +49,22 @@
String lang;
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);
velocityContext.put("current_task", Framework.mapOfTask.get(task));
@@ -94,7 +93,7 @@
}
}
- if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
+ /*if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
Map<?, ?> reqParams = (Map<?, ?>) req.getAttribute("unicorn_parameters");
for (Object objKey : reqParams.keySet()) {
@@ -117,7 +116,7 @@
velocityContext.put(ref, reqParams.get(key));
}
}
- }
+ }*/
PrintWriter writer = resp.getWriter();
if (req.getHeader("X-Requested-With") != null && req.getHeader("X-Requested-With").equals("XMLHttpRequest")) {
Received on Friday, 2 October 2009 16:49:55 UTC