commit 3c9ae9f71947da1f3269fb60622167b91359a447
author Ed Merks <ed.merks@gmail.com> Wed Jun 10 08:14:06 2020 +0200
committer Ed Merks <ed.merks@gmail.com> Wed Jun 10 08:14:06 2020 +0200
tree 80dc7936a02aaf6435162cedfc6e65672cf43e6f
parent 955a98d1c14b9f33dc53698716d58250b50c1200

Bug 562908 - Populate the JustJ Git clones with initial content

Add a link to the browser in the site index bread crumbs.

plugins/org.eclipse.justj.p2/src/org/eclipse/justj/p2/UpdateSiteIndexGenerator.java

diff --git a/plugins/org.eclipse.justj.p2/src/org/eclipse/justj/p2/UpdateSiteIndexGenerator.java b/plugins/org.eclipse.justj.p2/src/org/eclipse/justj/p2/UpdateSiteIndexGenerator.java
index b5f9eb6..6bf2e98 100644
--- a/plugins/org.eclipse.justj.p2/src/org/eclipse/justj/p2/UpdateSiteIndexGenerator.java
+++ b/plugins/org.eclipse.justj.p2/src/org/eclipse/justj/p2/UpdateSiteIndexGenerator.java
@@ -413,6 +413,8 @@
     Path root = updateSiteGenerator.getUpdateSiteRoot();
     Path projectRoot = updateSiteGenerator.getProjectRoot();
 
+    Map<String, String> breadcumbs = new LinkedHashMap<String, String>(updateSiteGenerator.getBreadcrumbs());
+
     // Compute the labels in the right order continuing only as far as the project root.
     List<String> labels = new ArrayList<String>();
     for (Path file = folder; file.getParent() != null; file = file.getParent())
@@ -423,7 +425,13 @@
       }
 
       String name = file.getFileName().toString();
-      labels.add(0, Character.toUpperCase(name.charAt(0)) + name.substring(1));
+      String titleName = Character.toUpperCase(name.charAt(0)) + name.substring(1);
+      while (breadcumbs.containsKey(titleName) || labels.contains(titleName))
+      {
+        // Make the label unique with zero-width whitespace.
+        titleName += "&#8203;";
+      }
+      labels.add(0, titleName);
     }
 
     // Compute the up-links in the reverse order.
@@ -445,6 +453,10 @@
           links.put(label, link.replace("index.html", ""));
         }
       }
+      else
+      {
+        links.put(label, null);
+      }
 
       if (link == null)
       {
@@ -456,8 +468,12 @@
       }
     }
 
+    if (labels.size() > 1)
+    {
+      links.put(labels.get(labels.size() - 1), "/justj/www/download.eclipse.org.php?file=" + projectRoot.relativize(folder).toString().replace('\\', '/'));
+    }
+
     // Build another map in the right order.
-    Map<String, String> breadcumbs = new LinkedHashMap<String, String>(updateSiteGenerator.getBreadcrumbs());
     for (String label : labels)
     {
       breadcumbs.put(label, links.get(label));