Commit b2d259b0 authored by Lubomir Bulej's avatar Lubomir Bulej

Moved DiSLREServerException and DiSLREServerFatalException out of the exception

package into the top-level package, where it should be. Dependent classes updated
to reflect this move.
parent 02a4ec31
...@@ -8,7 +8,6 @@ import java.io.IOException; ...@@ -8,7 +8,6 @@ import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import ch.usi.dag.dislreserver.exception.DiSLREServerException;
import ch.usi.dag.dislreserver.reqdispatch.RequestDispatcher; import ch.usi.dag.dislreserver.reqdispatch.RequestDispatcher;
......
package ch.usi.dag.dislreserver;
public class DiSLREServerException extends Exception {
private static final long serialVersionUID = 5272000884539359236L;
public DiSLREServerException (final String message) {
super (message);
}
public DiSLREServerException (final Throwable cause) {
super (cause);
}
}
package ch.usi.dag.dislreserver.exception; package ch.usi.dag.dislreserver;
public class DiSLREServerFatalException extends RuntimeException { public class DiSLREServerFatalException extends RuntimeException {
private static final long serialVersionUID = -8431771285237240263L; private static final long serialVersionUID = -8431771285237240263L;
public DiSLREServerFatalException() {
}
public DiSLREServerFatalException(String message) { public DiSLREServerFatalException (final String message) {
super(message); super (message);
} }
public DiSLREServerFatalException(Throwable cause) {
super(cause);
}
public DiSLREServerFatalException(String message, Throwable cause) { public DiSLREServerFatalException (final String message, final Throwable cause) {
super(message, cause); super (message, cause);
} }
} }
package ch.usi.dag.dislreserver.exception;
public class DiSLREServerException extends Exception {
private static final long serialVersionUID = 5272000884539359236L;
public DiSLREServerException() {
super();
}
public DiSLREServerException(String message, Throwable cause) {
super(message, cause);
}
public DiSLREServerException(String message) {
super(message);
}
public DiSLREServerException(Throwable cause) {
super(cause);
}
}
...@@ -7,7 +7,7 @@ import java.lang.reflect.Method; ...@@ -7,7 +7,7 @@ import java.lang.reflect.Method;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver.AnalysisMethodHolder; import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver.AnalysisMethodHolder;
import ch.usi.dag.dislreserver.msg.analyze.mtdispatch.AnalysisDispatcher; import ch.usi.dag.dislreserver.msg.analyze.mtdispatch.AnalysisDispatcher;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
......
...@@ -8,8 +8,8 @@ import java.util.List; ...@@ -8,8 +8,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis; import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis;
public final class AnalysisResolver { public final class AnalysisResolver {
......
...@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
/** /**
* Manages executors * Manages executors
......
...@@ -2,7 +2,7 @@ package ch.usi.dag.dislreserver.msg.analyze.mtdispatch; ...@@ -2,7 +2,7 @@ package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
import java.util.List; import java.util.List;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation; import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation;
// Each thread has dedicated queue where new tasks are submitted. // Each thread has dedicated queue where new tasks are submitted.
......
package ch.usi.dag.dislreserver.msg.analyze.mtdispatch; package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation; import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation;
/** /**
......
...@@ -4,7 +4,7 @@ import java.util.Set; ...@@ -4,7 +4,7 @@ import java.util.Set;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver; import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver;
import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis; import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis;
import ch.usi.dag.dislreserver.shadow.ShadowObject; import ch.usi.dag.dislreserver.shadow.ShadowObject;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
import ch.usi.dag.dislreserver.shadow.ShadowClass; import ch.usi.dag.dislreserver.shadow.ShadowClass;
import ch.usi.dag.dislreserver.shadow.ShadowClassTable; import ch.usi.dag.dislreserver.shadow.ShadowClassTable;
......
...@@ -6,7 +6,7 @@ import java.io.IOException; ...@@ -6,7 +6,7 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.msg.instr.InstrMsgReader.InstrClassMessage; import ch.usi.dag.dislreserver.msg.instr.InstrMsgReader.InstrClassMessage;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
import ch.usi.dag.dislreserver.shadow.ShadowClassTable; import ch.usi.dag.dislreserver.shadow.ShadowClassTable;
import ch.usi.dag.dislreserver.shadow.ShadowObject; import ch.usi.dag.dislreserver.shadow.ShadowObject;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler; import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver; import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
import ch.usi.dag.dislreserver.shadow.NetReferenceHelper; import ch.usi.dag.dislreserver.shadow.NetReferenceHelper;
import ch.usi.dag.dislreserver.shadow.ShadowClass; import ch.usi.dag.dislreserver.shadow.ShadowClass;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler; import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
......
...@@ -4,7 +4,7 @@ import java.io.DataInputStream; ...@@ -4,7 +4,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.reqdispatch.RequestHandler; import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
import ch.usi.dag.dislreserver.shadow.NetReferenceHelper; import ch.usi.dag.dislreserver.shadow.NetReferenceHelper;
import ch.usi.dag.dislreserver.shadow.ShadowClass; import ch.usi.dag.dislreserver.shadow.ShadowClass;
......
...@@ -8,8 +8,8 @@ import java.util.HashMap; ...@@ -8,8 +8,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler; import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler;
import ch.usi.dag.dislreserver.msg.classinfo.ClassInfoHandler; import ch.usi.dag.dislreserver.msg.classinfo.ClassInfoHandler;
import ch.usi.dag.dislreserver.msg.close.CloseHandler; import ch.usi.dag.dislreserver.msg.close.CloseHandler;
......
...@@ -3,7 +3,7 @@ package ch.usi.dag.dislreserver.reqdispatch; ...@@ -3,7 +3,7 @@ package ch.usi.dag.dislreserver.reqdispatch;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import ch.usi.dag.dislreserver.exception.DiSLREServerException; import ch.usi.dag.dislreserver.DiSLREServerException;
public interface RequestHandler { public interface RequestHandler {
......
...@@ -4,7 +4,7 @@ import java.util.Arrays; ...@@ -4,7 +4,7 @@ import java.util.Arrays;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
public class ShadowArrayClass extends ShadowClass { public class ShadowArrayClass extends ShadowClass {
......
...@@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
public class ShadowClassTable { public class ShadowClassTable {
......
...@@ -12,7 +12,7 @@ import org.objectweb.asm.tree.FieldNode; ...@@ -12,7 +12,7 @@ import org.objectweb.asm.tree.FieldNode;
import org.objectweb.asm.tree.InnerClassNode; import org.objectweb.asm.tree.InnerClassNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
class ShadowCommonClass extends ShadowClass { class ShadowCommonClass extends ShadowClass {
......
...@@ -4,7 +4,7 @@ import java.util.Iterator; ...@@ -4,7 +4,7 @@ import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import ch.usi.dag.dislreserver.exception.DiSLREServerFatalException; import ch.usi.dag.dislreserver.DiSLREServerFatalException;
public class ShadowObjectTable { public class ShadowObjectTable {
......
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