Changeset 1065:582a22afbc5e

Timestamp:

05/14/10 16:05:53 (3 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

updated to allow the status element to be at the bottom of a response file (see observationresponse2.xsd 1.10)

Files:

• src/org/w3c/unicorn/response/impl/DefaultResponseXBeans.java (modified) (3 diffs)

src/org/w3c/unicorn/response/impl/DefaultResponseXBeans.java

@@ -1 @@
-// $Id: DefaultResponseXBeans.java,v 1.14 2009-10-23 13:50:18 tgambet Exp $
+// $Id: DefaultResponseXBeans.java,v 1.15 2010-05-14 16:05:53 tgambet Exp $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -21 +21 @@
 import org.w3.x2009.x10.unicorn.observationresponse.MessageType;
 import org.w3.x2009.x10.unicorn.observationresponse.ObservationresponseDocument;
+import org.w3.x2009.x10.unicorn.observationresponse.StatusType;
 import org.w3.x2009.x10.unicorn.observationresponse.ObservationresponseDocument.Observationresponse;
 import org.w3c.unicorn.Framework;
@@ -133 +134 @@
 
         public int getStatus() {
-                if (or.isSetStatus() && or.getStatus().getValue().equalsIgnoreCase("passed")) {
-                        return PASSED;
-                } else if ((or.isSetStatus() && or.getStatus().getValue().equalsIgnoreCase("failed")) ||
-                                  (!or.isSetStatus() && getErrorCount() > 0)) {
-                        return FAILED;
-                } else { 
-                        return UNDEF;
+                if (or.getStatusList().size() == 0) {
+                        if (getErrorCount() > 0) {
+                                return FAILED;
+                        } else {
+                                return UNDEF;
+                        }
+                } else {
+                        // Status element can be added at the top or the end of a document. If there are two status element, only the last one is used.
+                        StatusType status = or.getStatusList().get(or.getStatusList().size() - 1);
+                        if (status.isSetValue() && status.getValue().equalsIgnoreCase("passed")) {
+                                return PASSED;
+                        } else if (status.isSetValue() && status.getValue().equalsIgnoreCase("failed")) {
+                                return FAILED;
+                        } else {
+                                return UNDEF;
+                        }
                 }
         }
         
         public Integer getRating() {
-                if(or.isSetStatus() && or.getStatus().isSetRating())
-                        return or.getStatus().getRating();
+                if (or.getStatusList().size() != 0) {
+                        StatusType status = or.getStatusList().get(or.getStatusList().size() - 1);
+                        if (status.isSetRating())
+                                return status.getRating();
+                }
                 return null;
         }