Fix up some client behavior code
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
index 01d0947..02d86ad 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
@@ -242,6 +242,7 @@
{
imports.add("java.util.Arrays");
imports.add("java.util.Collection");
+ imports.add("java.util.Collections");
imports.add("java.util.List");
imports.add("java.util.Map");
imports.add("javax.faces.component.behavior.ClientBehavior");
@@ -1080,9 +1081,10 @@
ComponentBean component
) throws IOException
{
- out.println("private final static Collection<String> _EVENT_NAMES = Arrays.asList(");
+ out.println("// Supported client events for client behaviors:");
+ out.println("private final static Collection<String> _EVENT_NAMES = Collections.unmodifiableCollection(");
out.indent();
- out.println("new String [] { ");
+ out.println("Arrays.asList(");
out.indent();
boolean first = true;
int wrapAt = 5;
@@ -1110,7 +1112,7 @@
}
out.println();
out.unindent();
- out.println(" });");
+ out.println("));");
out.unindent();
}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
index 88a7781..6a6efd8 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
@@ -23,9 +23,7 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -433,12 +431,4 @@
}
return sb.toString();
}
-
- private final static Set<String> _CLIENT_EVENT_NAMES = new HashSet<String>(
- Arrays.asList(
- new String[] { "onclick", "ondblclick", "onmousedown", "onmouseup", "onmouseover",
- "onmousemove", "onmouseout", "onkeypress", "onkeydown", "onkeyup", "onfocus",
- "onblur", "onsubmit", "onchange", "onabort", "onerror", "onload", "onreset",
- "onresize", "onselect", "onunload" }
- ));
}
diff --git a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
index 6b12691..417503d 100644
--- a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
+++ b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
@@ -416,7 +416,7 @@
if (component.isClientBehaviorHolder())
{
- out.write(" <section name=\"Client Events\">\n");
+ out.write(" <section name=\"Supported Client Events for Client Behaviors\">\n");
out.write(" <p>\n");
_writeComponentClientEvents(out, component);
out.write(" </p>\n");
