Author: abelevich Date: 2009-01-15 11:46:05 -0500 (Thu, 15 Jan 2009) New Revision: 12294 Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java Log: Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java 2009-01-15 16:35:41 UTC (rev 12293) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java 2009-01-15 16:46:05 UTC (rev 12294) @@ -8,8 +8,6 @@ public class ScriptsHandler extends DefaultRichHandler { - private Set result = new HashSet(); - private Set lookUpResources; private boolean collect = false; @@ -17,11 +15,6 @@ private String temp; - @Override - public Set getResult() { - return result; - } - public ScriptsHandler(Set lookUpResources) { this.lookUpResources = lookUpResources; } @@ -47,7 +40,7 @@ } if(name.equalsIgnoreCase("script") && collect) { - result.add(temp); + getResult().add(temp); } } Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-15 16:35:41 UTC (rev 12293) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-15 16:46:05 UTC (rev 12294) @@ -24,6 +24,7 @@ import java.io.File; import java.io.IOException; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -167,6 +168,7 @@ RichComponentsHandler handler = new RichComponentsHandler(); handler.setLog(getLog()); + handler.setResult(new HashSet()); handler.addNamespaces(namespaces); richSelector = new RichResourceSelector(saxParser,handler); @@ -206,6 +208,7 @@ SAXParser saxParser = saxParserFactory.newSAXParser(); DefaultRichHandler handler = new ScriptsHandler(components); handler.setLog(getLog()); + handler.setResult(new HashSet()); RichResourceSelector selector = new RichResourceSelector(saxParser,handler); for (FileObject dependency: richConfigs) {