commit 7dcc1a9e30a37f2e847d8dcea4814f3122643104
author Felix Meschberger <fmeschbe@apache.org> Wed Oct 24 20:33:05 2012 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Oct 24 20:33:05 2012 +0000
tree e566b5995fe3ddf13547d5aeb07bc7f65a2fc28e
parent 63c19cf2b350f688e1c67b04c0b14b015da18597

Formatting

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

metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java b/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
index 72390da..3061caa 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
@@ -155,7 +155,8 @@
         // just create an URL based on the source of the metadata
         // see FELIX2868
         URL url = this.bundle.getEntry( iconPath );
-        if (url == null) {
+        if ( url == null )
+        {
             url = new URL( this.ocd.getMetadata().getSource(), iconPath );
         }
         return url.openStream();

metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
index 081b509..618a6df 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
@@ -63,6 +63,7 @@
 
     private Set locales;
 
+
     protected MetaTypeInformationImpl( Bundle bundle )
     {
         this.bundle = bundle;
@@ -75,7 +76,8 @@
     }
 
 
-    void dispose() {
+    void dispose()
+    {
         this.providerTacker.close();
 
         this.pids.clear();
@@ -84,6 +86,7 @@
         this.metaTypeProviders.clear();
     }
 
+
     /*
      * (non-Javadoc)
      *

metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java
index b516502..b4ee2fb 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java
@@ -49,7 +49,6 @@
     /** The <code>BundleContext</code> of the providing this service. */
     private final BundleContext bundleContext;
 
-
     private final Map bundleMetaTypeInformation;
 
 
@@ -67,14 +66,19 @@
         bundleContext.addBundleListener( this );
     }
 
-    void dispose() {
+
+    void dispose()
+    {
         MetaTypeInformationImpl[] mti;
-        synchronized(bundleMetaTypeInformation) {
-            mti = (MetaTypeInformationImpl[]) this.bundleMetaTypeInformation.values().toArray(new MetaTypeInformationImpl[bundleMetaTypeInformation.values().size()]);
+        synchronized ( bundleMetaTypeInformation )
+        {
+            mti = ( MetaTypeInformationImpl[] ) this.bundleMetaTypeInformation.values().toArray(
+                new MetaTypeInformationImpl[bundleMetaTypeInformation.values().size()] );
             this.bundleMetaTypeInformation.clear();
         }
 
-        for (int i = 0; i < mti.length; i++) {
+        for ( int i = 0; i < mti.length; i++ )
+        {
             mti[i].dispose();
         }
     }

metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java b/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
index 4ff1fad..82ab35a 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
@@ -295,8 +295,9 @@
         {
             res = ( String[] ) prop;
         }
-        else // unsupported type of property
+        else
         {
+            // unsupported type of property
             res = null;
         }