Changeset 315:a34209857dcc

Timestamp:

09/09/09 10:15:30 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

added function isPassed that returns true is all the response are passed, false otherwise
+ observationList is generated only on first call of getObservationList()

Files:

• src/org/w3c/unicorn/UnicornCall.java (modified) (4 diffs)

src/org/w3c/unicorn/UnicornCall.java

@@ -1 @@
-// $Id: UnicornCall.java,v 1.10 2009-09-08 14:24:22 tgambet Exp $
+// $Id: UnicornCall.java,v 1.11 2009-09-09 10:15:30 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -82 +82 @@
 
         private Map<String, String[]> mapOfStringParameter = null;
+        
+        private LinkedHashMap<String, Response> observationMap;
 
         /**
@@ -260 +262 @@
         public boolean getBPassed() {
                 return this.bPassed;
+        }
+        
+        public boolean isPassed() {
+                boolean passed = true;
+                for (String key : this.getObservationList().keySet()) {
+                        if (!observationMap.get(key).isPassed()) {
+                                passed = false;
+                        }
+                }
+                return passed;
         }
 
@@ -589 +601 @@
         public LinkedHashMap<String, Response> getObservationList() {
                 
-                LinkedHashMap<String, Response> observationMap = new LinkedHashMap<String, Response>();
-                
-                for (Group group : aTask.getOutput().getGroupList()) {
-                        if (!group.isSetType()) {
-                                for (String observerId : group.getObservationList()) {
-                                        if(mapOfResponse.get(observerId) != null) {
-                                                observationMap.put(observerId, mapOfResponse.get(observerId));
+                if (observationMap == null) {
+                        observationMap = new LinkedHashMap<String, Response>();
+                        
+                        for (Group group : aTask.getOutput().getGroupList()) {
+                                if (!group.isSetType()) {
+                                        for (String observerId : group.getObservationList()) {
+                                                if(mapOfResponse.get(observerId) != null) {
+                                                        observationMap.put(observerId, mapOfResponse.get(observerId));
+                                                }
+                                        }
+                                } else {
+                                        switch (group.getType()) {
+                                                case FIRSTPASSED:
+                                                        String passedId = null;
+                                                        for (String observerId : group.getObservationList()) {
+                                                                if (mapOfResponse.get(observerId) == null) {
+                                                                        logger.error("unknown observer id (" + observerId + ") in output group of task: " + this.getTask().getID());
+                                                                        continue;
+                                                                }
+                                                                if (mapOfResponse.get(observerId).isPassed()) {
+                                                                        passedId = observerId;
+                                                                        break;
+                                                                }
+                                                        }
+                                                        if (passedId == null) {
+                                                                Response resp = mapOfResponse.get(group.getObservationList().get(0));
+                                                                if (resp != null)
+                                                                        observationMap.put(group.getObservationList().get(0), resp);
+                                                        }
+                                                        else 
+                                                                observationMap.put(passedId, mapOfResponse.get(passedId));
                                         }
                                 }
-                        } else {
-                                switch (group.getType()) {
-                                        case FIRSTPASSED:
-                                                String passedId = null;
-                                                for (String observerId : group.getObservationList()) {
-                                                        if (mapOfResponse.get(observerId) == null) {
-                                                                logger.error("unknown observer id (" + observerId + ") in output group of task: " + this.getTask().getID());
-                                                                continue;
-                                                        }
-                                                        if (mapOfResponse.get(observerId).isPassed()) {
-                                                                passedId = observerId;
-                                                                break;
-                                                        }
-                                                }
-                                                if (passedId == null) {
-                                                        Response resp = mapOfResponse.get(group.getObservationList().get(0));
-                                                        if (resp != null)
-                                                                observationMap.put(group.getObservationList().get(0), resp);
-                                                }
-                                                else 
-                                                        observationMap.put(passedId, mapOfResponse.get(passedId));
-                                }
-                        }
-                }
+                        }
+                }
+                
                 return observationMap;
         }