1.1 --- a/remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/UI.java	Wed Aug 15 20:06:51 2012 +0200
     1.2 +++ b/remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/UI.java	Wed Aug 15 20:57:46 2012 +0200
     1.3 @@ -354,7 +354,7 @@
     1.4      private Map<String, Object> usagesSubclassesImpl(String segment, String elementSignature, String dataKey, ComputeSegmentData computeSegmentData) throws URISyntaxException, TemplateException, IOException {
     1.5          List<Map<String, String>> segments2Process = new ArrayList<Map<String, String>>();
     1.6  
     1.7 -        for (Map<String, String> m : list()) {
     1.8 +        for (Map<String, String> m : list().values()) {
     1.9              if (segment != null) {
    1.10                  if (segment.equals(m.get("segment"))) {
    1.11                      segments2Process.add(m);
    1.12 @@ -410,8 +410,8 @@
    1.13          return elementDisplayName.toString();
    1.14      }
    1.15  
    1.16 -    private static List<Map<String, String>> list() throws URISyntaxException {
    1.17 -        List<Map<String, String>> result = new LinkedList<Map<String, String>>();
    1.18 +    private static Map<String, Map<String, String>> list() throws URISyntaxException {
    1.19 +        Map<String, Map<String, String>> result = new LinkedHashMap<String, Map<String, String>>();
    1.20  
    1.21          for (String enc : WebUtilities.requestStringArrayResponse(new URI(URL_BASE + "/list"))) {
    1.22              Map<String, String> rootDesc = new HashMap<String, String>();
    1.23 @@ -419,7 +419,7 @@
    1.24  
    1.25              rootDesc.put("segment", col[0]);
    1.26              rootDesc.put("displayName", col[1]);
    1.27 -            result.add(rootDesc);
    1.28 +            result.put(col[0], rootDesc);
    1.29          }
    1.30  
    1.31          return result;