You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2012/10/24 22:33:05 UTC
svn commit: r1401865 - in
/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal:
LocalizedObjectClassDefinition.java MetaTypeInformationImpl.java
MetaTypeServiceImpl.java ServiceMetaTypeInformation.java
Author: fmeschbe
Date: Wed Oct 24 20:33:05 2012
New Revision: 1401865
URL: http://svn.apache.org/viewvc?rev=1401865&view=rev
Log:
Formatting
Modified:
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java?rev=1401865&r1=1401864&r2=1401865&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java Wed Oct 24 20:33:05 2012
@@ -155,7 +155,8 @@ public class LocalizedObjectClassDefinit
// 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();
Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java?rev=1401865&r1=1401864&r2=1401865&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java Wed Oct 24 20:33:05 2012
@@ -63,6 +63,7 @@ public class MetaTypeInformationImpl imp
private Set locales;
+
protected MetaTypeInformationImpl( Bundle bundle )
{
this.bundle = bundle;
@@ -75,7 +76,8 @@ public class MetaTypeInformationImpl imp
}
- void dispose() {
+ void dispose()
+ {
this.providerTacker.close();
this.pids.clear();
@@ -84,6 +86,7 @@ public class MetaTypeInformationImpl imp
this.metaTypeProviders.clear();
}
+
/*
* (non-Javadoc)
*
Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java?rev=1401865&r1=1401864&r2=1401865&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeServiceImpl.java Wed Oct 24 20:33:05 2012
@@ -49,7 +49,6 @@ class MetaTypeServiceImpl implements Met
/** The <code>BundleContext</code> of the providing this service. */
private final BundleContext bundleContext;
-
private final Map bundleMetaTypeInformation;
@@ -67,14 +66,19 @@ class MetaTypeServiceImpl implements Met
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();
}
}
Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java?rev=1401865&r1=1401864&r2=1401865&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java Wed Oct 24 20:33:05 2012
@@ -295,8 +295,9 @@ public class ServiceMetaTypeInformation
{
res = ( String[] ) prop;
}
- else // unsupported type of property
+ else
{
+ // unsupported type of property
res = null;
}