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 2008/02/05 08:02:17 UTC
svn commit: r618565 - in
/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin:
PropertyHandler.java SCRDescriptorMojo.java
Author: cziegeler
Date: Mon Feb 4 23:02:16 2008
New Revision: 618565
URL: http://svn.apache.org/viewvc?rev=618565&view=rev
Log:
Use own instance of property handler for each component.
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java?rev=618565&r1=618564&r2=618565&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java Mon Feb 4 23:02:16 2008
@@ -279,8 +279,4 @@
this.field = f;
}
}
-
- public void clear() {
- this.properties.clear();
- }
}
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=618565&r1=618564&r2=618565&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Mon Feb 4 23:02:16 2008
@@ -78,9 +78,6 @@
*/
private boolean generateAccessors;
- /** Utility handler for propertie. */
- private final PropertyHandler propertyHandler = new PropertyHandler();
-
/**
* @see org.apache.maven.plugin.AbstractMojo#execute()
*/
@@ -226,14 +223,15 @@
// collect references from class tags and fields
final Map references = new HashMap();
- this.propertyHandler.clear();
+ // Utility handler for propertie
+ final PropertyHandler propertyHandler = new PropertyHandler();
JavaClassDescription currentDescription = description;
do {
// properties
final JavaTag[] props = currentDescription.getTagsByName(Constants.PROPERTY, false);
for (int i=0; i < props.length; i++) {
- this.propertyHandler.testProperty(props[i], null, null, description == currentDescription);
+ propertyHandler.testProperty(props[i], null, null, description == currentDescription);
}
// references
@@ -250,14 +248,14 @@
this.testReference(references, tag, fields[i].getName(), description == currentDescription);
}
- this.propertyHandler.handleField(fields[i], description == currentDescription);
+ propertyHandler.handleField(fields[i], description == currentDescription);
}
currentDescription = currentDescription.getSuperClass();
} while (inherited && currentDescription != null);
// process properties
- this.propertyHandler.processProperties(component, ocd);
+ propertyHandler.processProperties(component, ocd);
// process references
final Iterator refIter = references.entrySet().iterator();