Commit ce858db6 authored by Vít Kabele's avatar Vít Kabele
Browse files

ch.usi.dag.disl.resolver merged with main disl package

parent 3f56ac1b
......@@ -8,6 +8,7 @@
<classpathentry kind="src" path="disl/src/src-classparser"/>
<classpathentry kind="src" path="disl/src/src-exception"/>
<classpathentry kind="src" path="disl/src/src-main"/>
<classpathentry kind="src" path="disl/src/src-resolver"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>
......
......@@ -9,6 +9,7 @@ src.disl.prefix=disl
src.disl=src-disl
src.disl.main=src-main
src.disl.classparser=src-classparser
src.disl.resolver=src-resolver
src.disl.exception=src-exception
src.disl.bypass=src-disl-bypass
src.disl.agent=src-disl-agent
......
......@@ -478,6 +478,7 @@
<src path="${src.disl}"/>
<src path="${src.disl.prefix}/src/${src.disl.classparser}"/>
<src path="${src.disl.prefix}/src/${src.disl.exception}"/>
<src path="${src.disl.prefix}/src/${src.disl.resolver}"/>
<src path="${src.disl.prefix}/src/${src.disl.main}"/>
<classpath>
<path refid="disl.bypass.classpath"/>
......
package ch.usi.dag.disl.resolver;
package ch.usi.dag.disl;
import java.lang.reflect.Method;
import java.util.Set;
......@@ -24,4 +24,4 @@ public class GuardMethod {
public void setArgTypes(Set<Class<?>> argTypes) {
this.argTypes = argTypes;
}
}
\ No newline at end of file
}
package ch.usi.dag.disl.resolver;
package ch.usi.dag.disl;
import java.lang.reflect.Method;
import java.util.Arrays;
......@@ -7,8 +7,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import ch.usi.dag.disl.GuardException;
/**
* Note that all methods accessing and working with the {@link GuardResolver}
......@@ -49,7 +47,8 @@ public class GuardResolver {
private GuardMethod __findGuardMethod (
final Class <?> guardClass
) throws GuardException {
final List <Method> candidateMethods = Arrays.stream (guardClass.getDeclaredMethods ())
final List <Method> candidateMethods = Arrays
.stream (guardClass.getDeclaredMethods ())
.filter (m -> __isGuardMethodCandidate (m))
.collect (Collectors.toList ());
......
package ch.usi.dag.disl.resolver;
package ch.usi.dag.disl;
import java.util.HashMap;
import java.util.Map;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.staticcontext.StaticContext;
import ch.usi.dag.disl.util.ReflectionHelper;
......
......@@ -13,9 +13,9 @@ import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.guardcontext.GuardContext;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
import ch.usi.dag.disl.resolver.GuardMethod;
import ch.usi.dag.disl.resolver.GuardResolver;
import ch.usi.dag.disl.resolver.SCResolver;
import ch.usi.dag.disl.GuardMethod;
import ch.usi.dag.disl.GuardResolver;
import ch.usi.dag.disl.SCResolver;
import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.staticcontext.StaticContext;
import ch.usi.dag.disl.util.ReflectionHelper;
......
......@@ -7,7 +7,7 @@ import java.util.Map;
import ch.usi.dag.disl.coderep.StaticContextMethod;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.StaticContextGenException;
import ch.usi.dag.disl.resolver.SCResolver;
import ch.usi.dag.disl.SCResolver;
import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.snippet.Snippet;
import ch.usi.dag.disl.staticcontext.StaticContext;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment