commit f07293bd7ef8f10898d113a9677ea25162e56ca5 Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Mon Jul 9 20:03:40 2012 +0200 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Mon Jul 9 20:03:40 2012 +0200
JBEHAVE-233: Moved Callback to be a MethodCache interface. diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java index 993f56e..86ecd03 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java @@ -24,9 +24,9 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; import org.jbehave.core.steps.PatternVariantBuilder; import org.jbehave.core.steps.StepType; -import org.jbehave.eclipse.cache.Callback; import org.jbehave.eclipse.cache.JavaScanner; import org.jbehave.eclipse.cache.MethodCache; +import org.jbehave.eclipse.cache.MethodCache.Callback; import org.jbehave.eclipse.cache.container.Container; import org.jbehave.eclipse.cache.container.Containers; import org.jbehave.eclipse.editor.step.LocalizedStepSupport; diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/Callback.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/Callback.java deleted file mode 100644 index 652a99e..0000000 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/Callback.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jbehave.eclipse.cache; - -public interface Callback<T1, T2> { - void op(T1 value1, T2 value2); -} diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/MethodCache.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/MethodCache.java index 53437ab..b4b1db3 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/MethodCache.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/cache/MethodCache.java @@ -26,6 +26,10 @@ import fj.Effect; public class MethodCache<E> extends JavaVisitorAdapter<MethodCache.Bucket<E>> { + public interface Callback<T1, T2> { + void op(T1 value1, T2 value2); + } + private static AtomicInteger buildTickGenerator = new AtomicInteger(); private Logger log = LoggerFactory.getLogger(MethodCache.class);