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/18 23:23:45 UTC
svn commit: r1515219 - in /commons/proper/jci/trunk:
compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/
compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/
compilers/rhino/src/main/java/org/apache/commons/jci/compilers/ cor...
Author: sebb
Date: Sun Aug 18 21:23:44 2013
New Revision: 1515219
URL: http://svn.apache.org/r1515219
Log:
Raw types
Modified:
commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettingsTestCase.java
commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/ReloadingClassLoader.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java
commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java
Modified: commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java (original)
+++ commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java Sun Aug 18 21:23:44 2013
@@ -137,7 +137,7 @@ public final class EclipseJavaCompiler e
final JavaCompilerSettings pSettings
) {
- final Map settingsMap = new EclipseJavaCompilerSettings(pSettings).toNativeSettings();
+ final Map<String, String> settingsMap = new EclipseJavaCompilerSettings(pSettings).toNativeSettings();
final Collection<CompilationProblem> problems = new ArrayList<CompilationProblem>();
Modified: commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettingsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettingsTestCase.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettingsTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettingsTestCase.java Sun Aug 18 21:23:44 2013
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
public final class EclipseJavaCompilerSettingsTestCase extends TestCase {
public void testDefaultSettings() {
- final Map m = new EclipseJavaCompilerSettings().toNativeSettings();
+ final Map<String, String> m = new EclipseJavaCompilerSettings().toNativeSettings();
assertEquals(CompilerOptions.DO_NOT_GENERATE, m.get(CompilerOptions.OPTION_SuppressWarnings));
assertEquals(CompilerOptions.DO_NOT_GENERATE, m.get(CompilerOptions.OPTION_ReportDeprecation));
assertEquals(CompilerOptions.VERSION_1_4, m.get(CompilerOptions.OPTION_TargetPlatform));
Modified: commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java (original)
+++ commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java Sun Aug 18 21:23:44 2013
@@ -115,7 +115,7 @@ public final class RhinoJavaCompiler ext
}
@Override
- protected Class findClass( final String pName ) throws ClassNotFoundException {
+ protected Class<?> findClass( final String pName ) throws ClassNotFoundException {
final Context context = Context.enter();
context.setErrorReporter(new ProblemCollector());
@@ -131,9 +131,9 @@ public final class RhinoJavaCompiler ext
}
- private Class compileClass( final Context pContext, final String pClassName) throws IOException, ClassNotFoundException {
+ private Class<?> compileClass( final Context pContext, final String pClassName) throws IOException, ClassNotFoundException {
- Class superclass = null;
+ Class<?> superclass = null;
final String pSourceName = pClassName.replace('.', '/') + ".js";
@@ -145,7 +145,7 @@ public final class RhinoJavaCompiler ext
superclass = Class.forName((String) baseClassName);
}
- final List<Class> interfaceClasses = new ArrayList<Class>();
+ final List<Class<?>> interfaceClasses = new ArrayList<Class<?>>();
final Object interfaceNames = ScriptableObject.getProperty(target, "__implements__");
@@ -168,7 +168,7 @@ public final class RhinoJavaCompiler ext
}
- final Class[] interfaces;
+ final Class<?>[] interfaces;
if (!interfaceClasses.isEmpty()) {
interfaces = new Class[interfaceClasses.size()];
@@ -183,7 +183,7 @@ public final class RhinoJavaCompiler ext
}
- private Class compileClass( final Context pContext, final String pSourceName, final String pClassName, final Class pSuperClass, final Class[] pInterfaces) throws IOException {
+ private Class<?> compileClass( final Context pContext, final String pSourceName, final String pClassName, final Class<?> pSuperClass, final Class<?>[] pInterfaces) throws IOException {
final CompilerEnvirons environments = new CompilerEnvirons();
environments.initFromContext(pContext);
@@ -203,7 +203,7 @@ public final class RhinoJavaCompiler ext
final GeneratedClassLoader loader = pContext.createClassLoader(pContext.getApplicationClassLoader());
- Class clazz = null;
+ Class<?> clazz = null;
for (int i = 0; i < classes.length; i += 2) {
@@ -212,7 +212,7 @@ public final class RhinoJavaCompiler ext
store.write(clazzName.replace('.', '/') + ".class", clazzBytes);
- Class c = loader.defineClass(clazzName, clazzBytes);
+ Class<?> c = loader.defineClass(clazzName, clazzBytes);
loader.linkClass(c);
if (i == 0) {
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/ReloadingClassLoader.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/ReloadingClassLoader.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/ReloadingClassLoader.java Sun Aug 18 21:23:44 2013
@@ -112,7 +112,7 @@ public class ReloadingClassLoader extend
return delegate.getResourceAsStream(name);
}
@Override
- public Class loadClass(String name) throws ClassNotFoundException {
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
return delegate.loadClass(name);
}
@Override
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java Sun Aug 18 21:23:44 2013
@@ -37,7 +37,7 @@ public final class JavaCompilerFactory {
*/
private static final JavaCompilerFactory INSTANCE = new JavaCompilerFactory();
- private final Map<String, Class> classCache = new HashMap<String, Class>();
+ private final Map<String, Class<?>> classCache = new HashMap<String, Class<?>>();
/**
* @deprecated will be remove after the next release, please create an instance yourself
@@ -68,7 +68,7 @@ public final class JavaCompilerFactory {
className = pHint;
}
- Class clazz = classCache.get(className);
+ Class<?> clazz = classCache.get(className);
if (clazz == null) {
try {
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java Sun Aug 18 21:23:44 2013
@@ -39,7 +39,7 @@ public final class ResourceStoreClassLoa
System.arraycopy(pStores, 0, stores, 0, stores.length);
}
- private Class fastFindClass(final String name) {
+ private Class<?> fastFindClass(final String name) {
if (stores != null) {
for (ResourceStore store : stores) {
@@ -55,9 +55,9 @@ public final class ResourceStoreClassLoa
}
@Override
- protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
// log.debug(getId() + " looking for: " + name);
- Class clazz = findLoadedClass(name);
+ Class<?> clazz = findLoadedClass(name);
if (clazz == null) {
clazz = fastFindClass(name);
@@ -85,8 +85,8 @@ public final class ResourceStoreClassLoa
}
@Override
- protected Class findClass( final String name ) throws ClassNotFoundException {
- final Class clazz = fastFindClass(name);
+ protected Class<?> findClass( final String name ) throws ClassNotFoundException {
+ final Class<?> clazz = fastFindClass(name);
if (clazz == null) {
throw new ClassNotFoundException(name);
}
Modified: commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java?rev=1515219&r1=1515218&r2=1515219&view=diff
==============================================================================
--- commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java (original)
+++ commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java Sun Aug 18 21:23:44 2013
@@ -81,7 +81,7 @@ public abstract class AbstractFilesystem
return changedFiles;
}
- public Collection getCreatedDirectories() {
+ public Collection<File> getCreatedDirectories() {
return createdDirectories;
}