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:14:53 UTC
svn commit: r1515216 - 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/groovy/src/main/java/org/apache/commons/jci/compilers/ co...
Author: sebb
Date: Sun Aug 18 21:14:52 2013
New Revision: 1515216
URL: http://svn.apache.org/r1515216
Log:
Missing @Overrides
Modified:
commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java
commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
commons/proper/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
commons/proper/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
commons/proper/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
commons/proper/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.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/listeners/CompilingListener.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java
commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java
commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java
commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderRemoveTestCase.java
commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderTestCase.java
commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationObserverImpl.java
commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java
Modified: commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java (original)
+++ commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java Sun Aug 18 21:14:52 2013
@@ -61,6 +61,7 @@ public final class EclipseCompilationPro
return problem.getMessage();
}
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getFileName()).append(" (");
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=1515216&r1=1515215&r2=1515216&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:14:52 2013
@@ -181,6 +181,7 @@ public final class EclipseJavaCompiler e
return true;
}
+ @Override
public String toString() {
return getMessage();
}
@@ -215,7 +216,10 @@ public final class EclipseJavaCompiler e
//log.debug("finding compoundTypeName=" + result.toString());
- return findType(result.toString());
+ final String string = result.toString();
+ final NameEnvironmentAnswer findType = findType(string);
+ System.err.println("findType: "+string+" "+findType);
+ return findType;
}
public NameEnvironmentAnswer findType( final char[] pTypeName, final char[][] pPackageName ) {
@@ -304,6 +308,7 @@ public final class EclipseJavaCompiler e
} catch (final IOException ie) {
log.error("could not close input stream", ie);
}
+ System.err.println("isPackage1: " + pClazzName+ " false");
return false;
}
@@ -311,9 +316,11 @@ public final class EclipseJavaCompiler e
final String source = pClazzName.replace('.', '/') + ".java";
if (pReader.isAvailable(source)) {
log.debug("found the source " + source + " for " + pClazzName + " - no package ");
+ System.err.println("isPackage2: " + source+ " false");
return false;
}
+ System.err.println("isPackage3: " + pClazzName+ " true");
return true;
}
@@ -330,11 +337,15 @@ public final class EclipseJavaCompiler e
// log.debug("isPackage parentPackageName=" + result.toString() + " packageName=" + new String(packageName));
+ System.err.println(">>parentPackage: "+result.toString());
if (parentPackageName != null && parentPackageName.length > 0) {
result.append('.');
}
result.append(pPackageName);
- return isPackage(result.toString());
+ final String string = result.toString();
+ final boolean is = isPackage(string);
+ System.err.println("<<ispackage: "+string+" => "+is);
+ return is;
}
public void cleanup() {
Modified: commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java (original)
+++ commons/proper/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java Sun Aug 18 21:14:52 2013
@@ -84,6 +84,7 @@ public final class EclipseJavaCompilerSe
return map;
}
+ @Override
public String toString() {
return toNativeSettings().toString();
}
Modified: commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java Sun Aug 18 21:14:52 2013
@@ -19,10 +19,12 @@ package org.apache.commons.jci.compilers
public final class EclipseJavaCompilerTestCase extends AbstractCompilerTestCase {
+ @Override
public String getCompilerName() {
return "eclipse";
}
+ @Override
public JavaCompiler createJavaCompiler() {
return new EclipseJavaCompiler();
}
Modified: commons/proper/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java (original)
+++ commons/proper/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java Sun Aug 18 21:14:52 2013
@@ -99,6 +99,7 @@ public final class GroovyCompilationProb
return message;
}
+ @Override
public String toString() {
return getMessage();
}
Modified: commons/proper/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java Sun Aug 18 21:14:52 2013
@@ -23,19 +23,23 @@ package org.apache.commons.jci.compilers
*/
public final class GroovyJavaCompilerTestCase extends AbstractCompilerTestCase {
+ @Override
public String getCompilerName() {
return "groovy";
}
+ @Override
public JavaCompiler createJavaCompiler() {
return new GroovyJavaCompiler();
}
+ @Override
public void testInternalClassCompile() throws Exception {
// FIXME: inner classes not supported in groovy?
}
- public void testCrossReferenceCompilation() throws Exception {
+ @Override
+ public void testCrossReferenceCompilation() throws Exception {
// FIXME: static imports not supported in groovy?
}
Modified: commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java (original)
+++ commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java Sun Aug 18 21:14:52 2013
@@ -86,6 +86,7 @@ public final class JaninoCompilationProb
return message;
}
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getFileName()).append(" (");
Modified: commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java (original)
+++ commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java Sun Aug 18 21:14:52 2013
@@ -93,7 +93,8 @@ public final class JaninoJavaCompiler ex
store = pStore;
}
- public void close() throws IOException {
+ @Override
+ public void close() throws IOException {
super.close();
final byte[] bytes = toByteArray();
@@ -110,7 +111,8 @@ public final class JaninoJavaCompiler ex
final Compiler compiler = new Compiler(
new ResourceFinder() {
- public Resource findResource( final String pSourceName ) {
+ @Override
+ public Resource findResource( final String pSourceName ) {
final byte[] bytes = pResourceReader.getBytes(pSourceName);
if (bytes == null) {
@@ -125,7 +127,8 @@ public final class JaninoJavaCompiler ex
},
new ClassLoaderIClassLoader(pClassLoader),
new ResourceFinder() {
- public Resource findResource( final String pResourceName ) {
+ @Override
+ public Resource findResource( final String pResourceName ) {
final byte[] bytes = pStore.read(pResourceName);
if (bytes == null) {
Modified: commons/proper/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java Sun Aug 18 21:14:52 2013
@@ -23,10 +23,12 @@ package org.apache.commons.jci.compilers
*/
public final class JaninoJavaCompilerTestCase extends AbstractCompilerTestCase {
+ @Override
public String getCompilerName() {
return "janino";
}
+ @Override
public JavaCompiler createJavaCompiler() {
return new JaninoJavaCompiler();
}
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=1515216&r1=1515215&r2=1515216&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:14:52 2013
@@ -114,6 +114,7 @@ public final class RhinoJavaCompiler ext
return problems;
}
+ @Override
protected Class findClass( final String pName ) throws ClassNotFoundException {
final Context context = Context.enter();
context.setErrorReporter(new ProblemCollector());
Modified: commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java (original)
+++ commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java Sun Aug 18 21:14:52 2013
@@ -29,14 +29,17 @@ import org.apache.commons.jci.stores.Mem
*/
public final class RhinoJavaCompilerTestCase extends AbstractCompilerTestCase {
+ @Override
public JavaCompiler createJavaCompiler() {
return new RhinoJavaCompiler();
}
+ @Override
public String getCompilerName() {
return "rhino";
}
+ @Override
public void testSimpleCompile() throws Exception {
final JavaCompiler compiler = createJavaCompiler();
@@ -74,12 +77,15 @@ public final class RhinoJavaCompilerTest
assertTrue(clazzBytes.length > 0);
}
+ @Override
public void testExtendedCompile() throws Exception {
}
+ @Override
public void testInternalClassCompile() throws Exception {
}
+ @Override
public void testUppercasePackageNameCompile() throws Exception {
final JavaCompiler compiler = createJavaCompiler();
@@ -117,10 +123,12 @@ public final class RhinoJavaCompilerTest
assertTrue(clazzBytes.length > 0);
}
+ @Override
public void testCrossReferenceCompilation() throws Exception {
// NA
}
+ @Override
public void testAdditionalTopLevelClassCompile() throws Exception {
// NA
}
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=1515216&r1=1515215&r2=1515216&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:14:52 2013
@@ -99,24 +99,31 @@ public class ReloadingClassLoader extend
delegate = new ResourceStoreClassLoader(parent, stores);
}
+ @Override
public void clearAssertionStatus() {
delegate.clearAssertionStatus();
}
+ @Override
public URL getResource(String name) {
return delegate.getResource(name);
}
+ @Override
public InputStream getResourceAsStream(String name) {
return delegate.getResourceAsStream(name);
}
+ @Override
public Class loadClass(String name) throws ClassNotFoundException {
return delegate.loadClass(name);
}
+ @Override
public void setClassAssertionStatus(String className, boolean enabled) {
delegate.setClassAssertionStatus(className, enabled);
}
+ @Override
public void setDefaultAssertionStatus(boolean enabled) {
delegate.setDefaultAssertionStatus(enabled);
}
+ @Override
public void setPackageAssertionStatus(String packageName, boolean enabled) {
delegate.setPackageAssertionStatus(packageName, enabled);
}
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java Sun Aug 18 21:14:52 2013
@@ -81,6 +81,7 @@ public class CompilingListener extends R
return ConversionUtils.stripExtension(ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(), pFile))) + getSourceFileExtension();
}
+ @Override
public ResourceStore getStore() {
return transactionalStore;
}
@@ -89,6 +90,7 @@ public class CompilingListener extends R
return lastResult;
}
+ @Override
public void onStart( final FilesystemAlterationObserver pObserver ) {
super.onStart(pObserver);
@@ -120,6 +122,7 @@ public class CompilingListener extends R
return result;
}
+ @Override
public boolean isReloadRequired( final FilesystemAlterationObserver pObserver ) {
boolean reload = false;
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java Sun Aug 18 21:14:52 2013
@@ -34,37 +34,45 @@ public class FileChangeListener extends
return changed;
}
+ @Override
public void onStart( final FilesystemAlterationObserver pObserver ) {
changed = false;
super.onStart(pObserver);
}
+ @Override
public void onStop( final FilesystemAlterationObserver pObserver ) {
super.onStop(pObserver);
}
+ @Override
public void onFileChange( final File pFile ) {
changed = true;
}
+ @Override
public void onFileCreate( final File pFile ) {
changed = true;
}
+ @Override
public void onFileDelete( final File pFile ) {
changed = true;
}
+ @Override
public void onDirectoryChange( final File pDir ) {
}
+ @Override
public void onDirectoryCreate( final File pDir ) {
}
+ @Override
public void onDirectoryDelete( final File pDir ) {
}
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java Sun Aug 18 21:14:52 2013
@@ -120,6 +120,7 @@ public class ReloadingListener extends A
return reload;
}
+ @Override
public void onStop( final FilesystemAlterationObserver pObserver ) {
@@ -148,10 +149,13 @@ public class ReloadingListener extends A
}
}
+ @Override
public void onDirectoryCreate( final File pDir ) {
}
+ @Override
public void onDirectoryChange( final File pDir ) {
}
+ @Override
public void onDirectoryDelete( final File pDir ) {
}
}
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java Sun Aug 18 21:14:52 2013
@@ -106,6 +106,7 @@ public final class FileResourceStore imp
}
}
+ @Override
public String toString() {
return this.getClass().getName() + root.toString();
}
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java Sun Aug 18 21:14:52 2013
@@ -37,17 +37,17 @@ public final class MemoryResourceStore i
private final Map<String, byte[]> store = new HashMap<String, byte[]>();
public byte[] read( final String pResourceName ) {
- log.debug("reading resource " + pResourceName);
+ System.err.println("reading resource " + pResourceName);
return store.get(pResourceName);
}
public void write( final String pResourceName, final byte[] pData ) {
- log.debug("writing resource " + pResourceName + "(" + pData.length + ")");
+ System.err.println("writing resource " + pResourceName + "(" + pData.length + ")");
store.put(pResourceName, pData);
}
public void remove( final String pResourceName ) {
- log.debug("removing resource " + pResourceName);
+ System.err.println("removing resource " + pResourceName);
store.remove(pResourceName);
}
@@ -67,7 +67,9 @@ public final class MemoryResourceStore i
return (String[]) names.toArray(new String[store.size()]);
}
+ @Override
public String toString() {
+ System.err.println("tos()");
return this.getClass().getName() + store.toString();
}
}
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=1515216&r1=1515215&r2=1515216&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:14:52 2013
@@ -54,6 +54,7 @@ public final class ResourceStoreClassLoa
return null;
}
+ @Override
protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
// log.debug(getId() + " looking for: " + name);
Class clazz = findLoadedClass(name);
@@ -83,6 +84,7 @@ public final class ResourceStoreClassLoa
return clazz;
}
+ @Override
protected Class findClass( final String name ) throws ClassNotFoundException {
final Class clazz = fastFindClass(name);
if (clazz == null) {
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java Sun Aug 18 21:14:52 2013
@@ -48,6 +48,7 @@ public class TransactionalResourceStore
store.write(pResourceName, pResourceData);
}
+ @Override
public String toString() {
return store.toString();
}
Modified: commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java (original)
+++ commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java Sun Aug 18 21:14:52 2013
@@ -36,6 +36,7 @@ public abstract class AbstractTestCase e
protected File directory;
+ @Override
protected void setUp() throws Exception {
System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
@@ -116,6 +117,7 @@ public abstract class AbstractTestCase e
}
+ @Override
protected void tearDown() throws Exception {
FileUtils.deleteDirectory(directory);
}
Modified: commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java (original)
+++ commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java Sun Aug 18 21:14:52 2013
@@ -107,6 +107,7 @@ public final class CompilingClassLoaderT
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -232,6 +233,7 @@ public final class CompilingClassLoaderT
}
+ @Override
protected void tearDown() throws Exception {
fam.removeListener(listener);
fam.stop();
Modified: commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderRemoveTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderRemoveTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderRemoveTestCase.java (original)
+++ commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderRemoveTestCase.java Sun Aug 18 21:14:52 2013
@@ -44,10 +44,12 @@ public class ReloadingClassLoaderRemoveT
assertTrue(clazzSimpleA.length > 0);
}
+ @Override
protected void setUp() throws Exception {
System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
}
+ @Override
protected void tearDown() throws Exception {
}
Modified: commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderTestCase.java (original)
+++ commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/ReloadingClassLoaderTestCase.java Sun Aug 18 21:14:52 2013
@@ -51,6 +51,7 @@ public final class ReloadingClassLoaderT
assertTrue(clazzExtended.length > 0);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -157,6 +158,7 @@ public final class ReloadingClassLoaderT
// FIXME: compare with delegation
}
+ @Override
protected void tearDown() throws Exception {
fam.removeListener(listener);
fam.stop();
Modified: commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationObserverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationObserverImpl.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationObserverImpl.java (original)
+++ commons/proper/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/FilesystemAlterationObserverImpl.java Sun Aug 18 21:14:52 2013
@@ -79,6 +79,7 @@ public class FilesystemAlterationObserve
return file.lastModified();
}
+ @Override
public String toString() {
return file.toString();
}
@@ -105,6 +106,7 @@ public class FilesystemAlterationObserve
}
+ @Override
public String toString() {
return file.toString();
}
Modified: commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java?rev=1515216&r1=1515215&r2=1515216&view=diff
==============================================================================
--- commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java (original)
+++ commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java Sun Aug 18 21:14:52 2013
@@ -44,12 +44,14 @@ public final class FilesystemAlterationM
private File directory;
+ @Override
protected void setUp() throws Exception {
directory = createTempDirectory();
assertTrue(directory.exists());
assertTrue(directory.isDirectory());
}
+ @Override
protected void tearDown() throws Exception {
FileUtils.deleteDirectory(directory);
}