[richfaces-svn-commits] JBoss Rich Faces SVN: r12291 - in trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: mojo and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Jan 15 11:34:01 EST 2009
Author: abelevich
Date: 2009-01-15 11:34:01 -0500 (Thu, 15 Jan 2009)
New Revision: 12291
Added:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/DefaultRichHandler.java
Removed:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/AbstractRichHandler.java
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/RichComponentsHandler.java
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
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/selector/RichResourceSelector.java
Log:
Deleted: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/AbstractRichHandler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/AbstractRichHandler.java 2009-01-15 16:24:34 UTC (rev 12290)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/AbstractRichHandler.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -1,27 +0,0 @@
-package org.richfaces.cdk.rd.handler;
-
-import java.util.Set;
-
-import org.apache.maven.plugin.logging.Log;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public abstract class AbstractRichHandler extends DefaultHandler {
-
- private Log log;
-
- @Override
- public void fatalError(SAXParseException e) throws SAXException {
- }
-
- public abstract Set getResults();
-
- public Log getLog() {
- return log;
- }
-
- public void setLog(Log log) {
- this.log = log;
- }
-}
Added: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/DefaultRichHandler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/DefaultRichHandler.java (rev 0)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/DefaultRichHandler.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -0,0 +1,39 @@
+package org.richfaces.cdk.rd.handler;
+
+import java.util.Set;
+
+import org.apache.maven.plugin.logging.Log;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public abstract class DefaultRichHandler extends DefaultHandler {
+
+ private Log log;
+
+ private Set result;
+
+ public Set getResult() {
+ return result;
+ }
+
+ public void setResult(Set result) {
+ this.result = result;
+ }
+
+ @Override
+ public void fatalError(SAXParseException e) throws SAXException {
+ }
+
+ public Log getLog() {
+ return log;
+ }
+
+ public void setLog(Log log) {
+ this.log = log;
+ }
+}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/RichComponentsHandler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/RichComponentsHandler.java 2009-01-15 16:24:34 UTC (rev 12290)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/RichComponentsHandler.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -12,10 +12,9 @@
* @author Anton Belevich
*
*/
-public class RichComponentsHandler extends AbstractRichHandler {
+public class RichComponentsHandler extends DefaultRichHandler {
- private Set components = new HashSet();
-
+
private Set <PrefixMapping> prefixList = new HashSet<PrefixMapping>();
private Set <String> userNamespaces = new HashSet<String>();
@@ -34,7 +33,7 @@
String qname = prefix.getPrefix();
if(uri.equals(prefixUri) && name.startsWith(qname)) {
- components.add(localName);
+ getResult().add(localName);
}
}
}
@@ -49,11 +48,7 @@
}
}
-
- public Set getResults() {
- return components;
- }
-
+
public void addNamespaces(Collection <String>namespaces) {
this.userNamespaces.addAll(namespaces);
}
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:24:34 UTC (rev 12290)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -6,7 +6,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-public class ScriptsHandler extends AbstractRichHandler {
+public class ScriptsHandler extends DefaultRichHandler {
private Set result = new HashSet();
@@ -18,7 +18,7 @@
@Override
- public Set getResults() {
+ public Set getResult() {
return result;
}
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:24:34 UTC (rev 12290)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -47,7 +47,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.codehaus.plexus.util.DirectoryScanner;
import org.richfaces.cdk.rd.JarResourceScanner;
-import org.richfaces.cdk.rd.handler.AbstractRichHandler;
+import org.richfaces.cdk.rd.handler.DefaultRichHandler;
import org.richfaces.cdk.rd.handler.RichComponentsHandler;
import org.richfaces.cdk.rd.handler.ScriptsHandler;
import org.richfaces.cdk.rd.selector.ResourceSelector;
@@ -204,7 +204,7 @@
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
try {
SAXParser saxParser = saxParserFactory.newSAXParser();
- AbstractRichHandler handler = new ScriptsHandler(components);
+ DefaultRichHandler handler = new ScriptsHandler(components);
handler.setLog(getLog());
RichResourceSelector selector = new RichResourceSelector(saxParser,handler);
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/selector/RichResourceSelector.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/selector/RichResourceSelector.java 2009-01-15 16:24:34 UTC (rev 12290)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/selector/RichResourceSelector.java 2009-01-15 16:34:01 UTC (rev 12291)
@@ -7,7 +7,7 @@
import javax.xml.parsers.SAXParser;
-import org.richfaces.cdk.rd.handler.AbstractRichHandler;
+import org.richfaces.cdk.rd.handler.DefaultRichHandler;
import org.xml.sax.SAXException;
/**
@@ -18,9 +18,9 @@
private SAXParser parser;
- private AbstractRichHandler handler;
+ private DefaultRichHandler handler;
- public RichResourceSelector(SAXParser parser, AbstractRichHandler handler) {
+ public RichResourceSelector(SAXParser parser, DefaultRichHandler handler) {
this.parser = parser;
this.handler = handler;
}
@@ -44,7 +44,7 @@
public Set getResult() {
- return handler.getResults();
+ return handler.getResult();
}
}
More information about the richfaces-svn-commits
mailing list