[seam-commits] Seam SVN: r8304 - trunk/src/remoting/org/jboss/seam/remoting.
Author: shane.bryzak(a)jboss.com
Date: 2008-05-28 23:29:22 -0400 (Wed, 28 May 2008)
New Revision: 8304
Modified:
trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
Log:
allow spaces between comma-separated component names
Modified: trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-05-29 03:15:12
UTC (rev 8303)
+++ trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-05-29 03:29:22
UTC (rev 8304)
@@ -12,6 +12,7 @@
import java.math.BigInteger;
import java.util.Collection;
import java.util.Date;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -72,29 +73,35 @@
{
throw new ServletException("Invalid request - no component
specified");
}
-
- String[] componentNames = request.getQueryString().split("&");
- Component[] components = new Component[componentNames.length];
+
+ Set<Component> components = new HashSet<Component>();
Set<Type> types = new HashSet<Type>();
response.setContentType("text/javascript");
- for (int i = 0; i < componentNames.length; i++)
+ Enumeration e = request.getParameterNames();
+ while (e.hasMoreElements())
{
- components[i] = Component.forName(componentNames[i]);
- if (components[i] == null)
- {
+ String componentName = ((String) e.nextElement()).trim();
+
+ Component component = Component.forName(componentName);
+ if (component == null)
+ {
try
{
- Class c = Reflections.classForName(componentNames[i]);
+ Class c = Reflections.classForName(componentName);
appendClassSource(response.getOutputStream(), c, types);
}
catch (ClassNotFoundException ex)
{
- log.error(String.format("Component not found: [%s]",
componentNames[i]));
+ log.error(String.format("Component not found: [%s]",
componentName));
throw new ServletException("Invalid request - component not
found.");
}
}
+ else
+ {
+ components.add(component);
+ }
}
generateComponentInterface(components, response.getOutputStream(), types);
@@ -109,7 +116,7 @@
* @param out OutputStream The OutputStream to write the generated javascript to
* @throws IOException Thrown if there is an error writing to the OutputStream
*/
- public void generateComponentInterface(Component[] components, OutputStream out,
Set<Type> types)
+ public void generateComponentInterface(Set<Component> components, OutputStream
out, Set<Type> types)
throws IOException
{
for (Component c : components)