Refactored BreadcrumbTrail in metrics pages.

src/fr/devinsy/statoolinfos/htmlize/BreadcrumbTrail.java

@@ -52,6 +52,29 @@ public class BreadcrumbTrail extends ArrayList<Breadcrumb>
         add(label, link);
     }
 
+    /**
+     * Adds the.
+     *
+     * @param label
+     *            the label
+     * @param link
+     *            the link
+     * @return the breadcrumb trail
+     */
+    public BreadcrumbTrail add(final String label)
+    {
+        BreadcrumbTrail result;
+
+        Breadcrumb crumb = new Breadcrumb(label, null);
+
+        add(crumb);
+
+        result = this;
+
+        //
+        return result;
+    }
+
     /**
      * Adds the.
      *
@@ -87,8 +110,15 @@ public class BreadcrumbTrail extends ArrayList<Breadcrumb>
         StringList buffer = new StringList();
 
         for (Breadcrumb crumb : this)
+        {
+            if (crumb.getLink() == null)
+            {
+                buffer.append(XidynUtils.escapeXmlBlank(crumb.getLabel()));
+            }
+            else
             {
                 buffer.append(String.format("<a href=\"%s\" style=\"text-decoration: none; padding: 5px;\">%s</a>", crumb.getLink(), XidynUtils.escapeXmlBlank(crumb.getLabel())));
+            }
             buffer.append(" > ");
         }
         if (buffer.size() > 2)

src/fr/devinsy/statoolinfos/htmlize/FederationMetricGenericPage.java

@@ -61,8 +61,6 @@ public class FederationMetricGenericPage
      */
     public static void build(final File htmlizeDirectory, final Federation federation, final ViewMenu view, final PeriodMenu period) throws StatoolInfosException, IOException
     {
-        String result;
-
         try
         {
             TagDataManager data = new TagDataManager();
@@ -80,6 +78,7 @@ public class FederationMetricGenericPage
 
             //
             BreadcrumbTrail trail = new BreadcrumbTrail();
+            trail.add("Metrics génériques");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-generic-%s-%s.xhtml", federation.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/FederationMetricSpecificPage.java

@@ -52,8 +52,6 @@ public class FederationMetricSpecificPage
      */
     public static void build(final File htmlizeDirectory, final Federation federation, final ViewMenu view, final PeriodMenu period) throws StatoolInfosException, IOException
     {
-        String result;
-
         try
         {
             TagDataManager data = new TagDataManager();
@@ -66,6 +64,7 @@ public class FederationMetricSpecificPage
 
             //
             BreadcrumbTrail trail = new BreadcrumbTrail();
+            trail.add("Metrics spécifiques");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-specific-%s-%s.xhtml", federation.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/FederationMetricSummaryPage.java

@@ -76,7 +76,7 @@ public class FederationMetricSummaryPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricSummaryView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-
+            trail.add("Metrics résumé");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-summary-%s-%s.xhtml", federation.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/FederationMetricWebPage.java

@@ -119,6 +119,7 @@ public class FederationMetricWebPage
 
             //
             BreadcrumbTrail trail = new BreadcrumbTrail();
+            trail.add("Metrics web");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-web-%s-%s.xhtml", federation.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricGenericPage.java

@@ -78,8 +78,8 @@ public class OrganizationMetricGenericPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricSummaryView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(organization.getName(), organization.getTechnicalName() + ".xhtml");
+            trail.add(organization.getName(), organization.getLocalFileBaseName() + ".xhtml");
-            trail.add(organization.getName(), organization.getTechnicalName() + "-" + organization.getTechnicalName() + ".xhtml");
+            trail.add("Metrics génériques");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-generic-%s-%s.xhtml", organization.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricSpecificPage.java

@@ -67,8 +67,8 @@ public class OrganizationMetricSpecificPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricSummaryView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(organization.getName(), organization.getTechnicalName() + ".xhtml");
+            trail.add(organization.getName(), organization.getLocalFileBaseName() + ".xhtml");
-            trail.add(organization.getName(), organization.getTechnicalName() + "-" + organization.getTechnicalName() + ".xhtml");
+            trail.add("Metrics spécifiques");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-specific-%s-%s.xhtml", organization.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricSummaryPage.java

@@ -78,7 +78,8 @@ public class OrganizationMetricSummaryPage
 
             //
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(organization.getName(), organization.getTechnicalName() + ".xhtml");
+            trail.add(organization.getName(), organization.getLocalFileBaseName() + ".xhtml");
+            trail.add("Metrics résumé");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-summary-%s-%s.xhtml", organization.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricWebPage.java

@@ -125,8 +125,8 @@ public class OrganizationMetricWebPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricWebView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(organization.getName(), organization.getTechnicalName() + ".xhtml");
+            trail.add(organization.getName(), organization.getLocalFileBaseName() + ".xhtml");
-            trail.add(organization.getName(), organization.getTechnicalName() + "-" + organization.getTechnicalName() + ".xhtml");
+            trail.add("Metrics web");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-web-%s-%s.xhtml", organization.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/ServiceMetricGenericPage.java

@@ -78,8 +78,9 @@ public class ServiceMetricGenericPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricGenericView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(service.getOrganization().getName(), service.getOrganization().getTechnicalName() + ".xhtml");
+            trail.add(service.getOrganization().getName(), service.getOrganization().getLocalFileBaseName() + ".xhtml");
-            trail.add(service.getName(), service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
+            trail.add(service.getName(), service.getLocalFileBaseName() + ".xhtml");
+            trail.add("Metrics génériques");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-generic-%s-%s.xhtml", service.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSpecificPage.java

@@ -80,8 +80,10 @@ public class ServiceMetricSpecificPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricSpecificView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(service.getOrganization().getName(), service.getOrganization().getTechnicalName() + ".xhtml");
+            trail.add(service.getOrganization().getName(), service.getOrganization().getLocalFileBaseName() + ".xhtml");
-            trail.add(service.getName(), service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
+            trail.add(service.getName(), service.getLocalFileBaseName() + ".xhtml");
+            trail.add("Metrics spécifiques");
+
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-specific-%s-%s.xhtml", service.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSummaryPage.java

@@ -77,8 +77,9 @@ public class ServiceMetricSummaryPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricSummaryView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(service.getOrganization().getName(), service.getOrganization().getTechnicalName() + ".xhtml");
+            trail.add(service.getOrganization().getName(), service.getOrganization().getLocalFileBaseName() + ".xhtml");
-            trail.add(service.getName(), service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
+            trail.add(service.getName(), service.getLocalFileBaseName() + ".xhtml");
+            trail.add("Metrics résumé");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-summary-%s-%s.xhtml", service.getLocalFileBaseName(), view.getName(), period.getName());

src/fr/devinsy/statoolinfos/htmlize/ServiceMetricWebPage.java

@@ -125,8 +125,9 @@ public class ServiceMetricWebPage
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/serviceMetricWebView.xhtml", data).toString();
 
             BreadcrumbTrail trail = new BreadcrumbTrail();
-            trail.add(service.getOrganization().getName(), service.getOrganization().getTechnicalName() + ".xhtml");
+            trail.add(service.getOrganization().getName(), service.getOrganization().getLocalFileBaseName() + ".xhtml");
-            trail.add(service.getName(), service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
+            trail.add(service.getName(), service.getLocalFileBaseName() + ".xhtml");
+            trail.add("Metrics web");
             String page = WebCharterView.build(content, trail);
 
             String filename = String.format("%s-metrics-web-%s-%s.xhtml", service.getLocalFileBaseName(), view.getName(), period.getName());