W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2009

2006/unicorn/src/org/w3c/unicorn/action ObserveAction.java,1.36,1.37

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 21 Sep 2009 14:38:08 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1Mpk1o-0006LP-JO@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv24367/src/org/w3c/unicorn/action

Modified Files:
	ObserveAction.java 
Log Message:
extracted redirect method

Index: ObserveAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/ObserveAction.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ObserveAction.java	21 Sep 2009 12:43:32 -0000	1.36
+++ ObserveAction.java	21 Sep 2009 14:38:06 -0000	1.37
@@ -104,6 +104,7 @@
 		mapOfStringObject.put("queryString", queryString);
 		// messages is the ArrayList containing the messages to display
 		mapOfStringObject.put("messages", messages);
+		mapOfStringObject.put("unicorncall", aUnicornCall);
 		
 		// Retrieve the parameters from the request
 		Map<String, Object> reqParams;
@@ -208,18 +209,18 @@
 			return;
 		}
 		
+		resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=" + mapOfOutputParameter.get("charset"));
+		
 		String s = "Resolved parameters:";
 		for (String key : reqParams.keySet()) {
 			s += "\n\t" + key + " - ";
 			if (reqParams.get(key) instanceof String[]) {
 				s += "[";
-				for (int i = 0; i < ((String[]) reqParams.get(key)).length; i ++) {
+				for (int i = 0; i < ((String[]) reqParams.get(key)).length; i ++)
 					s += ((String[]) reqParams.get(key))[i] + ", ";
-				}
 				s = s.substring(0, s.length() - 2);
 				s += "]";
-			}
-			else {
+			} else {
 				s += reqParams.get(key);
 			}
 		}
@@ -229,13 +230,11 @@
 		try {
 			aUnicornCall.doTask();
 			messages.addAll(aUnicornCall.getMessages());
-			
 			if (aUnicornCall.getResponses().size() == 0) {
 				Message mess = new Message(Message.Level.ERROR, "aucune observation", null);
 				createError(req, resp, reqParams, mess, mapOfSpecificParameter, mapOfOutputParameter);
 			}
-			
-			createOutput(req, resp, mapOfStringObject, aUnicornCall, mapOfSpecificParameter, mapOfOutputParameter);
+			createOutput(req, resp, mapOfStringObject, mapOfSpecificParameter, mapOfOutputParameter);
 		} catch (final UnicornException ucnException) {
 			Message mess;
 			if (ucnException.getUnicornMessage() != null)
@@ -328,40 +327,38 @@
 		
 		// If text/html is the mime-type the error will be displayed directly on index
 		if (mapOfOutputParameter.get("mimetype").equals("text/html")) {
-			req.setAttribute("unicorn_message", mess);
-			if (reqParams != null)
-				req.setAttribute("unicorn_parameters", reqParams);
-			RequestDispatcher dispatcher = req.getRequestDispatcher("index.html");
-			dispatcher.forward(req, resp);
-			logger.info("request redirected to index");
+			redirect(req, resp, reqParams, mess);
 			return;
 		}
 		
-		resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=" + mapOfOutputParameter.get("charset"));
-		OutputFormater aOutputFormater = OutputFactory
-			.createOutputFormater(mapOfOutputParameter.get("format"),
-								  mapOfOutputParameter.get("lang"),
-								  mapOfOutputParameter.get("mimetype"));
+		OutputFormater aOutputFormater = OutputFactory.createOutputFormater(
+				mapOfOutputParameter.get("format"),
+				mapOfOutputParameter.get("lang"), 
+				mapOfOutputParameter.get("mimetype"));
 		OutputModule aOutputModule = OutputFactory.createOutputModule(mapOfOutputParameter.get("output"));
 		aOutputModule.produceError(aOutputFormater, mess, mapOfSpecificParameter, resp.getWriter());
 	}
-
+	
 	private void createOutput(HttpServletRequest req, HttpServletResponse resp,
-			Map<String, Object> mapOfStringObject, UnicornCall aUnicornCall,
-			Map<String, String> mapOfSpecificParameter, Map<String, String> mapOfOutputParameter) throws IOException {
-		
-		resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=" + mapOfOutputParameter.get("charset"));
-
-		mapOfStringObject.put("unicorncall", aUnicornCall);
+			Map<String, Object> mapOfStringObject, Map<String, String> mapOfSpecificParameter,
+			Map<String, String> mapOfOutputParameter) throws IOException, ServletException {
 		
-		OutputFormater aOutputFormater = OutputFactory
-				.createOutputFormater(mapOfOutputParameter.get("format"),
-									  mapOfOutputParameter.get("lang"),
-									  mapOfOutputParameter.get("mimetype"));
-		OutputModule aOutputModule = OutputFactory
-				.createOutputModule(mapOfOutputParameter.get("output"));
+		OutputFormater aOutputFormater = OutputFactory.createOutputFormater(
+				mapOfOutputParameter.get("format"),
+				mapOfOutputParameter.get("lang"), 
+				mapOfOutputParameter.get("mimetype"));
+		OutputModule aOutputModule = OutputFactory.createOutputModule(mapOfOutputParameter.get("output"));
 		aOutputModule.produceOutput(aOutputFormater, mapOfStringObject, mapOfSpecificParameter, resp.getWriter());
 	}
+	
+	private void redirect(HttpServletRequest req, HttpServletResponse resp, Map<String, Object> reqParams, Message mess) throws IOException, ServletException {
+		req.setAttribute("unicorn_message", mess);
+		if (reqParams != null)
+			req.setAttribute("unicorn_parameters", reqParams);
+		RequestDispatcher dispatcher = req.getRequestDispatcher("index.html");
+		dispatcher.forward(req, resp);
+		logger.info("request redirected to index");
+	}
 
 	/**
 	 * Converts an Enumeration object to a string, the terms being separated by
Received on Monday, 21 September 2009 14:38:17 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:14 GMT