Author: ebourg
Date: Wed Oct 9 12:43:22 2013
New Revision: 1530586
URL: http://svn.apache.org/r1530586
Log:
Fixed the examples
Modified:
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/commandline/CommandlineCompiler.java
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspGenerator.java
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
Modified:
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/commandline/CommandlineCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/commandline/CommandlineCompiler.java?rev=1530586&r1=1530585&r2=1530586&view=diff
==============================================================================
---
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/commandline/CommandlineCompiler.java
(original)
+++
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/commandline/CommandlineCompiler.java
Wed Oct 9 12:43:22 2013
@@ -20,6 +20,7 @@ package org.apache.commons.jci.examples.
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Iterator;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -114,7 +115,8 @@ public final class CommandlineCompiler {
final JavaCompilerSettings settings = compiler.createDefaultSettings();
- for (Option option : cmd) {
+ for (Iterator it = cmd.iterator(); it.hasNext();) {
+ final Option option = (Option) it.next();
if ("classpath".equals(option.getOpt())) {
final String[] values = option.getValues();
final URL[] urls = new URL[values.length];
Modified:
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspGenerator.java
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspGenerator.java?rev=1530586&r1=1530585&r2=1530586&view=diff
==============================================================================
---
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspGenerator.java
(original)
+++
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspGenerator.java
Wed Oct 9 12:43:22 2013
@@ -38,8 +38,7 @@ public final class JspGenerator {
final StringBuilder sb = new StringBuilder();
final char[] input = s.toCharArray();
- for (int i = 0; i < input.length; i++) {
- final char c = input[i];
+ for (char c : input) {
if (c == '"') {
sb.append('\\');
}
Modified:
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java?rev=1530586&r1=1530585&r2=1530586&view=diff
==============================================================================
---
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
(original)
+++
commons/proper/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
Wed Oct 9 12:43:22 2013
@@ -56,10 +56,10 @@ public final class ServerPageServlet ext
private static final long serialVersionUID = 1L;
private final ReloadingClassLoader classloader = new
ReloadingClassLoader(ServerPageServlet.class.getClassLoader());
- private FilesystemAlterationMonitor fam = null;
- private CompilingListener jspListener = null;
+ private FilesystemAlterationMonitor fam;
+ private CompilingListener jspListener;
- private Map servletsByClassname = new HashMap();
+ private Map<String, HttpServlet> servletsByClassname = new HashMap<String,
HttpServlet>();
public void init() throws ServletException {
super.init();
@@ -125,7 +125,7 @@ public final class ServerPageServlet ext
jspListener = new CompilingListener(new
JavaCompilerFactory().createCompiler("eclipse"), store) {
private final JspGenerator transformer = new JspGenerator();
- private final Map<String, File> sources = new HashMap<String,
File>();
+ private final Map<String, byte[]> sources = new HashMap<String,
byte[]>();
private final Set<String> resourceToCompile = new
HashSet<String>();
public void onStart(FilesystemAlterationObserver pObserver) {
@@ -184,11 +184,9 @@ public final class ServerPageServlet ext
private String convertRequestToServletClassname( final HttpServletRequest
request ) {
- final String path = request.getPathInfo().substring(1);
+ String path = request.getPathInfo().substring(1);
- final String clazz = ConversionUtils.stripExtension(path).replace('/',
'.');
-
- return clazz;
+ return ConversionUtils.stripExtension(path).replace('/', '.');
}
protected void service(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
@@ -206,8 +204,7 @@ public final class ServerPageServlet ext
out.append("<html><body>");
- for (int i = 0; i < errors.length; i++) {
- final CompilationProblem problem = errors[i];
+ for (CompilationProblem problem : errors) {
out.append(problem.toString()).append("<br/>").append('\n');
}
@@ -222,7 +219,7 @@ public final class ServerPageServlet ext
log("Checking for serverpage " + servletClassname);
- final HttpServlet servlet = (HttpServlet)
servletsByClassname.get(servletClassname);
+ final HttpServlet servlet = servletsByClassname.get(servletClassname);
if (servlet == null) {
log("No servlet for " + request.getRequestURI());
