From 18d1cec4dd7856c64bad5d9a3592c27b3a67079e Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Mon, 19 Oct 2020 02:36:43 +0200
Subject: [PATCH] Set blue unknown path checked.

---
 .../statoolinfos/checker/PropertyChecker.java | 112 +++++++++---------
 .../statoolinfos/htmlize/categories.xhtml     |   2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java b/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java
index 87d6f9b..03f1972 100644
--- a/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java
+++ b/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java
@@ -53,77 +53,77 @@ public class PropertyChecker
         this.federationRules = new PropertyRules();
 
         this.federationRules.add("file.class", "^[Ff]ederation$", PropertyMode.MANDATORY);
-        this.federationRules.add("file.generator", this.STRING, PropertyMode.WISHED);
-        this.federationRules.add("file.datetime", this.DATETIME, PropertyMode.WISHED);
-        this.federationRules.add("file.protocol", this.STRING, PropertyMode.WISHED);
+        this.federationRules.add("file.generator", STRING, PropertyMode.WISHED);
+        this.federationRules.add("file.datetime", DATETIME, PropertyMode.WISHED);
+        this.federationRules.add("file.protocol", STRING, PropertyMode.WISHED);
 
-        this.federationRules.add("federation.name", this.STRING, PropertyMode.MANDATORY);
-        this.federationRules.add("federation.description", this.STRING, PropertyMode.WISHED);
-        this.federationRules.add("federation.website", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.logo", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.favicon", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.contact.url", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.contact.email", this.EMAIL, PropertyMode.WISHED);
-        this.federationRules.add("federation.legal.url", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.legal", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.guide.user", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.guide.technical", this.URL, PropertyMode.WISHED);
-        this.federationRules.add("federation.startdate", this.DATE, PropertyMode.WISHED);
-        this.federationRules.add("federation.enddate", this.DATE, PropertyMode.OPTIONAL);
+        this.federationRules.add("federation.name", STRING, PropertyMode.MANDATORY);
+        this.federationRules.add("federation.description", STRING, PropertyMode.WISHED);
+        this.federationRules.add("federation.website", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.logo", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.favicon", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.contact.url", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.contact.email", EMAIL, PropertyMode.WISHED);
+        this.federationRules.add("federation.legal.url", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.legal", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.guide.user", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.guide.technical", URL, PropertyMode.WISHED);
+        this.federationRules.add("federation.startdate", DATE, PropertyMode.WISHED);
+        this.federationRules.add("federation.enddate", DATE, PropertyMode.OPTIONAL);
 
         //
         this.organizationRules = new PropertyRules();
 
         this.organizationRules.add("file.class", "^[Oo]rganization$", PropertyMode.MANDATORY);
-        this.organizationRules.add("file.generator", this.STRING, PropertyMode.WISHED);
-        this.organizationRules.add("file.datetime", this.DATETIME, PropertyMode.WISHED);
-        this.organizationRules.add("file.protocol", this.STRING, PropertyMode.WISHED);
+        this.organizationRules.add("file.generator", STRING, PropertyMode.WISHED);
+        this.organizationRules.add("file.datetime", DATETIME, PropertyMode.WISHED);
+        this.organizationRules.add("file.protocol", STRING, PropertyMode.WISHED);
 
-        this.organizationRules.add("organization.name", this.STRING, PropertyMode.MANDATORY);
-        this.organizationRules.add("organization.description", this.STRING, PropertyMode.WISHED);
-        this.organizationRules.add("organization.website", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.logo", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.owner.name", this.STRING, PropertyMode.OPTIONAL);
-        this.organizationRules.add("organization.owner.website", this.URL, PropertyMode.OPTIONAL);
-        this.organizationRules.add("organization.owner.logo", this.URL, PropertyMode.OPTIONAL);
-        this.organizationRules.add("organization.contact.url", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.contact.email", this.EMAIL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.legal", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.legal.url", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.technical", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.technical.url", this.URL, PropertyMode.WISHED);
-        this.organizationRules.add("organization.startdate", this.DATE, PropertyMode.WISHED);
-        this.organizationRules.add("organization.enddate", this.DATE, PropertyMode.OPTIONAL);
+        this.organizationRules.add("organization.name", STRING, PropertyMode.MANDATORY);
+        this.organizationRules.add("organization.description", STRING, PropertyMode.WISHED);
+        this.organizationRules.add("organization.website", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.logo", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.owner.name", STRING, PropertyMode.OPTIONAL);
+        this.organizationRules.add("organization.owner.website", URL, PropertyMode.OPTIONAL);
+        this.organizationRules.add("organization.owner.logo", URL, PropertyMode.OPTIONAL);
+        this.organizationRules.add("organization.contact.url", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.contact.email", EMAIL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.legal", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.legal.url", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.technical", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.technical.url", URL, PropertyMode.WISHED);
+        this.organizationRules.add("organization.startdate", DATE, PropertyMode.WISHED);
+        this.organizationRules.add("organization.enddate", DATE, PropertyMode.OPTIONAL);
 
         //
         this.serviceRules = new PropertyRules();
 
         this.serviceRules.add("file.class", "^[Ss]ervice$", PropertyMode.MANDATORY);
-        this.serviceRules.add("file.generator", this.STRING, PropertyMode.WISHED);
-        this.serviceRules.add("file.datetime", this.DATETIME, PropertyMode.WISHED);
-        this.serviceRules.add("file.protocol", this.STRING, PropertyMode.WISHED);
+        this.serviceRules.add("file.generator", STRING, PropertyMode.WISHED);
+        this.serviceRules.add("file.datetime", DATETIME, PropertyMode.WISHED);
+        this.serviceRules.add("file.protocol", STRING, PropertyMode.WISHED);
 
-        this.serviceRules.add("service.name", this.STRING, PropertyMode.MANDATORY);
-        this.serviceRules.add("service.description", this.STRING, PropertyMode.WISHED);
-        this.serviceRules.add("service.website", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.logo", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.contact.url", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.contact.email", this.EMAIL, PropertyMode.WISHED);
-        this.serviceRules.add("service.legal.url", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.guide.user", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.guide.technical", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("service.startdate", this.DATE, PropertyMode.WISHED);
-        this.serviceRules.add("service.enddate", this.DATE, PropertyMode.OPTIONAL);
+        this.serviceRules.add("service.name", STRING, PropertyMode.MANDATORY);
+        this.serviceRules.add("service.description", STRING, PropertyMode.WISHED);
+        this.serviceRules.add("service.website", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.logo", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.contact.url", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.contact.email", EMAIL, PropertyMode.WISHED);
+        this.serviceRules.add("service.legal.url", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.guide.user", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.guide.technical", URL, PropertyMode.WISHED);
+        this.serviceRules.add("service.startdate", DATE, PropertyMode.WISHED);
+        this.serviceRules.add("service.enddate", DATE, PropertyMode.OPTIONAL);
         this.serviceRules.add("service.status.level", "^(OK|WARNING|ALERT|ERROR|OVER|VOID)$", PropertyMode.MANDATORY);
-        this.serviceRules.add("service.status.description", this.STRING, PropertyMode.OPTIONAL);
+        this.serviceRules.add("service.status.description", STRING, PropertyMode.OPTIONAL);
         this.serviceRules.add("service.registration", "^(None|Free|Member|Client)([,;+](None|Free|Member|Client))?$", PropertyMode.MANDATORY);
 
-        this.serviceRules.add("software.name", this.STRING, PropertyMode.MANDATORY);
-        this.serviceRules.add("software.website", this.URL, PropertyMode.WISHED);
-        this.serviceRules.add("software.license.url", this.URL, PropertyMode.MANDATORY);
-        this.serviceRules.add("software.license.name", this.STRING, PropertyMode.MANDATORY);
-        this.serviceRules.add("software.version", this.STRING, PropertyMode.WISHED);
-        this.serviceRules.add("software.source.url", this.URL, PropertyMode.WISHED);
+        this.serviceRules.add("software.name", STRING, PropertyMode.MANDATORY);
+        this.serviceRules.add("software.website", URL, PropertyMode.WISHED);
+        this.serviceRules.add("software.license.url", URL, PropertyMode.MANDATORY);
+        this.serviceRules.add("software.license.name", STRING, PropertyMode.MANDATORY);
+        this.serviceRules.add("software.version", STRING, PropertyMode.WISHED);
+        this.serviceRules.add("software.source.url", URL, PropertyMode.WISHED);
     }
 
     /**
@@ -186,7 +186,7 @@ public class PropertyChecker
                     else
                     {
 
-                        check.setStatus(Status.ALERT);
+                        check.setStatus(Status.VOID);
                         check.setComment("Propriété inconnue");
                     }
                 }
diff --git a/src/fr/devinsy/statoolinfos/htmlize/categories.xhtml b/src/fr/devinsy/statoolinfos/htmlize/categories.xhtml
index dab523c..63c3683 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/categories.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/categories.xhtml
@@ -32,7 +32,7 @@
 					<td id="categoryListLineName" style="padding-top: 0; padding-bottom: 0;">
 						<a href="#" id="categoryListLineNameLink">
 							<img id="categoryListLineNameLogo" src="categories/default.png" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
-							&#160;<span id="categoryListLineNameValue">n/a</span>
+							<span id="categoryListLineNameValue">n/a</span>
 						</a>
 					</td>
 					<td id="categoryListLineSoftwares">n/a</td>