diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/DebuggingControlAction.java b/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/DebuggingControlAction.java index ed58908..ba41fca 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/DebuggingControlAction.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/DebuggingControlAction.java @@ -1,13 +1,8 @@ package org.ntlab.debuggingControl; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Scanner; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; @@ -17,7 +12,6 @@ import org.eclipse.debug.internal.core.LaunchManager; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; @@ -32,11 +26,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PartInitException; -import org.ntlab.reverseDebugger.ObjectFlowAliases; -import org.ntlab.reverseDebugger.analyzerProvider.ReverseDebuggerAnalyzer; -import org.ntlab.reverseDebugger.analyzerProvider.ReverseDebuggerAnalyzerCallTester; -import com.sun.jdi.AbsentInformationException; import com.sun.jdi.BooleanValue; import com.sun.jdi.ByteValue; import com.sun.jdi.CharValue; @@ -49,7 +39,6 @@ import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.LocalVariable; import com.sun.jdi.Location; import com.sun.jdi.LongValue; import com.sun.jdi.Method; @@ -62,6 +51,7 @@ import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class DebuggingControlAction implements IWorkbenchWindowActionDelegate { @Override diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/SpeedTester.java b/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/SpeedTester.java index 4cd8c8b..824b970 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/SpeedTester.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/debuggingControl/SpeedTester.java @@ -8,13 +8,12 @@ import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.LongValue; import com.sun.jdi.ObjectReference; import com.sun.jdi.StringReference; import com.sun.jdi.ThreadReference; -import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class SpeedTester { private static final String TRACE = "org.ntlab.traceCollector.tracer.trace"; @@ -60,7 +59,7 @@ afterTime = System.nanoTime(); break; } - System.out.println("Exp " + "(" + type.getTypeName() + ")," + (afterTime - beforeTime)); + System.out.println("Exp " + "(" + type.getTypeName() + ")," + (afterTime - beforeTime) + ", count: " + count); } } diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIDebuggingVirtualMachine.java b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIDebuggingVirtualMachine.java index a94fd82..8e2f9df 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIDebuggingVirtualMachine.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIDebuggingVirtualMachine.java @@ -7,6 +7,7 @@ import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class JDIDebuggingVirtualMachine { public static VirtualMachine getDebuggineVirtualMachine() diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIInstanceMethodCaller.java b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIInstanceMethodCaller.java index 568e97b..6b188da 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIInstanceMethodCaller.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIInstanceMethodCaller.java @@ -1,27 +1,20 @@ package org.ntlab.onlineAccessor; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.jdi.TimeoutException; -import org.eclipse.jdt.core.Signature; - -import com.sun.jdi.ClassLoaderReference; import com.sun.jdi.ClassNotLoadedException; import com.sun.jdi.ClassType; import com.sun.jdi.IncompatibleThreadStateException; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.LongValue; import com.sun.jdi.Method; import com.sun.jdi.ObjectReference; -import com.sun.jdi.ReferenceType; -import com.sun.jdi.StringReference; import com.sun.jdi.ThreadReference; import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class JDIInstanceMethodCaller extends JDIStaticMethodCaller { private ObjectReference receiver; @@ -50,6 +43,6 @@ ClassType type = (ClassType)receiver.type(); List methodsByName = type.methodsByName(methodName); List argList = Arrays.asList(args); // ���\�b�h�ɓn�������̃��X�g - return receiver.invokeMethod(thread, methodsByName.get(0), argList, thread.INVOKE_SINGLE_THREADED); // �f�o�b�O���̃v���O�������̃��\�b�h���Ăяo�� + return receiver.invokeMethod(thread, methodsByName.get(0), argList, ThreadReference.INVOKE_SINGLE_THREADED); // �f�o�b�O���̃v���O�������̃��\�b�h���Ăяo�� } } diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIStaticMethodCaller.java b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIStaticMethodCaller.java index 0f48d30..29d469e 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIStaticMethodCaller.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/onlineAccessor/JDIStaticMethodCaller.java @@ -16,6 +16,7 @@ import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class JDIStaticMethodCaller { protected VirtualMachine vm; protected ThreadReference thread; @@ -38,7 +39,7 @@ List methodsByName = type.methodsByName("getId"); List argList = new ArrayList<>(); try { - return ((LongValue)thread.invokeMethod(thread, methodsByName.get(0), argList, thread.INVOKE_SINGLE_THREADED)).value(); + return ((LongValue)thread.invokeMethod(thread, methodsByName.get(0), argList, ThreadReference.INVOKE_SINGLE_THREADED)).value(); } catch (InvalidTypeException | ClassNotLoadedException | IncompatibleThreadStateException | InvocationException e) { e.printStackTrace(); @@ -66,12 +67,12 @@ List methodsByName = type.methodsByName("forName"); List argList = new ArrayList<>(); argList.add(vm.mirrorOf(fqcn)); - type.invokeMethod(thread, methodsByName.get(0), argList, thread.INVOKE_SINGLE_THREADED); + type.invokeMethod(thread, methodsByName.get(0), argList, ThreadReference.INVOKE_SINGLE_THREADED); classes = vm.classesByName(fqcn); // �N���X�� (���S����N���X��) } ClassType type = (ClassType)classes.get(0); List methodsByName = type.methodsByName(methodName); List argList = Arrays.asList(args); // ���\�b�h�ɓn�������̃��X�g - return type.invokeMethod(thread, methodsByName.get(0), argList, thread.INVOKE_SINGLE_THREADED); // �f�o�b�O���̃v���O�������̃��\�b�h���Ăяo�� + return type.invokeMethod(thread, methodsByName.get(0), argList, ThreadReference.INVOKE_SINGLE_THREADED); // �f�o�b�O���̃v���O�������̃��\�b�h���Ăяo�� } } diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackLabelProvider.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackLabelProvider.java index f4092df..6f14937 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackLabelProvider.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackLabelProvider.java @@ -5,17 +5,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; -import org.ntlab.onlineAccessor.JDIInstanceMethodCaller; import org.ntlab.onlineAccessor.JDIStaticMethodCaller; -import com.sun.jdi.ClassNotLoadedException; -import com.sun.jdi.IncompatibleThreadStateException; -import com.sun.jdi.InvalidTypeException; -import com.sun.jdi.InvocationException; -import com.sun.jdi.ObjectReference; -import com.sun.jdi.StringReference; -import com.sun.jdi.ThreadReference; - public class CallStackLabelProvider extends LabelProvider { @Override diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModel.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModel.java index 67fc30a..6eeccd0 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModel.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModel.java @@ -4,7 +4,6 @@ import com.sun.jdi.ClassNotLoadedException; import com.sun.jdi.IncompatibleThreadStateException; -import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; import com.sun.jdi.ObjectReference; @@ -13,6 +12,7 @@ import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class CallStackModel { private JDIInstanceMethodCaller methodExecutionMc; private int callLineNo; diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModels.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModels.java index a108b10..d516d6a 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModels.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/CallStackModels.java @@ -14,10 +14,9 @@ import com.sun.jdi.InvocationException; import com.sun.jdi.ObjectReference; import com.sun.jdi.ThreadReference; -import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; -import com.sun.jdi.event.MethodEntryEvent; +@SuppressWarnings("restriction") public class CallStackModels { private List callStackModels = new ArrayList<>(); diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/JavaEditorOperator.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/JavaEditorOperator.java index ad6857f..2927341 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/JavaEditorOperator.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/JavaEditorOperator.java @@ -24,10 +24,8 @@ import com.sun.jdi.InvocationException; import com.sun.jdi.ObjectReference; import com.sun.jdi.StringReference; -import com.sun.jdi.ThreadReference; -import com.sun.jdi.Value; -import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class JavaEditorOperator { private static final String TRACE = "org.ntlab.traceAnalysisPlatform.tracer.trace"; @@ -81,7 +79,6 @@ if (projectPath != null) { IJavaProject javaProject = findJavaProject(projectPath); if (javaProject != null) { - StringReference methodSignature = (StringReference)meCaller.callInstanceMethod("getSignature"); try { type = javaProject.findType(declaringClassName.value()); } catch (JavaModelException e) { diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasLabelProvider.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasLabelProvider.java index 63defbb..537a3ef 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasLabelProvider.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasLabelProvider.java @@ -12,9 +12,9 @@ import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.ObjectReference; import com.sun.jdi.StringReference; +@SuppressWarnings("restriction") public class ObjectFlowAliasLabelProvider extends LabelProvider implements ITableLabelProvider { @Override diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasView.java index 2225bcf..f8c7a19 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliasView.java @@ -8,7 +8,6 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -18,10 +17,8 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.ntlab.onlineAccessor.JDIInstanceMethodCaller; diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliases.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliases.java index a1cd883..5e1f4a4 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliases.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ObjectFlowAliases.java @@ -4,7 +4,6 @@ import java.util.List; import org.ntlab.onlineAccessor.JDIInstanceMethodCaller; -import org.ntlab.onlineAccessor.JDIStaticMethodCaller; import org.ntlab.reverseDebugger.analyzerProvider.ReverseDebuggerLaunchConfiguration; import com.sun.jdi.ClassNotLoadedException; @@ -13,9 +12,8 @@ import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; import com.sun.jdi.ObjectReference; -import com.sun.jdi.Value; -import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class ObjectFlowAliases { private List> objectFlowAliases = new ArrayList<>(); diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ReverseDebuggerPerspective.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ReverseDebuggerPerspective.java index 6cbde35..6eb0664 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ReverseDebuggerPerspective.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/ReverseDebuggerPerspective.java @@ -3,7 +3,6 @@ import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; -import org.eclipse.ui.part.IPage; public class ReverseDebuggerPerspective implements IPerspectiveFactory { diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliasLabelProvider.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliasLabelProvider.java index e72c7e3..2fb90d5 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliasLabelProvider.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliasLabelProvider.java @@ -12,10 +12,9 @@ import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.ObjectReference; import com.sun.jdi.StringReference; -import com.sun.jdi.Value; +@SuppressWarnings("restriction") public class SeedAliasLabelProvider extends LabelProvider implements ITableLabelProvider { @Override diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliases.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliases.java index 5fecae0..c0c9e7c 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliases.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/SeedAliases.java @@ -1,41 +1,28 @@ package org.ntlab.reverseDebugger; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Scanner; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.internal.core.LaunchManager; -import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; import org.ntlab.onlineAccessor.JDIDebuggingVirtualMachine; import org.ntlab.onlineAccessor.JDIInstanceMethodCaller; -import org.ntlab.onlineAccessor.JDIStaticMethodCaller; import org.ntlab.onlineAccessor.NotDebuggedException; import org.ntlab.onlineAccessor.NotExecutedException; import org.ntlab.onlineAccessor.NotSuspendedException; import org.ntlab.reverseDebugger.analyzerProvider.ReverseDebuggerLaunchConfiguration; import com.sun.jdi.ClassNotLoadedException; -import com.sun.jdi.ClassType; import com.sun.jdi.IncompatibleThreadStateException; import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; -import com.sun.jdi.Location; import com.sun.jdi.LongValue; -import com.sun.jdi.Method; import com.sun.jdi.ObjectReference; -import com.sun.jdi.ReferenceType; -import com.sun.jdi.StackFrame; import com.sun.jdi.StringReference; import com.sun.jdi.ThreadReference; import com.sun.jdi.Value; import com.sun.jdi.VirtualMachine; +@SuppressWarnings("restriction") public class SeedAliases { private JDIInstanceMethodCaller debuggerStopMethodExecution = null; private List seedAliases = new ArrayList<>(); diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/Alias.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/Alias.java index f919b24..86c9192 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/Alias.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/Alias.java @@ -85,22 +85,16 @@ Statement statement = occurrencePoint.getStatement(); String statementType = ""; if (statement instanceof FieldAccess) { - FieldAccess fa = (FieldAccess)statement; statementType = "FieldAccess"; } else if (statement instanceof FieldUpdate) { - FieldUpdate fu = (FieldUpdate)statement; statementType = "FieldUpdate"; } else if (statement instanceof ArrayAccess) { - ArrayAccess aa = (ArrayAccess)statement; statementType = "ArrayAccess"; } else if (statement instanceof ArrayUpdate) { - ArrayUpdate au = (ArrayUpdate)statement; statementType = "ArrayUpdate"; } else if (statement instanceof ArrayCreate) { - ArrayCreate ac = (ArrayCreate)statement; statementType = "ArrayCreate"; } else if (statement instanceof MethodInvocation) { - MethodExecution me = ((MethodInvocation)statement).getCalledMethodExecution(); statementType = "MethodInvocation"; } return statementType; diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/ReverseDebuggerAnalyzerCallTester.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/ReverseDebuggerAnalyzerCallTester.java index 0159bd0..6e69c9b 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/ReverseDebuggerAnalyzerCallTester.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/analyzerProvider/ReverseDebuggerAnalyzerCallTester.java @@ -1,6 +1,5 @@ package org.ntlab.reverseDebugger.analyzerProvider; -import org.ntlab.onlineAccessor.JDIInstanceMethodCaller; import org.ntlab.onlineAccessor.JDIStaticMethodCaller; import com.sun.jdi.ClassNotLoadedException; @@ -16,6 +15,7 @@ * @author student * */ +@SuppressWarnings("restriction") public class ReverseDebuggerAnalyzerCallTester { public void test1(VirtualMachine vm, ThreadReference thread) {