commit 2a583e5de341d0a87b69217d1741d6203c078d1c
author Valentin Pavlov Valchev <vvalchev@apache.org> Mon Jul 12 09:16:44 2010 +0000
committer Valentin Pavlov Valchev <vvalchev@apache.org> Mon Jul 12 09:16:44 2010 +0000
tree 5de5c782d9b97313b03edf6d9f8c883c170d322d
parent 0c87e84fcaf8fa9fd1d2178661aa509890cf3574

Fixed #FELIX-2470 /No class def found error - Wire Admin (see screenshot)/
https://issues.apache.org/jira/browse/FELIX-2470

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

webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
index 6aa3bb7..acf26d5 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
@@ -39,7 +39,7 @@
 

     private static final String TITLE = "Wire Admin";

 

-    private static final String WIRE_ADMIN_NAME = "org.osgi.service.wireadmin.WireAdmin";

+    private static final String WIRE_ADMIN_NAME = "org.osgi.service.wireadmin.WireAdmin"; //$NON-NLS-1$

 

 

     /**

@@ -57,17 +57,18 @@
     {

         final BundleContext bc = getBundleContext();

         final ServiceReference ref = bc.getServiceReference( WIRE_ADMIN_NAME );

-        final WireAdmin wireAdmin = (WireAdmin) (ref != null ? bc.getService(ref) : null);

 

         try

         {

 

-            if (wireAdmin == null)

+            final Object service = ref != null ? bc.getService(ref) : null;

+            if (service == null)

             {

                 pw.println("No Wire Admin service available");

             }

             else

             {

+                final WireAdmin wireAdmin = (WireAdmin) service;

                 final Wire wires[] = wireAdmin.getWires(null);

 

                 if (null == wires || 0 == wires.length)

@@ -102,7 +103,7 @@
                     // print wires

                     for (int i = 0; i < len; i++)

                     {

-                        pw.print("#");

+                        pw.print("#"); //$NON-NLS-1$

                         pw.print(i);

                         print(wires[i], pw);

                     }

@@ -149,9 +150,9 @@
         {

             pw.print("  Value: ");

             pw.print(val);

-            pw.print(" (");

+            pw.print(" ("); //$NON-NLS-1$

             pw.print(val.getClass().getName());

-            pw.println(")");

+            pw.println(")"); //$NON-NLS-1$

         }

 

         String[] scope = wire.getScope();

@@ -164,7 +165,7 @@
             pw.println("  Scope: ");

             for (int i = 0, len = scope.length; i < len; i++)

             {

-                pw.print("              ");

+                pw.print("              "); //$NON-NLS-1$

                 pw.println(scope[i]);

             }

         }

@@ -181,7 +182,7 @@
             {

                 pw.print(flavors[i].getName());

                 if (i < len - 1)

-                    pw.print(", ");

+                    pw.print(", "); //$NON-NLS-1$

             }

             pw.println();

         }

@@ -197,7 +198,7 @@
             for (Enumeration e = props.keys(); e.hasMoreElements();)

             {

                 final Object key = e.nextElement();

-                pw.print("    ");

+                pw.print("    "); //$NON-NLS-1$

                 pw.print(key.toString());

                 pw.print('=');

                 pw.println(props.get(key));