commit c4b759d5f8fc3c07332f80205c2884ed253633ad
author A. J. David Bosschaert <davidb@apache.org> Fri May 02 13:37:57 2014 +0000
committer A. J. David Bosschaert <davidb@apache.org> Fri May 02 13:37:57 2014 +0000
tree 569711063909f89e376b673f74c1859590d24ddc
parent 14b8954f466e48342d4419e3f575d1b7fbb95eae

Use symbolic name for obr:info if there is no presentation name.


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

gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java

diff --git a/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java b/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
index 0bd88b2..f6ee5c9 100644
--- a/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
+++ b/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
@@ -18,20 +18,28 @@
  */
 package org.apache.felix.gogo.command;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.lang.reflect.Array;
 import java.net.URL;
-import java.util.*;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
 import org.apache.felix.bundlerepository.Capability;
 import org.apache.felix.bundlerepository.Reason;
-
 import org.apache.felix.bundlerepository.RepositoryAdmin;
 import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Resolver;
 import org.apache.felix.bundlerepository.Resource;
 import org.apache.felix.service.command.Descriptor;
 import org.apache.felix.service.command.Parameter;
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.Version;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class OBR
@@ -580,9 +588,13 @@
 
     private void printResource(PrintStream out, Resource resource)
     {
-        System.out.println(Util.getUnderlineString(resource.getPresentationName().length()));
-        out.println(resource.getPresentationName());
-        System.out.println(Util.getUnderlineString(resource.getPresentationName().length()));
+        String presentationName = resource.getPresentationName();
+        if (presentationName == null)
+            presentationName = resource.getSymbolicName();
+
+        System.out.println(Util.getUnderlineString(presentationName.length()));
+        out.println(presentationName);
+        System.out.println(Util.getUnderlineString(presentationName.length()));
 
         Map map = resource.getProperties();
         for (Iterator iter = map.entrySet().iterator(); iter.hasNext(); )