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

2006/unicorn/src/org/w3c/unicorn UnicornCall.java,1.19,1.20

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 21 Sep 2009 12:21:58 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1Mphu2-0008S1-P5@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn
In directory hutz:/tmp/cvs-serv32469/src/org/w3c/unicorn

Modified Files:
	UnicornCall.java 
Log Message:
refactored checkCond(TLTCond) function
+ added an ArrayList of Messages
+ allowed messages to be added by a RequestThread object

Index: UnicornCall.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/UnicornCall.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- UnicornCall.java	21 Sep 2009 09:38:22 -0000	1.19
+++ UnicornCall.java	21 Sep 2009 12:21:56 -0000	1.20
@@ -11,16 +11,9 @@
 import java.util.Map;
 
 import javax.activation.MimeType;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
 import org.w3c.unicorn.contract.CallParameter;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.contract.InputMethod;
@@ -35,7 +28,6 @@
 import org.w3c.unicorn.tasklist.parameters.Mapping;
 import org.w3c.unicorn.tasklist.parameters.Parameter;
 import org.w3c.unicorn.tasklist.parameters.Value;
-import org.w3c.unicorn.tasklisttree.EnumCondType;
 import org.w3c.unicorn.tasklisttree.TLTCond;
 import org.w3c.unicorn.tasklisttree.TLTExec;
 import org.w3c.unicorn.tasklisttree.TLTIf;
@@ -43,8 +35,6 @@
 import org.w3c.unicorn.util.Message;
 import org.w3c.unicorn.util.Property;
 
-import com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl;
-
 /**
  * UnicornCall Created: Jun 29, 2006 2:44:12 PM
  * 
@@ -74,6 +64,8 @@
 	private Map<String, Response> mapOfResponse;
 	
 	private LinkedHashMap<String, Response> observationMap;
+	
+	private ArrayList<Message> messages;
 
 	/**
 	 * Creates a new UnicornCall.
@@ -82,6 +74,7 @@
 		logger.trace("Constructor()");
 		mapOfStringParameter = new LinkedHashMap<String, String[]>();
 		mapOfResponse = new LinkedHashMap<String, Response>();
+		messages = new ArrayList<Message>();
 	}
 
 	/**
@@ -147,79 +140,13 @@
 		
 		boolean conditionOK = false;
 		for (TLTCond cond : ifs.getCondArray()) {
-			if (checkCond(cond)) {
+			if (cond.check(this)) {
 				conditionOK = true;
 			}
 		}
 		return conditionOK;
 	}
 	
-	/**
-	 * Giving a TLTCond, checks in the map of response if the condition passes
-	 * or fails and consequently returns a boolean.
-	 * 
-	 * @param cond
-	 *            The condition to check
-	 * @return true if there is a matching response and if the condition passes
-	 *         else false
-	 */
-	private boolean checkCond(TLTCond cond) throws Exception {
-		logger.trace("checkCond : ");
-		logger.trace(cond);
-		logger.trace("condId : " + cond.getId());
-		logger.trace("condType : " + cond.getType());
-		logger.trace("condValue : " + cond.getValue());
-
-		boolean passed = false;
-
-		if (cond.getType().equals(EnumCondType.MIMETYPE)) {
-			passed = cond.getValue().equals(inputParameter.getMimeType().toString());
-		} else if (cond.getType().equals(EnumCondType.XPATH)) {
-			logger.trace("condObserver : " + cond.getObserver().getID());
-			Response res = mapOfResponse.get(cond.getObserver().getID());
-			// Testing if there is a matching response in the map
-			// and if it is passed
-			if (res != null) {
-				String xmlStr = res.getXml().toString();
-
-				DocumentBuilderFactory xmlFact = DocumentBuilderFactory
-						.newInstance();
-
-				// namespace awareness is escaped since we don't use it
-				// for the moment
-				xmlFact.setNamespaceAware(false);
-
-				DocumentBuilder builder = xmlFact.newDocumentBuilder();
-
-				Document doc = builder.parse(new java.io.ByteArrayInputStream(
-						xmlStr.getBytes("UTF-8")));
-
-				String xpathStr = cond.getValue();
-
-				XPathFactory xpathFact = new XPathFactoryImpl();
-
-				XPath xpath = xpathFact.newXPath();
-				XPathExpression xpe = xpath.compile(xpathStr);
-				passed = (Boolean) xpe.evaluate(doc, XPathConstants.BOOLEAN);
-			}
-		} else if (cond.getType().equals(EnumCondType.PARAMETER)) {
-			passed = false;
-			if (!mapOfStringParameter.containsKey(cond.getParameter())) {
-				cond.setResult(passed);
-				return passed;
-			}
-			
-			String[] parameterValues = mapOfStringParameter.get(cond.getParameter());
-			for (int i=0; i<parameterValues.length; i++)
-				if (parameterValues[i].equals(cond.getValue()))
-					passed = true;
-			
-		}
-
-		cond.setResult(passed);
-		logger.trace("cond result : " + passed);
-		return passed;
-	}
 	
 	/**
 	 * Generate the list of the request for the call
@@ -429,7 +356,7 @@
 	 * @throws IOException
 	 *             Input/Output error
 	 */
-	private void doRequests(RequestList requestList) throws IOException {
+	private void doRequests(RequestList requestList) {
 		logger.trace("doRequests");
 
 		final Map<String, Request> requests = requestList.getRequestMap();
@@ -438,20 +365,20 @@
 
 		for (final String obsID : requests.keySet()) {
 			// send request to observer
-			//threadsList.add(new RequestThread(mapOfResponse, requests.get(obsID), obsID, this));
 			threadsList.add(new RequestThread(requests.get(obsID), obsID, this.getLang()));
 			logger.debug("Request " + requests.get(obsID) + " added to threadsList");
 		}
-		for (int i = 0; i < threadsList.size(); i++) {
-			threadsList.get(i).start();
-			logger.debug("Request " + ((RequestThread)threadsList.get(i)).getObsID() + " started");
+		for (RequestThread thread : threadsList) {
+			thread.start();
+			logger.debug("Request " + thread.getObsID() + " started");
 		}
-
-		for (int i = 0; i < threadsList.size(); i++) {
+		for (RequestThread thread : threadsList) {
 			try {
-				threadsList.get(i).join();
-				mapOfResponse.put(threadsList.get(i).getObsID(), threadsList.get(i).getResponse());
-				logger.debug("Request " + ((RequestThread)threadsList.get(i)).getObsID() + " terminated");
+				thread.join();
+				messages.addAll(thread.getMessages());
+				if (thread.getResponse() != null)
+					mapOfResponse.put(thread.getObsID(), thread.getResponse());
+				logger.debug("Request " + thread.getObsID() + " terminated");
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
@@ -576,6 +503,10 @@
 		return mapOfStringParameter;
 	}
 	
+	public InputParameter getInputParameter() {
+		return inputParameter;
+	}
+
 	/**
 	 * Set the task to perform
 	 * 
@@ -618,4 +549,12 @@
 	public void setInputParameter(final InputParameter inputParameter) {
 		this.inputParameter = inputParameter;
 	}
+
+	public ArrayList<Message> getMessages() {
+		return messages;
+	}
+
+	public void setMessages(ArrayList<Message> messages) {
+		this.messages = messages;
+	}
 }
\ No newline at end of file
Received on Monday, 21 September 2009 12:22:07 GMT

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