commit 6c6286b127ee2734fbdba580c6eb3383ed272de5
author Felix Meschberger <fmeschbe@apache.org> Wed Dec 02 07:22:05 2009 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Dec 02 07:22:05 2009 +0000
tree b9695d56263b0448debfd1baa571b1c49a6bb739
parent 80eeafebca2d6e69eb1f6722fb6e801d417ebd0f

FELIX-1912 Improve bundle selection if all categories are desired, support selecting bundles without a category, ensure bundles without a category are listed at all.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@886067 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java
index 1fe79d5..ffcb3dc 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java
@@ -61,6 +61,8 @@
 
     private static final String ALL_CATEGORIES_OPTION = "*";
 
+    private static final String NO_CATEGORIES_OPTION = "---";
+
     private static final String PAR_CATEGORIES = "category";
 
     private String[] repoURLs;
@@ -243,13 +245,21 @@
 
                 // get categories and check whether we should actually
                 // ignore this resource
-                boolean useResource = false;
-                String[] cats = res.getCategories();
-                for ( int ci = 0; cats != null && ci < cats.length; ci++ )
+                boolean useResource;
+                final String[] cats = res.getCategories();
+                if ( cats == null )
                 {
-                    String cat = cats[ci];
-                    categories.add( cat );
-                    useResource |= ( category == null || cat.equals( category ) );
+                    useResource = NO_CATEGORIES_OPTION.equals( category );
+                }
+                else
+                {
+                    useResource = false;
+                    for ( int ci = 0; cats != null && ci < cats.length; ci++ )
+                    {
+                        String cat = cats[ci];
+                        categories.add( cat );
+                        useResource |= ( category == null || cat.equals( category ) );
+                    }
                 }
 
                 if ( useResource )
@@ -319,6 +329,7 @@
             Util.endScript( pw );
             pw.println( "<select class='select' name='__ignoreoption__' onChange='reloadWithCat(this);'>" );
             pw.print( "<option value='" + ALL_CATEGORIES_OPTION + "'>all</option>" );
+            pw.print( "<option value='" + NO_CATEGORIES_OPTION + "'>none</option>" );
             for ( Iterator ci = categories.iterator(); ci.hasNext(); )
             {
                 String category = ( String ) ci.next();