1.1 --- a/trunk/apps/rifle-web/src/main/java/org/fundacionctic/rifle/jsf/ValidatorBean.java Thu Nov 12 09:46:23 2009 +0100
1.2 +++ b/trunk/apps/rifle-web/src/main/java/org/fundacionctic/rifle/jsf/ValidatorBean.java Thu Nov 12 10:04:16 2009 +0100
1.3 @@ -223,19 +223,22 @@
1.4
1.5 public String getProfileString(){
1.6 String temp="";
1.7 - if(validation!=null){
1.8 - if(validation.getProfile()!=null && !validation.isOnlySyntax()) {
1.9 - temp+="<h3>Profile: <span>"+validation.getProfile()+"</span></h3>";
1.10 - }
1.11 - if (!validation.isOnlySyntax() && validation.getErrors()!=null && validation.getErrors().size()==0) {
1.12 - temp+="<h3>RIF Document is: <span class='admissible'>admissible</span>.</h3>";
1.13 - }
1.14 - else{
1.15 - if(validation.isOnlySyntax() && validation.getErrors()!=null && validation.getErrors().size()==0){
1.16 + if(validation!=null){//Syntax
1.17 + if(validation.isOnlySyntax()){
1.18 + if(validation.getErrors()!=null && validation.getErrors().size()==0){
1.19 temp+="<h3>RIF Document is: <span class='valid'>XML valid and well-formed</span>.</h3>";
1.20 }else{
1.21 temp+="<h3>RIF Document is not: <span class='notvalid'>XML valid and well-formed</span>.</h3>";
1.22 }
1.23 + }else{//Semantic
1.24 + if(validation.getProfile()!=null) {
1.25 + temp+="<h3>Profile: <span>"+validation.getProfile()+"</span></h3>";
1.26 + }
1.27 + if (validation.getErrors()!=null && validation.getErrors().size()==0) {
1.28 + temp+="<h3>RIF Document is: <span class='admissible'>admissible</span>.</h3>";
1.29 + }else{
1.30 + temp+="<h3>RIF Document is not: <span class='not valid'>admissible</span>.</h3>";
1.31 + }
1.32 }
1.33 }
1.34 return temp;