Reformat according to Apache Felix conventions
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1187708 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/metatype/src/main/java/org/apache/felix/metatype/AD.java b/metatype/src/main/java/org/apache/felix/metatype/AD.java
index 5dccf82..82482c8 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/AD.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/AD.java
@@ -208,7 +208,7 @@
}
String[] optionValues = getOptionValues();
- if ( optionValues != null && optionValues.length > 0)
+ if ( optionValues != null && optionValues.length > 0 )
{
for ( int i = 0; i < optionValues.length; i++ )
{
@@ -450,7 +450,7 @@
{
case AttributeDefinition.BOOLEAN:
// Boolean is only Comparable starting with Java 5
- return new ComparableBoolean(value);
+ return new ComparableBoolean( value );
case AttributeDefinition.CHARACTER:
return new Character( value.charAt( 0 ) );
case AttributeDefinition.BYTE:
@@ -479,16 +479,21 @@
return null;
}
- private static class ComparableBoolean implements Comparable {
+ private static class ComparableBoolean implements Comparable
+ {
private boolean value;
- ComparableBoolean(String boolValue) {
- value = Boolean.valueOf(boolValue).booleanValue();
+
+ ComparableBoolean( String boolValue )
+ {
+ value = Boolean.valueOf( boolValue ).booleanValue();
}
- public int compareTo(Object obj) {
- ComparableBoolean cb = (ComparableBoolean) obj;
- return (cb.value == value ? 0 : (value ? 1 : -1));
+
+ public int compareTo( Object obj )
+ {
+ ComparableBoolean cb = ( ComparableBoolean ) obj;
+ return ( cb.value == value ? 0 : ( value ? 1 : -1 ) );
}
}
}
diff --git a/metatype/src/main/java/org/apache/felix/metatype/Attribute.java b/metatype/src/main/java/org/apache/felix/metatype/Attribute.java
index f0010b3..dcf1de5 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/Attribute.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/Attribute.java
@@ -74,13 +74,14 @@
{
if ( split )
{
- addContent( AD.splitList( content ) );
+ addContent( AD.splitList( content ) );
}
else
{
- addContent( new String[] { content } );
+ addContent( new String[]
+ { content } );
}
}
}
-
+
}
diff --git a/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java b/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
index 4bf3855..3dc7636 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
@@ -181,6 +181,7 @@
return ( Designate ) designates.get( pid );
}
+
protected Map getObjectClassDefinitions()
{
return objectClassDefinitions;
diff --git a/metatype/src/main/java/org/apache/felix/metatype/MetaData.java b/metatype/src/main/java/org/apache/felix/metatype/MetaData.java
index 33c9087..e24e195 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/MetaData.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/MetaData.java
@@ -39,6 +39,7 @@
private Map designates;
private URL source;
+
public String getLocalePrefix()
{
return localePrefix;
diff --git a/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java b/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
index a7da322..d6c196a 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
@@ -81,8 +81,8 @@
{
ins = url.openStream();
this.parser.setProperty( "http://xmlpull.org/v1/doc/properties.html#location", url.toString() );
- this.parser.setFeature(KXmlParser.FEATURE_PROCESS_NAMESPACES, true);
- this.parser.setFeature(KXmlParser.FEATURE_REPORT_NAMESPACE_ATTRIBUTES, false);
+ this.parser.setFeature( KXmlParser.FEATURE_PROCESS_NAMESPACES, true );
+ this.parser.setFeature( KXmlParser.FEATURE_REPORT_NAMESPACE_ATTRIBUTES, false );
MetaData md = this.parse( ins );
if ( md != null )
{
@@ -106,27 +106,34 @@
}
}
+
/**
* Checks if this document has a meta type name space.
*
* @return <code>true</code> if this document has a meta type name space
* @throws XmlPullParserException when there the meta type name space is not valid
*/
- private boolean hasMetaTypeNameSpace() throws XmlPullParserException {
+ private boolean hasMetaTypeNameSpace() throws XmlPullParserException
+ {
- int attrs = this.parser.getAttributeCount();
- for (int i = 0 ; i < attrs; i++) {
+ int attrs = this.parser.getAttributeCount();
+ for ( int i = 0; i < attrs; i++ )
+ {
- if ( this.parser.getAttributeName(i).equals("xmlns:metatype") ) {
- if ( !"http://www.osgi.org/xmlns/metatype/v1.0.0".equals(this.parser.getAttributeValue(i)) ) {
- throw new XmlPullParserException( "invalid namespace: " + this.parser.getAttributeValue(i), this.parser, null );
- }
- return true;
- }
- }
- return false;
+ if ( this.parser.getAttributeName( i ).equals( "xmlns:metatype" ) )
+ {
+ if ( !"http://www.osgi.org/xmlns/metatype/v1.0.0".equals( this.parser.getAttributeValue( i ) ) )
+ {
+ throw new XmlPullParserException( "invalid namespace: " + this.parser.getAttributeValue( i ),
+ this.parser, null );
+ }
+ return true;
+ }
+ }
+ return false;
}
+
/**
* Parses the XML document in the given input stream.
* <p>
@@ -155,15 +162,15 @@
{
if ( eventType == XmlPullParser.START_TAG )
{
- boolean nameSpaceAware = hasMetaTypeNameSpace();
+ boolean nameSpaceAware = hasMetaTypeNameSpace();
if ( nameSpaceAware && "metatype:MetaData".equals( this.parser.getName() ) )
{
- mti = this.readMetaData(nameSpaceAware);
+ mti = this.readMetaData( nameSpaceAware );
}
else if ( "MetaData".equals( this.parser.getName() ) )
{
- mti = this.readMetaData(nameSpaceAware);
+ mti = this.readMetaData( nameSpaceAware );
}
else
{
@@ -177,7 +184,7 @@
}
- private MetaData readMetaData(boolean nameSpaceAware) throws IOException, XmlPullParserException
+ private MetaData readMetaData( boolean nameSpaceAware ) throws IOException, XmlPullParserException
{
MetaData mti = this.createMetaData();
mti.setLocalePrefix( this.getOptionalAttribute( "localization" ) );