Use own instance of property handler for each component.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@618565 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
index ded5f94..f8cab9d 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
@@ -279,8 +279,4 @@
this.field = f;
}
}
-
- public void clear() {
- this.properties.clear();
- }
}
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
index 94e3d04..60ae820 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
@@ -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();