You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/08/19 22:18:59 UTC
svn commit: r1515586 - in /commons/proper/jci/trunk/compilers/javac/src:
main/java/org/apache/commons/jci/compilers/
test/java/org/apache/commons/jci/compilers/
Author: sebb
Date: Mon Aug 19 20:18:58 2013
New Revision: 1515586
URL: http://svn.apache.org/r1515586
Log:
Java5: generics and annotations
Modified:
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
commons/proper/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java Mon Aug 19 20:18:58 2013
@@ -33,7 +33,7 @@ import org.apache.commons.jci.utils.Conv
*/
public final class FileInputStreamProxy extends InputStream {
- private final static ThreadLocal readerThreadLocal = new ThreadLocal();
+ private final static ThreadLocal<ResourceReader> readerThreadLocal = new ThreadLocal<ResourceReader>();
private final InputStream in;
private final String name;
@@ -53,7 +53,7 @@ public final class FileInputStreamProxy
public FileInputStreamProxy(String pName) throws FileNotFoundException {
name = ConversionUtils.getResourceNameFromFileName(pName);
- final ResourceReader reader = (ResourceReader) readerThreadLocal.get();
+ final ResourceReader reader = readerThreadLocal.get();
if (reader == null) {
throw new RuntimeException("forgot to set the ResourceReader for this thread?");
@@ -68,38 +68,47 @@ public final class FileInputStreamProxy
in = new ByteArrayInputStream(bytes);
}
+ @Override
public int read() throws IOException {
return in.read();
}
+ @Override
public int available() throws IOException {
return in.available();
}
+ @Override
public void close() throws IOException {
in.close();
}
+ @Override
public synchronized void mark(int readlimit) {
in.mark(readlimit);
}
+ @Override
public boolean markSupported() {
return in.markSupported();
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
return in.read(b, off, len);
}
+ @Override
public int read(byte[] b) throws IOException {
return in.read(b);
}
+ @Override
public synchronized void reset() throws IOException {
in.reset();
}
+ @Override
public long skip(long n) throws IOException {
return in.skip(n);
}
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java Mon Aug 19 20:18:58 2013
@@ -33,7 +33,7 @@ import org.apache.commons.jci.utils.Conv
*/
public final class FileOutputStreamProxy extends OutputStream {
- private final static ThreadLocal storeThreadLocal = new ThreadLocal();
+ private final static ThreadLocal<ResourceStore> storeThreadLocal = new ThreadLocal<ResourceStore>();
private final ByteArrayOutputStream out = new ByteArrayOutputStream();
private final String name;
@@ -64,14 +64,16 @@ public final class FileOutputStreamProxy
name = ConversionUtils.getResourceNameFromFileName(pName);
}
+ @Override
public void write(int value) throws IOException {
out.write(value);
}
+ @Override
public void close() throws IOException {
out.close();
- final ResourceStore store = (ResourceStore) storeThreadLocal.get();
+ final ResourceStore store = storeThreadLocal.get();
if (store == null) {
throw new RuntimeException("forgot to set the ResourceStore for this thread?");
@@ -80,14 +82,17 @@ public final class FileOutputStreamProxy
store.write(name, out.toByteArray());
}
+ @Override
public void flush() throws IOException {
out.flush();
}
+ @Override
public void write(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
}
+ @Override
public void write(byte[] b) throws IOException {
out.write(b);
}
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java Mon Aug 19 20:18:58 2013
@@ -47,7 +47,7 @@ import org.vafer.dependency.utils.Resour
*/
public final class JavacClassLoader extends URLClassLoader {
- private final Map loaded = new HashMap();
+ private final Map<String, Class<?>> loaded = new HashMap<String, Class<?>>();
public JavacClassLoader( final ClassLoader pParent ) {
super(getToolsJar(), pParent);
@@ -88,7 +88,8 @@ public final class JavacClassLoader exte
throw new RuntimeException(sb.toString());
}
- protected Class findClass( final String name ) throws ClassNotFoundException {
+ @Override
+ protected Class<?> findClass( final String name ) throws ClassNotFoundException {
if (name.startsWith("java.")) {
return super.findClass(name);
@@ -96,7 +97,7 @@ public final class JavacClassLoader exte
try {
- final Class clazz = (Class) loaded.get(name);
+ final Class<?> clazz = loaded.get(name);
if (clazz != null) {
return clazz;
}
@@ -125,7 +126,7 @@ public final class JavacClassLoader exte
return super.findClass(name);
}
- final Class newClazz = defineClass(name, classBytes, 0, classBytes.length);
+ final Class<?> newClazz = defineClass(name, classBytes, 0, classBytes.length);
loaded.put(name, newClazz);
return newClazz;
} catch (IOException e) {
@@ -133,9 +134,10 @@ public final class JavacClassLoader exte
}
}
- protected synchronized Class loadClass( final String classname, final boolean resolve ) throws ClassNotFoundException {
+ @Override
+ protected synchronized Class<?> loadClass( final String classname, final boolean resolve ) throws ClassNotFoundException {
- Class theClass = findLoadedClass(classname);
+ Class<?> theClass = findLoadedClass(classname);
if (theClass != null) {
return theClass;
}
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java Mon Aug 19 20:18:58 2013
@@ -81,6 +81,7 @@ public class JavacCompilationProblem imp
return isError;
}
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getFileName()).append(" (");
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java Mon Aug 19 20:18:58 2013
@@ -64,7 +64,7 @@ public final class JavacJavaCompiler ext
try {
final ClassLoader cl = new JavacClassLoader(pClasspathClassLoader);
- final Class renamedClass = cl.loadClass("com.sun.tools.javac.Main");
+ final Class<?> renamedClass = cl.loadClass("com.sun.tools.javac.Main");
FileInputStreamProxy.setResourceReader(pReader);
FileOutputStreamProxy.setResourceStore(pStore);
@@ -96,7 +96,7 @@ public final class JavacJavaCompiler ext
}
private CompilationResult parseModernStream( final BufferedReader pReader ) throws IOException {
- final List problems = new ArrayList();
+ final List<CompilationProblem> problems = new ArrayList<CompilationProblem>();
String line;
while (true) {
@@ -107,7 +107,7 @@ public final class JavacJavaCompiler ext
do {
line = pReader.readLine();
if (line == null) {
- return new CompilationResult((CompilationProblem[]) problems.toArray(new CompilationProblem[problems.size()]));
+ return new CompilationResult(problems.toArray(new CompilationProblem[problems.size()]));
}
// TODO: there should be a better way to parse these
Modified: commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java Mon Aug 19 20:18:58 2013
@@ -73,8 +73,9 @@ public final class JavacJavaCompilerSett
/** @deprecated */
- public List getCustomCompilerArguments() {
- final List list = new ArrayList();
+ @Deprecated
+ public List<String> getCustomCompilerArguments() {
+ final List<String> list = new ArrayList<String>();
for (int i = 0; i < customArguments.length; i++) {
list.add(customArguments[i]);
}
@@ -82,26 +83,31 @@ public final class JavacJavaCompilerSett
}
/** @deprecated */
- public void setCustomCompilerArguments(List customCompilerArguments) {
- customArguments = (String[]) customCompilerArguments.toArray(new String[customCompilerArguments.size()]);
+ @Deprecated
+ public void setCustomCompilerArguments(List<?> customCompilerArguments) {
+ customArguments = customCompilerArguments.toArray(new String[customCompilerArguments.size()]);
}
/** @deprecated */
+ @Deprecated
public String getMaxmem() {
return memMax;
}
/** @deprecated */
+ @Deprecated
public void setMaxmem(String maxmem) {
this.memMax = maxmem;
}
/** @deprecated */
+ @Deprecated
public String getMeminitial() {
return memInitial;
}
/** @deprecated */
+ @Deprecated
public void setMeminitial(String meminitial) {
this.memInitial = meminitial;
}
@@ -111,7 +117,7 @@ public final class JavacJavaCompilerSett
String[] toNativeSettings() {
- final List args = new ArrayList();
+ final List<String> args = new ArrayList<String>();
if (isOptimize()) {
args.add("-O");
@@ -152,6 +158,6 @@ public final class JavacJavaCompilerSett
}
}
- return (String[])args.toArray(new String[args.size()]);
+ return args.toArray(new String[args.size()]);
}
}
Modified: commons/proper/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java?rev=1515586&r1=1515585&r2=1515586&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java Mon Aug 19 20:18:58 2013
@@ -19,10 +19,12 @@ package org.apache.commons.jci.compilers
public class JavacJavaCompilerTestCase extends AbstractCompilerTestCase {
+ @Override
public JavaCompiler createJavaCompiler() {
return new JavacJavaCompiler();
}
+ @Override
public String getCompilerName() {
return "javac";
}