You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/05/12 15:09:44 UTC
svn commit: r1743515 - /felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java

Author: cziegeler
Date: Thu May 12 15:09:44 2016
New Revision: 1743515

URL: http://svn.apache.org/viewvc?rev=1743515&view=rev
Log:
Group attributes into own json object to avoid name collision

Modified:
    felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java

Modified: felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java?rev=1743515&r1=1743514&r2=1743515&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java (original)
+++ felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java Thu May 12 15:09:44 2016
@@ -20,6 +20,7 @@ package org.apache.felix.webconsole.plug
 
 import java.io.PrintWriter;
 import java.util.Hashtable;
+
 import org.apache.felix.inventory.Format;
 import org.apache.felix.inventory.InventoryPrinter;
 import org.json.JSONException;
@@ -135,10 +136,12 @@ class MetatypeInventoryPrinter implement
         AttributeDefinition[] ads = ocd.getAttributeDefinitions(ObjectClassDefinition.ALL);
         if (ads != null)
         {
+            pw.group("attributes");
             for (AttributeDefinition ad : ads)
             {
                 ad(pw, ad);
             }
+            pw.endGroup();
         }
 
         pw.endGroup();
@@ -351,6 +354,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -362,6 +366,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -373,6 +378,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -384,6 +390,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -395,6 +402,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -406,6 +414,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -417,6 +426,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
 
@@ -428,6 +438,7 @@ class MetatypeInventoryPrinter implement
             }
             catch (JSONException ignore)
             {
+                throw new RuntimeException(ignore);
             }
         }
     }