Bug 461682 - Move JDT Debug project to 1.7 compliance
Change-Id: I180610417ccff2d8551eda20c7ba84676bfb0d6f
diff --git a/org.eclipse.jdt.debug.jdi.tests/.classpath b/org.eclipse.jdt.debug.jdi.tests/.classpath
index 1c19094..8ce5833 100644
--- a/org.eclipse.jdt.debug.jdi.tests/.classpath
+++ b/org.eclipse.jdt.debug.jdi.tests/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="tests"/>
<classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
index 89aba27..9a49fb5 100644
--- a/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
index 5bb9b4f..ac1d57b 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
index da8d6bc..a07ae86 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,42 +47,49 @@
/**
* @see org.eclipse.debug.jdi.tests.EventListener#accessWatchpoint(com.sun.jdi.event.AccessWatchpointEvent)
*/
+ @Override
public boolean accessWatchpoint(AccessWatchpointEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#methodEntry(com.sun.jdi.event.MethodEntryEvent)
*/
+ @Override
public boolean methodEntry(MethodEntryEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#methodExit(com.sun.jdi.event.MethodExitEvent)
*/
+ @Override
public boolean methodExit(MethodExitEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#breakpoint(com.sun.jdi.event.BreakpointEvent)
*/
+ @Override
public boolean breakpoint(BreakpointEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#classPrepare(com.sun.jdi.event.ClassPrepareEvent)
*/
+ @Override
public boolean classPrepare(ClassPrepareEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#classUnload(com.sun.jdi.event.ClassUnloadEvent)
*/
+ @Override
public boolean classUnload(ClassUnloadEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#exception(com.sun.jdi.event.ExceptionEvent)
*/
+ @Override
public boolean exception(ExceptionEvent event) {
return handleEvent(event);
}
@@ -100,6 +107,7 @@
/**
* @see org.eclipse.debug.jdi.tests.EventListener#modificationWatchpoint(com.sun.jdi.event.ModificationWatchpointEvent)
*/
+ @Override
public boolean modificationWatchpoint(ModificationWatchpointEvent event) {
return handleEvent(event);
}
@@ -113,24 +121,28 @@
/**
* @see org.eclipse.debug.jdi.tests.EventListener#step(com.sun.jdi.event.StepEvent)
*/
+ @Override
public boolean step(StepEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#threadDeath(com.sun.jdi.event.ThreadDeathEvent)
*/
+ @Override
public boolean threadDeath(ThreadDeathEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#threadStart(com.sun.jdi.event.ThreadStartEvent)
*/
+ @Override
public boolean threadStart(ThreadStartEvent event) {
return handleEvent(event);
}
/**
* @see org.eclipse.debug.jdi.tests.EventListener#vmDeath(com.sun.jdi.event.VMDeathEvent)
*/
+ @Override
public boolean vmDeath(VMDeathEvent event) {
if (fEvent == null) {
// This is the last event we can ever get an this was not the one we expected
@@ -142,6 +154,7 @@
/**
* @see org.eclipse.debug.jdi.tests.EventListener#vmDisconnect(com.sun.jdi.event.VMDisconnectEvent)
*/
+ @Override
public boolean vmDisconnect(VMDisconnectEvent event) {
return handleEvent(event);
}
@@ -151,8 +164,9 @@
* @throws InterruptedException
*/
synchronized public Event waitEvent() throws InterruptedException {
- if (fEvent == null) // If event didn't already come in
+ if (fEvent == null) {
wait();
+ }
Event result = fEvent;
fEvent = null;
return result;
@@ -166,8 +180,9 @@
*/
synchronized public Event waitEvent(long time)
throws InterruptedException {
- if (fEvent == null) // If event didn't already come in
+ if (fEvent == null) {
wait(time);
+ }
Event result = fEvent;
fEvent = null;
return result;
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
index 67b0844..b5f6e8c 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -124,10 +124,11 @@
* @return a string object representing the specified interger value
*/
private static String invoke1(int x, Object o) {
- if (o == null)
+ if (o == null) {
return (new Integer(x)).toString();
- else
+ } else {
return "";
+ }
}
/**
* For invocation tests
@@ -172,15 +173,17 @@
fMainThread = Thread.currentThread();
// Prevent this thread from dying
- while (true)
+ while (true) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
+ }
}
/**
* @see org.eclipse.debug.jdi.tests.program.Printable#print(java.io.OutputStream)
*/
+ @Override
public void print(OutputStream out) {
String string = fInt++ +". " + fString;
PrintWriter writer = new PrintWriter(out);
@@ -279,14 +282,16 @@
/**
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {
try {
Thread t = Thread.currentThread();
MainClass o = new OtherClass();
// The front-end tests use the class load event to determine that the program has started
- if (CONSTANT == 2)
+ if (CONSTANT == 2) {
System.out.println("CONSTANT=2");
+ }
while (true) {
printAndSignal();
@@ -305,8 +310,9 @@
* Trigger an access watchpoint event for the front-end.
*/
private void triggerAccessWatchpointEvent() {
- if (fBool)
+ if (fBool) {
System.out.println("fBool is true");
+ }
}
/**
* Trigger a breakpoint event for the front-end.
@@ -379,9 +385,9 @@
fEventType = "";
/* Trigger event according to the field fEventType */
- if (eventType.equals(""))
+ if (eventType.equals("")) {
return;
- else if(eventType.equals("refclassload")) {
+ } else if(eventType.equals("refclassload")) {
new RefClass();
}
else if(eventType.equals("fooreturn")) {
@@ -416,42 +422,43 @@
getBoolean();
} else if (eventType.equals("getLong")) {
getLong();
- } else if (eventType.equals("AccessWatchpointEvent"))
+ } else if (eventType.equals("AccessWatchpointEvent")) {
triggerAccessWatchpointEvent();
- else if (eventType.equals("StaticAccessWatchpointEvent"))
+ } else if (eventType.equals("StaticAccessWatchpointEvent")) {
triggerStaticAccessWatchpointEvent();
- else if (eventType.equals("BreakpointEvent"))
+ } else if (eventType.equals("BreakpointEvent")) {
triggerBreakpointEvent();
- else if (eventType.equals("ClassPrepareEvent"))
+ } else if (eventType.equals("ClassPrepareEvent")) {
triggerClassPrepareEvent();
- else if (eventType.equals("ClassPrepareEvent1"))
+ } else if (eventType.equals("ClassPrepareEvent1")) {
triggerClassPrepareEvent1();
- else if (eventType.equals("ClassPrepareEvent2"))
+ } else if (eventType.equals("ClassPrepareEvent2")) {
triggerClassPrepareEvent2();
- else if (eventType.equals("ClassPrepareEvent3"))
+ } else if (eventType.equals("ClassPrepareEvent3")) {
triggerClassPrepareEvent3();
- else if (eventType.equals("ClassPrepareEvent4"))
+ } else if (eventType.equals("ClassPrepareEvent4")) {
triggerClassPrepareEvent4();
- else if (eventType.equals("ClassPrepareEvent5"))
+ } else if (eventType.equals("ClassPrepareEvent5")) {
triggerClassPrepareEvent5();
- else if (eventType.equals("ClassPrepareEvent6"))
+ } else if (eventType.equals("ClassPrepareEvent6")) {
triggerClassPrepareEvent6();
- else if (eventType.equals("ClassPrepareEvent7"))
+ } else if (eventType.equals("ClassPrepareEvent7")) {
triggerClassPrepareEvent7();
- else if (eventType.equals("ClassPrepareEvent8"))
+ } else if (eventType.equals("ClassPrepareEvent8")) {
triggerClassPrepareEvent8();
- else if (eventType.equals("ExceptionEvent"))
+ } else if (eventType.equals("ExceptionEvent")) {
triggerExceptionEvent();
- else if (eventType.equals("ModificationWatchpointEvent"))
+ } else if (eventType.equals("ModificationWatchpointEvent")) {
triggerModificationWatchpointEvent();
- else if (eventType.equals("StaticModificationWatchpointEvent"))
+ } else if (eventType.equals("StaticModificationWatchpointEvent")) {
triggerStaticModificationWatchpointEvent();
- else if (eventType.equals("ThreadStartEvent"))
+ } else if (eventType.equals("ThreadStartEvent")) {
triggerThreadStartEvent();
- else if (eventType.equals("ThreadDeathEvent"))
+ } else if (eventType.equals("ThreadDeathEvent")) {
triggerThreadDeathEvent();
- else
+ } else {
System.out.println("Unknown event type: " + eventType);
+ }
}
/**
@@ -459,6 +466,7 @@
*/
private void triggerExceptionEvent() {
Thread t = new Thread(new Runnable() {
+ @Override
public void run() {
throw new Error();
}
@@ -476,8 +484,9 @@
* for the front-end.
*/
private void triggerStaticAccessWatchpointEvent() {
- if (fObject == null)
+ if (fObject == null) {
System.out.println("fObject is null");
+ }
}
/**
* Trigger a modification watchpoint event of a static field
@@ -499,10 +508,12 @@
new Thread("Test Thread Start Event").start();
}
private void useLocalVars(Thread t, MainClass o) {
- if (t == null)
+ if (t == null) {
System.out.println("t is null");
- if (o == null)
+ }
+ if (o == null) {
System.out.println("o is null");
+ }
}
}
diff --git a/org.eclipse.jdt.debug.tests/.classpath b/org.eclipse.jdt.debug.tests/.classpath
index 4b8ab5a..f771995 100644
--- a/org.eclipse.jdt.debug.tests/.classpath
+++ b/org.eclipse.jdt.debug.tests/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="test plugin"/>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="src" path="console tests"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="test plugin"/>
+ <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="src" path="console tests"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
index 3bc137e..230e559 100644
--- a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
index 2994fe4..732958b 100644
--- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.8.300.qualifier
+Bundle-Version: 3.9.0.qualifier
Bundle-ClassPath: javadebugtests.jar
Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
Bundle-Vendor: %providerName
@@ -49,5 +49,5 @@
org.eclipse.jdt.core.manipulation,
org.eclipse.core.filesystem
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Eclipse-BundleShape: dir
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
index 0a73426..410fb00 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,29 +38,34 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
- public void init(IAction action) {
+ @Override
+ public void init(IAction action) {
}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
- public void runWithEvent(IAction action, Event event) {
+ @Override
+ public void runWithEvent(IAction action, Event event) {
run(action);
}
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
final IOConsole console = new IOConsole("IO Test Console", null, DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
new Thread(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
runTest(console);
}
}, "IOConsole Test Thread").start(); //$NON-NLS-1$
@@ -75,7 +80,8 @@
final IOConsoleInputStream in = console.getInputStream();
display.asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
in.setColor(display.getSystemColor(SWT.COLOR_BLUE));
}
});
@@ -84,7 +90,8 @@
final IOConsoleOutputStream out = console.newOutputStream();
Display.getDefault().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
out.setColor(Display.getDefault().getSystemColor(SWT.COLOR_GREEN));
out.setFontStyle(SWT.ITALIC);
}
@@ -113,13 +120,15 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
- public void init(IWorkbenchWindow window) {
+ @Override
+ public void init(IWorkbenchWindow window) {
}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
index e93ee42..a99e248 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,22 +40,26 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
final IOConsole backingconsole = new IOConsole("IO Test Console", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
backingconsole.setConsoleWidth(17);
IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
manager.addConsoles(new IConsole[] { backingconsole });
IPatternMatchListener listener = new IPatternMatchListener() {
- public String getPattern() {
+ @Override
+ public String getPattern() {
return "1234567890"; //$NON-NLS-1$
}
- public String getLineQualifier() {
+ @Override
+ public String getLineQualifier() {
return "1234567890"; //$NON-NLS-1$
}
- public void matchFound(PatternMatchEvent event) {
+ @Override
+ public void matchFound(PatternMatchEvent event) {
try {
backingconsole.addHyperlink(new MyHyperlink(), event.getOffset(), event.getLength());
} catch (BadLocationException e) {
@@ -63,14 +67,17 @@
}
}
- public int getCompilerFlags() {
+ @Override
+ public int getCompilerFlags() {
return 0;
}
- public void connect(TextConsole console) {
+ @Override
+ public void connect(TextConsole console) {
}
- public void disconnect() {
+ @Override
+ public void disconnect() {
}
};
@@ -79,7 +86,8 @@
stream.setFontStyle(SWT.ITALIC | SWT.BOLD);
final PrintStream out = new PrintStream(stream);
new Thread(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
out.println("Hyperlink -12345678901234567890-");
}
}).start();
@@ -89,21 +97,24 @@
/**
* @see org.eclipse.ui.console.IHyperlink#linkEntered()
*/
- public void linkEntered() {
+ @Override
+ public void linkEntered() {
System.out.println("link entered");
}
/**
* @see org.eclipse.ui.console.IHyperlink#linkExited()
*/
- public void linkExited() {
+ @Override
+ public void linkExited() {
System.out.println("link exited");
}
/**
* @see org.eclipse.ui.console.IHyperlink#linkActivated()
*/
- public void linkActivated() {
+ @Override
+ public void linkActivated() {
System.out.println("link activated");
}
}
@@ -111,32 +122,37 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
- public void init(IAction action) {
+ @Override
+ public void init(IAction action) {
}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
- public void runWithEvent(IAction action, Event event) {
+ @Override
+ public void runWithEvent(IAction action, Event event) {
run(action);
}
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
- public void init(IWorkbenchWindow window) {
+ @Override
+ public void init(IWorkbenchWindow window) {
}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
index bd95903..c0f3a33 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,24 +41,28 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
- public void init(IAction action) {}
+ @Override
+ public void init(IAction action) {}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
- public void dispose() {}
+ @Override
+ public void dispose() {}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
- public void runWithEvent(IAction action, Event event) {
+ @Override
+ public void runWithEvent(IAction action, Event event) {
run(action);
}
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
runTest();
}
@@ -79,7 +83,8 @@
final IOConsoleInputStream in = console.getInputStream();
final IOConsoleOutputStream echo = console.newOutputStream();
display.asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
in.setColor(display.getSystemColor(SWT.COLOR_BLUE));
echo.setColor(display.getSystemColor(SWT.COLOR_RED));
}
@@ -92,7 +97,8 @@
private void startOutputThread(final IOConsoleOutputStream out) {
new Thread(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
int i = 1;
PrintStream ps = new PrintStream(out);
ps.println("Enter 'XXX' to stop"); //$NON-NLS-1$
@@ -111,7 +117,8 @@
private void startInputReadThread(final InputStream in, final OutputStream out) {
new Thread(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
byte b[] = new byte[1024];
while(!ended) {
@@ -134,10 +141,12 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {}
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
- public void init(IWorkbenchWindow window) {}
+ @Override
+ public void init(IWorkbenchWindow window) {}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
index 9e7efc7..0f40223 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,30 +34,35 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
- public void init(IAction action) {}
+ @Override
+ public void init(IAction action) {}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
- public void dispose() {}
+ @Override
+ public void dispose() {}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
- public void runWithEvent(IAction action, Event event) {
+ @Override
+ public void runWithEvent(IAction action, Event event) {
run(action);
}
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
IOConsole console = new IOConsole("Test IOConsole", null, DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
manager.addConsoles(new IConsole[]{console});
OutputStream out = console.newOutputStream();
final PrintStream stream = new PrintStream(out);
Runnable r = new Runnable() {
+ @Override
public void run() {
long start = System.currentTimeMillis();
for (int i = 0; i < 1000; i++) {
@@ -75,10 +80,12 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {}
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
- public void init(IWorkbenchWindow window) {}
+ @Override
+ public void init(IWorkbenchWindow window) {}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
index 6cce6f9..449ec6d 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,27 +68,31 @@
/**
* @see org.eclipse.ui.console.IPatternMatchListener#getPattern()
*/
- public String getPattern() {
+ @Override
+ public String getPattern() {
return "foo";
}
/**
* @see org.eclipse.ui.console.IPatternMatchListener#getLineQualifier()
*/
- public String getLineQualifier() {
+ @Override
+ public String getLineQualifier() {
return "foo";
}
/**
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#matchFound(org.eclipse.ui.console.PatternMatchEvent)
*/
- public synchronized void matchFound(PatternMatchEvent event) {
+ @Override
+ public synchronized void matchFound(PatternMatchEvent event) {
fMatchCount++;
}
/**
* @see org.eclipse.ui.console.IPatternMatchListener#getCompilerFlags()
*/
+ @Override
public int getCompilerFlags() {
return 0;
}
@@ -96,12 +100,14 @@
/**
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole)
*/
- public void connect(TextConsole console) {}
+ @Override
+ public void connect(TextConsole console) {}
/**
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#disconnect()
*/
- public synchronized void disconnect() {
+ @Override
+ public synchronized void disconnect() {
fDisconnected = true;
notifyAll();
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
index 0cd25f0..0dac974 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,16 +42,19 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
@@ -59,6 +62,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
try {
DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().showView(IConsoleConstants.ID_CONSOLE_VIEW);
@@ -70,6 +74,7 @@
manager.addConsoles(new IConsole[]{console});
final MessageConsoleStream stream = console.newMessageStream();
Runnable r = new Runnable() {
+ @Override
public void run() {
long start = System.currentTimeMillis();
for (int i = 0; i < 1000; i++) {
@@ -87,11 +92,13 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
index 1cdae31..5cdfa83 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,16 +38,19 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {}
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
@@ -55,6 +58,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
try {
DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().showView(IConsoleConstants.ID_CONSOLE_VIEW);
@@ -77,11 +81,13 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {}
}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
index 22f44ab..60514fc 100644
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
+++ b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {
console1 = new MessageConsole("Test Console #1", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
console2 = new MessageConsole("Test Console #2", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
@@ -49,11 +50,13 @@
/**
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {}
/**
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
@@ -61,6 +64,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
final MessageConsoleStream stream1 = console1.newMessageStream();
final MessageConsoleStream stream2 = console2.newMessageStream();
@@ -68,6 +72,7 @@
stream2.setColor(Display.getDefault().getSystemColor(SWT.COLOR_RED));
new Thread(new Runnable() {
+ @Override
public void run() {
//write to console #1, show it, write again
@@ -105,10 +110,12 @@
/**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {}
/**
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {}
}
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index 2abb6f4..49363ee 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
- <version>3.8.300-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/AccessRuleParticipant.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/AccessRuleParticipant.java
index f3f54d1..c280b59 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/AccessRuleParticipant.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/AccessRuleParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
/**
* @see org.eclipse.jdt.launching.environments.IAccessRuleParticipant#getAccessRules(org.eclipse.jdt.launching.environments.IExecutionEnvironment, org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.LibraryLocation[], org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IAccessRule[][] getAccessRules(IExecutionEnvironment environment, IVMInstall vm, LibraryLocation[] libraries, IJavaProject project) {
IAccessRule[][] rules = new IAccessRule[libraries.length][];
for (int i = 0; i < libraries.length; i++) {
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
index bb3f7f2..3728003 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
*/
+ @Override
public void dispose() {
if (fDelegate != null) {
fDelegate.dispose();
@@ -49,6 +50,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
*/
+ @Override
public synchronized void init(IConsole console) {
fConsole= console;
if (fDelegate != null) {
@@ -67,6 +69,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
*/
+ @Override
public void lineAppended(IRegion line) {
if (fDelegate != null) {
fDelegate.lineAppended(line);
@@ -76,6 +79,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
*/
+ @Override
public void consoleClosed() {
if (fDelegate != null && fConsole != null) {
fDelegate.consoleClosed();
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
index 460469c..39755cd 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,6 +101,7 @@
/**
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
+ @Override
public synchronized void handleDebugEvents(DebugEvent[] events) {
//printReceived(events);
for (int i = 0; i < events.length; i++) {
@@ -152,8 +153,9 @@
}
}
unregister();
- if (fEvent == null)
+ if (fEvent == null) {
return null;
+ }
return fEvent.getSource();
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
index 8fdeb11..e97b676 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
/**
* @see IRuntimeClasspathProvider#computeUnresolvedClasspath(ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) {
return new IRuntimeClasspathEntry[0];
}
@@ -29,6 +30,7 @@
/**
* @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) {
return new IRuntimeClasspathEntry[0];
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EvalualtionBreakpointListener.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EvalualtionBreakpointListener.java
index f49c645..9ea7ebb 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EvalualtionBreakpointListener.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EvalualtionBreakpointListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,6 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.AssertionFailedError;
-
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
import org.eclipse.jdt.core.IJavaProject;
@@ -32,6 +30,8 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.debug.tests.AbstractDebugTest;
+import junit.framework.AssertionFailedError;
+
/**
* Test for breakpoint listener extension. Performs an evaluation while voting
* whether to resume a thread.
@@ -103,12 +103,14 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
COMPILATION_ERRORS.add(breakpoint);
}
@@ -116,6 +118,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
RUNTIME_ERRORS.add(breakpoint);
}
@@ -123,6 +126,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
HIT = true;
final Object lock = new Object();
@@ -130,6 +134,7 @@
if (PROJECT != null && EXPRESSION != null) {
IAstEvaluationEngine engine = EvaluationManager.newAstEvaluationEngine(PROJECT, (IJavaDebugTarget) thread.getDebugTarget());
IEvaluationListener listener = new IEvaluationListener(){
+ @Override
public void evaluationComplete(IEvaluationResult result) {
RESULT = result;
synchronized (lock) {
@@ -154,12 +159,14 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
REMOVED = true;
synchronized (REMOVE_LOCK) {
@@ -170,6 +177,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return IJavaBreakpointListener.DONT_CARE;
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/GlobalBreakpointListener.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/GlobalBreakpointListener.java
index be167bd..3ddfac2 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/GlobalBreakpointListener.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/GlobalBreakpointListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,29 +41,36 @@
public GlobalBreakpointListener() {
}
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
ADDED = breakpoint;
}
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
}
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
}
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
HIT = breakpoint;
return DONT_CARE;
}
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
INSTALLED = breakpoint;
}
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
REMOVED = breakpoint;
}
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
INSTALLING = breakpoint;
return DONT_CARE;
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaAlernateModeTab.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaAlernateModeTab.java
index 664ebe7..4710fb6 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaAlernateModeTab.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaAlernateModeTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return "Alternate";
}
@@ -63,16 +64,19 @@
/**
* @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void launchConfigurationAdded(ILaunchConfiguration configuration) {}
/**
* @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void launchConfigurationRemoved(ILaunchConfiguration configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
launchConfigurationChanged(configuration);
}
@@ -80,6 +84,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (fAlternateModeCheckBox.getSelection()) {
configuration.addModes(getModes());
@@ -92,11 +97,13 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
fAlternateModeCheckBox = new Button(parent, SWT.CHECK);
fAlternateModeCheckBox.setText("Check &me for 'alternate' mode");
@@ -121,12 +128,14 @@
/**
* @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void launchConfigurationChanged(final ILaunchConfiguration configuration) {
if(DebugUIPlugin.getStandardDisplay().getThread().equals(Thread.currentThread())) {
setWidget(configuration);
}
else {
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
setWidget(configuration);
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
index 7f4303f..5ca277a 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -355,14 +355,8 @@
public static IPackageFragmentRoot addLibraryWithImport(IJavaProject jproject, IPath jarPath, IPath sourceAttachPath, IPath sourceAttachRoot) throws IOException, CoreException {
IProject project= jproject.getProject();
IFile newFile= project.getFile(jarPath.lastSegment());
- InputStream inputStream= null;
- try {
- inputStream= new FileInputStream(jarPath.toFile());
+ try (InputStream inputStream = new FileInputStream(jarPath.toFile())) {
newFile.create(inputStream, true, null);
- } finally {
- if (inputStream != null) {
- try { inputStream.close(); } catch (IOException e) { }
- }
}
return addLibrary(jproject, newFile.getFullPath(), sourceAttachPath, sourceAttachRoot);
}
@@ -599,6 +593,7 @@
/**
* @see org.eclipse.ui.dialogs.IOverwriteQuery#queryOverwrite(java.lang.String)
*/
+ @Override
public String queryOverwrite(String file) {
return ALL;
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ResumeBreakpointListener.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ResumeBreakpointListener.java
index f5454a2..80753c9 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ResumeBreakpointListener.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ResumeBreakpointListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,26 +26,33 @@
public ResumeBreakpointListener() {
}
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
}
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
}
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
WAS_HIT = true;
return IJavaBreakpointListener.DONT_SUSPEND;
}
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return IJavaBreakpointListener.DONT_CARE;
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
index f634305..4c67301 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
/**
* @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
*/
+ @Override
public String resolveValue(IDynamicVariable variable, String argument) {
if (argument == null) {
return "no arg";
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SecondaryAccessRuleParticipant.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SecondaryAccessRuleParticipant.java
index d7486ee..bdc1d65 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SecondaryAccessRuleParticipant.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SecondaryAccessRuleParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/**
* @see org.eclipse.jdt.launching.environments.IAccessRuleParticipant#getAccessRules(org.eclipse.jdt.launching.environments.IExecutionEnvironment, org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.LibraryLocation[], org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IAccessRule[][] getAccessRules(IExecutionEnvironment environment, IVMInstall vm, LibraryLocation[] libraries, IJavaProject project) {
IAccessRule[] ar = null;
if (environment.getId().equals("org.eclipse.jdt.debug.tests.environment.j2se14x")) {
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
index 139e2e9..db40424 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,5 +20,6 @@
/**
* @see org.eclipse.debug.core.sourcelookup.ISourceLookupDirector#initializeParticipants()
*/
+ @Override
public void initializeParticipants() {}
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
index bd54e14..e54dafc 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
/**
* @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
return new ISourceContainer[0];
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
index 0aac9a3..d772100 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
/**
* @see org.eclipse.core.variables.IValueVariableInitializer#initialize(org.eclipse.core.variables.IValueVariable)
*/
+ @Override
public void initialize(IValueVariable variable) {
variable.setValue("initial-value");
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/SimpleDetailPane.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/SimpleDetailPane.java
index 6dccff0..440bd77 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/SimpleDetailPane.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/SimpleDetailPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.ui.IDetailPane;
import org.eclipse.jdt.debug.core.IJavaVariable;
+import org.eclipse.jdt.debug.tests.ui.DetailPaneManagerTests;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -56,6 +57,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Control createControl(Composite parent) {
theLabel = new Label(parent, SWT.NONE);
GridData gd = new GridData(GridData.FILL_BOTH);
@@ -97,6 +99,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void display(IStructuredSelection selection) {
if (selection == null || selection.size() == 0){
theLabel.setBackground(theLabel.getParent().getBackground());
@@ -131,16 +134,26 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#dispose()
*/
+ @Override
public void dispose() {
- if (colorPrivate != null) colorPrivate.dispose();
- if (colorProtected != null) colorProtected.dispose();
- if (colorPublic != null) colorPublic.dispose();
- if (colorOther != null) colorOther.dispose();
+ if (colorPrivate != null) {
+ colorPrivate.dispose();
+ }
+ if (colorProtected != null) {
+ colorProtected.dispose();
+ }
+ if (colorPublic != null) {
+ colorPublic.dispose();
+ }
+ if (colorOther != null) {
+ colorOther.dispose();
+ }
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getDescription()
*/
+ @Override
public String getDescription() {
return DESCRIPTION;
}
@@ -148,6 +161,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getID()
*/
+ @Override
public String getID() {
return ID;
}
@@ -155,6 +169,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getName()
*/
+ @Override
public String getName() {
return NAME;
}
@@ -162,12 +177,14 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
*/
+ @Override
public void init(IWorkbenchPartSite partSite) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#setFocus()
*/
+ @Override
public boolean setFocus() {
return false;
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java
index 49e2d0f..63d2f8c 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TableDetailPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,6 +72,7 @@
fListener = listener;
}
+ @Override
public void run() {
fModelPresentation.computeDetail(fValue, fListener);
}
@@ -81,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
*/
+ @Override
public void init(IWorkbenchPartSite workbenchPartSite) {
fWorkbenchPartSite = workbenchPartSite;
@@ -90,6 +92,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Control createControl(Composite parent) {
fComposite = new Composite(parent, SWT.NONE);
fComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -97,10 +100,12 @@
fTable = new Table(fComposite,SWT.FULL_SELECTION);
fTable.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
}
+ @Override
public void widgetSelected(SelectionEvent e) {
int index = fTable.getSelectionIndex();
if (index >= 0){
@@ -126,9 +131,11 @@
fWordWrapButton.setText("Word Wrap");
fWordWrapButton.setSelection(false);
fWordWrapButton.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
}
+ @Override
public void widgetSelected(SelectionEvent e) {
fText.getTextWidget().setWordWrap(fWordWrapButton.getSelection());
}
@@ -140,6 +147,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void display(IStructuredSelection element) {
if (element != null){
@@ -176,6 +184,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#setFocus()
*/
+ @Override
public boolean setFocus(){
if (fText != null){
fText.getTextWidget().setFocus();
@@ -187,14 +196,20 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#dispose()
*/
+ @Override
public void dispose() {
- if (fComposite != null) fComposite.dispose();
- if (fModelPresentation != null) fModelPresentation.dispose();
+ if (fComposite != null) {
+ fComposite.dispose();
+ }
+ if (fModelPresentation != null) {
+ fModelPresentation.dispose();
+ }
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getDescription()
*/
+ @Override
public String getDescription() {
return DESCRIPTION;
}
@@ -202,6 +217,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getID()
*/
+ @Override
public String getID() {
return ID;
}
@@ -209,6 +225,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#getName()
*/
+ @Override
public String getName() {
return NAME;
}
@@ -220,6 +237,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
*/
+ @Override
public void detailComputed(IValue value, final String result){
WorkbenchJob append = new WorkbenchJob("append details") { //$NON-NLS-1$
@Override
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TestDetailPaneFactory.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TestDetailPaneFactory.java
index ce225a7..872c650 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TestDetailPaneFactory.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/detailpane/TestDetailPaneFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
import org.eclipse.debug.ui.IDetailPane;
import org.eclipse.debug.ui.IDetailPaneFactory;
import org.eclipse.jdt.debug.core.IJavaVariable;
+import org.eclipse.jdt.debug.tests.ui.DetailPaneManagerTests;
import org.eclipse.jface.viewers.IStructuredSelection;
/**
@@ -33,6 +34,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String)
*/
+ @Override
public IDetailPane createDetailPane(String id) {
if (id.equals(TableDetailPane.ID)){
return new TableDetailPane();
@@ -46,6 +48,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDetailsTypes(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public Set<String> getDetailPaneTypes(IStructuredSelection selection) {
Set<String> possibleIDs = new HashSet<String>(2);
if (selection != null){
@@ -62,6 +65,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public String getDefaultDetailPane(IStructuredSelection selection) {
if (selection != null){
if (selection.size() > 1 && selection.getFirstElement() instanceof String){
@@ -76,6 +80,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String)
*/
+ @Override
public String getDetailPaneName(String id) {
if (id.equals(TableDetailPane.ID)){
return TableDetailPane.NAME;
@@ -90,6 +95,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String)
*/
+ @Override
public String getDetailPaneDescription(String id) {
if (id.equals(TableDetailPane.ID)){
return TableDetailPane.DESCRIPTION;
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab1.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab1.java
index 6f2100e..d77cd77 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab1.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Label label = new Label(parent, SWT.NONE);
label.setText("Just testing...");
@@ -36,6 +37,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return "Test Tab 1";
}
@@ -43,16 +45,19 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {}
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab2.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab2.java
index 526f924..90c1973 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab2.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Label label = new Label(parent, SWT.NONE);
label.setText("Just testing...");
@@ -35,6 +36,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return "Test Tab 2";
}
@@ -42,16 +44,19 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {}
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab3.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab3.java
index 7bbcadb..a1365ab 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab3.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ContributedTestTab3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Label label = new Label(parent, SWT.NONE);
label.setText("Just testing...");
@@ -35,6 +36,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return "Test Tab 3";
}
@@ -42,18 +44,21 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
}
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ParticipantLaunchShortcut.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ParticipantLaunchShortcut.java
index 46a38a2..1f9975d 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ParticipantLaunchShortcut.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/ParticipantLaunchShortcut.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {
return getConfigurations();
}
@@ -40,6 +41,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.ui.IEditorPart)
*/
+ @Override
public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) {
return getConfigurations();
}
@@ -61,6 +63,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public IResource getLaunchableResource(ISelection selection) {
return null;//ResourcesPlugin.getWorkspace().getRoot();
}
@@ -68,6 +71,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.ui.IEditorPart)
*/
+ @Override
public IResource getLaunchableResource(IEditorPart editorpart) {
return ResourcesPlugin.getWorkspace().getRoot();
}
@@ -75,6 +79,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
*/
+ @Override
public void launch(ISelection selection, String mode) {
performLaunch(mode);
}
@@ -82,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
*/
+ @Override
public void launch(IEditorPart editor, String mode) {
performLaunch(mode);
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestJavaApplicationTabGroup.java
index 51d0230..f493298 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestJavaApplicationTabGroup.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestJavaApplicationTabGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
*/
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new JavaMainTab(),
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate.java
index 1114a86..6accbd0 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
*/
+ @Override
public ILaunch getLaunch(ILaunchConfiguration configuration, String mode) {
fLaunch = new Launch(configuration, mode, null);
return fLaunch;
@@ -44,6 +45,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (!launch.equals(fLaunch)) {
throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Received wrong launch object", null));
@@ -61,6 +63,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#buildForLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
return true;
}
@@ -68,6 +71,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#finalLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) {
return true;
}
@@ -75,6 +79,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) {
return true;
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate1.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate1.java
index f8f7224..9e9383c 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate1.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {}
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate2.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate2.java
index 6e2815c..808cf11 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate2.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchDelegate2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {}
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchShortcut.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchShortcut.java
index e5e2b54..f691249 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchShortcut.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestLaunchShortcut.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,12 +23,14 @@
/**
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
*/
+ @Override
public void launch(ISelection selection, String mode) {
}
/**
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
*/
+ @Override
public void launch(IEditorPart editor, String mode) {
}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestModeLaunchDelegate.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestModeLaunchDelegate.java
index 714e8f3..d87eff5 100755
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestModeLaunchDelegate.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestModeLaunchDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (fgTestCase == null) {
throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests",
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestTabGroup.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestTabGroup.java
index 0ba2de7..968986b 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestTabGroup.java
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/launching/TestTabGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
*/
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = {
new CommonTab()
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/TestContributedStepFilter.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/TestContributedStepFilter.java
index 1034f51..c3d855b 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/TestContributedStepFilter.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/TestContributedStepFilter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) Aug 28, 2014 IBM Corporation and others.
+ * Copyright (c) 2014, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStepFilter#isFiltered(java.lang.Object)
*/
+ @Override
public boolean isFiltered(Object object) {
if (object instanceof Method) {
Method method = (Method) object;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
index 11bd840..a5b001c 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
@@ -26,8 +26,6 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarkerDelta;
@@ -167,6 +165,8 @@
import com.sun.jdi.InternalException;
+import junit.framework.TestCase;
+
/**
* Tests for launch configurations
*/
@@ -2127,6 +2127,7 @@
protected IEvaluationResult evaluate(String snippet, IJavaThread thread) throws Exception {
class Listener implements IEvaluationListener {
IEvaluationResult fResult;
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fResult= result;
}
@@ -2151,6 +2152,7 @@
/**
* @see IEvaluationListener#evaluationComplete(IEvaluationResult)
*/
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fEvaluationResult = result;
}
@@ -2579,10 +2581,13 @@
final Object lock = new Object();
final IBreakpoint[] breakpoints = new IBreakpoint[1];
IBreakpointListener listener = new IBreakpointListener() {
+ @Override
public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
}
+ @Override
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
}
+ @Override
public void breakpointAdded(IBreakpoint breakpoint) {
synchronized (lock) {
breakpoints[0] = breakpoint;
@@ -2605,7 +2610,8 @@
*/
protected void closeAllEditors() {
Runnable closeAll = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.getActivePage().closeAllEditors(false);
}
@@ -2660,6 +2666,7 @@
class Listener implements IEvaluationListener {
IEvaluationResult fResult;
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fResult= result;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
index f733ed8..3ca96e3 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,12 +12,12 @@
import java.util.Enumeration;
+import org.eclipse.swt.widgets.Display;
+
import junit.framework.Test;
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.eclipse.swt.widgets.Display;
-
/**
* Debug test suite framework that runs test in a non UI thread.
*/
@@ -47,10 +47,12 @@
Thread thread = null;
try {
Runnable r = new Runnable() {
+ @Override
public void run() {
for (Enumeration<Test> e= tests(); e.hasMoreElements(); ) {
- if (result.shouldStop() )
- break;
+ if (result.shouldStop() ) {
+ break;
+ }
Test test= e.nextElement();
runTest(test, result);
}
@@ -66,8 +68,9 @@
while (fTesting) {
try {
- if (!display.readAndDispatch())
+ if (!display.readAndDispatch()) {
display.sleep();
+ }
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
index 9c71177..6b4556d 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
@@ -17,10 +17,6 @@
import java.util.Enumeration;
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
import org.eclipse.jdt.debug.tests.eval.ArrayAllocationTests;
import org.eclipse.jdt.debug.tests.eval.ArrayAssignmentTests;
import org.eclipse.jdt.debug.tests.eval.ArrayValueTests;
@@ -107,6 +103,10 @@
import org.eclipse.jdt.debug.tests.eval.XfixOperatorsTests;
import org.eclipse.swt.widgets.Display;
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
/**
* Test all areas of the UI.
*/
@@ -246,10 +246,12 @@
Thread thread = null;
try {
Runnable r = new Runnable() {
+ @Override
public void run() {
for (Enumeration<Test> e= tests(); e.hasMoreElements(); ) {
- if (result.shouldStop() )
- break;
+ if (result.shouldStop() ) {
+ break;
+ }
runTest(e.nextElement(), result);
}
fTesting = false;
@@ -264,8 +266,9 @@
while (fTesting) {
try {
- if (!display.readAndDispatch())
+ if (!display.readAndDispatch()) {
display.sleep();
+ }
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
index 2b9769a..d9a35fb 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,13 +12,13 @@
import java.util.Enumeration;
+import org.eclipse.jdt.debug.tests.core.RemoteJavaApplicationTests;
+import org.eclipse.swt.widgets.Display;
+
import junit.framework.Test;
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.eclipse.jdt.debug.tests.core.RemoteJavaApplicationTests;
-import org.eclipse.swt.widgets.Display;
-
/**
* Tests that are to be run manually by the debug team, in addition to
* automated tests.
@@ -65,10 +65,12 @@
Thread thread = null;
try {
Runnable r = new Runnable() {
+ @Override
public void run() {
for (Enumeration<Test> e= tests(); e.hasMoreElements(); ) {
- if (result.shouldStop() )
- break;
+ if (result.shouldStop() ) {
+ break;
+ }
Test test= e.nextElement();
runTest(test, result);
}
@@ -84,8 +86,9 @@
while (fTesting) {
try {
- if (!display.readAndDispatch())
+ if (!display.readAndDispatch()) {
display.sleep();
+ }
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
index 1511eba..08d07c2 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,7 +54,8 @@
*/
public void testPerspectiveSwtich() {
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbench workbench = PlatformUI.getWorkbench();
IPerspectiveDescriptor descriptor = workbench.getPerspectiveRegistry().findPerspectiveWithId(IDebugUIConstants.ID_DEBUG_PERSPECTIVE);
IWorkbenchPage activePage = workbench.getActiveWorkbenchWindow().getActivePage();
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/VerticalRulerInfoStub.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/VerticalRulerInfoStub.java
index 837f970..57b62e2 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/VerticalRulerInfoStub.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/VerticalRulerInfoStub.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.IVerticalRulerInfo#getControl()
*/
+ @Override
public Control getControl() {
return null;
}
@@ -34,6 +35,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
*/
+ @Override
public int getLineOfLastMouseButtonActivity() {
return fLineNumber;
}
@@ -41,6 +43,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth()
*/
+ @Override
public int getWidth() {
return 0;
}
@@ -48,6 +51,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
*/
+ @Override
public int toDocumentLineNumber(int y_coordinate) {
return 0;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/AbstractToggleBreakpointsTarget.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/AbstractToggleBreakpointsTarget.java
index 7e8ac86..fa67722 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/AbstractToggleBreakpointsTarget.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/AbstractToggleBreakpointsTarget.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 IBM Corporation and others.
+ * Copyright (c) 2014, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@
List<IBreakpoint> added = new ArrayList<IBreakpoint>();
List<IBreakpoint> removed = new ArrayList<IBreakpoint>();
+ @Override
public void breakpointAdded(IBreakpoint breakpoint) {
synchronized (added) {
added.add(breakpoint);
@@ -50,6 +51,7 @@
}
}
+ @Override
public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
synchronized (removed) {
removed.add(breakpoint);
@@ -57,6 +59,7 @@
}
}
+ @Override
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
}
@@ -109,6 +112,7 @@
protected void toggleBreakpoint(final IPath externalFile, final int line) throws Exception {
final Exception[] exs = new Exception[1];
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
try {
File file = JavaTestPlugin.getDefault().getFileInPlugin(externalFile);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointListenerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointListenerTests.java
index 2d6f8a1..08eedd5 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointListenerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointListenerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -332,6 +332,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
*/
+ @Override
public void breakpointAdded(IBreakpoint breakpoint) {
fAddCallbacks++;
fTotalAdded++;
@@ -340,6 +341,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
*/
+ @Override
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
fChangeCallabcks++;
fTotalChanged++;
@@ -348,6 +350,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
*/
+ @Override
public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
fRemoveCallbacks++;
fTotalRemoved++;
@@ -356,6 +359,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[])
*/
+ @Override
public void breakpointsAdded(IBreakpoint[] breakpoints) {
fAddCallbacks++;
fTotalAdded += breakpoints.length;
@@ -364,6 +368,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
*/
+ @Override
public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
fChangeCallabcks++;
fTotalChanged += breakpoints.length;
@@ -372,6 +377,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
*/
+ @Override
public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
fRemoveCallbacks++;
fTotalRemoved += breakpoints.length;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaBreakpointListenerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaBreakpointListenerTests.java
index f855e68..78a57c7 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaBreakpointListenerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaBreakpointListenerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -87,24 +87,28 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
}
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
}
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
if (breakpoint == fTheBreakpoint) {
return fVote;
@@ -115,18 +119,21 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return DONT_CARE;
}
@@ -168,28 +175,35 @@
public List<IJavaLineBreakpoint> COMPILATION_ERRORS = new ArrayList<IJavaLineBreakpoint>();
public List<IJavaLineBreakpoint> RUNTIME_ERRORS = new ArrayList<IJavaLineBreakpoint>();
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointHasCompilationErrors( IJavaLineBreakpoint breakpoint, Message[] errors) {
COMPILATION_ERRORS.add(breakpoint);
}
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
RUNTIME_ERRORS.add(breakpoint);
}
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
HIT.add(breakpoint);
return DONT_CARE;
}
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return DONT_CARE;
}
@@ -684,6 +698,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(
IJavaLineBreakpoint breakpoint,
Message[] errors) {
@@ -692,6 +707,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(
IJavaLineBreakpoint breakpoint,
DebugException exception) {
@@ -700,6 +716,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(
IJavaThread thread,
IJavaBreakpoint breakpoint) {
@@ -709,6 +726,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -720,6 +738,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -731,6 +750,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint,
@@ -741,6 +761,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -1226,6 +1247,7 @@
thread= launchToLineBreakpoint(typeName, bp);
assertTrue(EvalualtionBreakpointListener.HIT);
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
bp.getMarker().delete();
get14Project().getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java
index 288002b..a49961b 100755
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/RunToLineTests.java
@@ -55,6 +55,7 @@
/**
* @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
if (partRef.getTitle().equals("Breakpoints.java") && changeId == IWorkbenchPage.CHANGE_EDITOR_OPEN) {
synchronized (fLock) {
@@ -67,12 +68,14 @@
/**
* @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
}
}
@@ -127,7 +130,8 @@
try {
// close all editors
Runnable closeAll = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.getActivePage().closeAllEditors(false);
activeWorkbenchWindow.addPerspectiveListener(listener);
@@ -145,6 +149,7 @@
}
if (fEditor == null) {
Runnable r = new Runnable() {
+ @Override
public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IEditorPart activeEditor = activeWorkbenchWindow.getActivePage().getActiveEditor();
@@ -160,7 +165,8 @@
final Exception[] exs = new Exception[1];
final IJavaThread suspendee = thread;
Runnable r = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
ITextEditor editor = (ITextEditor) fEditor;
IRunToLineTarget adapter = editor.getAdapter(IRunToLineTarget.class);
assertNotNull("no run to line adapter", adapter);
@@ -191,7 +197,8 @@
removeAllBreakpoints();
DebugUITools.getPreferenceStore().setValue(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE, restore);
Runnable cleanup = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.removePerspectiveListener(listener);
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TargetPatternBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TargetPatternBreakpointTests.java
index 3d7954e..c384f43 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TargetPatternBreakpointTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TargetPatternBreakpointTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -118,6 +118,7 @@
/**
* @see IJavaBreakpointListener#addingBreakpoint(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -134,6 +135,7 @@
/**
* @see IJavaBreakpointListener#breakpointHit(IJavaThread, IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
return DONT_CARE;
}
@@ -141,6 +143,7 @@
/**
* @see IJavaBreakpointListener#breakpointInstalled(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -149,6 +152,7 @@
/**
* @see IJavaBreakpointListener#breakpointRemoved(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
@@ -157,6 +161,7 @@
/**
* @see IJavaBreakpointListener#installingBreakpoint(IJavaDebugTarget, IJavaBreakpoint, IJavaType)
*/
+ @Override
public int installingBreakpoint(
IJavaDebugTarget target,
IJavaBreakpoint breakpoint,
@@ -167,6 +172,7 @@
/**
* @see IJavaBreakpointListener#breakpointHasCompilationErrors(IJavaLineBreakpoint, Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(
IJavaLineBreakpoint breakpoint,
Message[] errors) {
@@ -175,6 +181,7 @@
/**
* @see IJavaBreakpointListener#breakpointHasRuntimeException(IJavaLineBreakpoint, DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(
IJavaLineBreakpoint breakpoint,
DebugException exception) {
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
index 040ac44..56689e1 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,11 +48,13 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
*/
+ @Override
public void dispose() {}
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
*/
+ @Override
public void init(IConsole console) {
buffer = new StringBuffer();
document = console.getDocument();
@@ -61,6 +63,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
*/
+ @Override
public void lineAppended(IRegion line) {
try {
assertNotNull("received notification of invalid line", line);
@@ -74,6 +77,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
*/
+ @Override
public void consoleClosed() {
synchronized (fLock) {
closed = true;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
index 827fa3a..70a4014 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@
/**
* @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
*/
+ @Override
public IClasspathEntry[] getClasspathEntries() {
return entries;
}
@@ -51,6 +52,7 @@
/**
* @see org.eclipse.jdt.core.IClasspathContainer#getDescription()
*/
+ @Override
public String getDescription() {
return "Fake";
}
@@ -58,6 +60,7 @@
/**
* @see org.eclipse.jdt.core.IClasspathContainer#getKind()
*/
+ @Override
public int getKind() {
return IClasspathContainer.K_DEFAULT_SYSTEM;
}
@@ -65,6 +68,7 @@
/**
* @see org.eclipse.jdt.core.IClasspathContainer#getPath()
*/
+ @Override
public IPath getPath() {
return new Path(JavaRuntime.JRE_CONTAINER);
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
index 31e5158..263ba0f 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,18 +13,6 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.test.OrderedTestSuite;
-
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
@@ -32,9 +20,17 @@
import org.eclipse.debug.core.model.IStreamsProxy2;
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
-
import org.eclipse.debug.ui.console.IConsole;
import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
+import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
+import org.eclipse.jdt.debug.tests.AbstractDebugTest;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.test.OrderedTestSuite;
+
+import junit.framework.TestSuite;
/**
* Tests console input.
@@ -170,7 +166,8 @@
fLinesRead.clear();
final IDocument document = console.getDocument();
DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
document.replace(document.getLength(), 0, text);
} catch (BadLocationException e) {
@@ -206,7 +203,8 @@
private void append(IConsole console, final String text) throws Exception {
final IDocument document = console.getDocument();
DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
document.replace(document.getLength(), 0, text);
} catch (BadLocationException e) {
@@ -226,7 +224,8 @@
private void deleteAll(IConsole console) throws Exception {
final IDocument document = console.getDocument();
DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
document.replace(0, document.getLength(), "");
} catch (BadLocationException e) {
@@ -240,12 +239,14 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
*/
+ @Override
public void init(IConsole console) {
synchronized (fConsoleLock) {
fConsole = console;
@@ -257,6 +258,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
*/
+ @Override
public void lineAppended(IRegion line) {
if (fStarted) {
synchronized (fLinesRead) {
@@ -274,6 +276,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#streamClosed()
*/
+ @Override
public void consoleClosed() {
synchronized (fLock) {
fStopped = true;
@@ -315,14 +318,16 @@
private void spinEventLoop() {
final Display display= DebugUIPlugin.getStandardDisplay();
Runnable runnable= new Runnable() {
+ @Override
public void run() {
while (display.readAndDispatch()) {
}
}
};
- if (Display.getCurrent() == display)
+ if (Display.getCurrent() == display) {
runnable.run();
- else
+ } else {
display.syncExec(runnable);
+ }
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
index 5f8474f..8190f1f 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -70,6 +70,7 @@
ILaunch launch = target.getLaunch();
// make sure the console exists
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
IConsole console = DebugUITools.getConsole(otherTarget);
assertNotNull("Missing console", console);
@@ -78,6 +79,7 @@
launch.removeProcess(process);
// make sure the console is gone
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
IConsole console = DebugUITools.getConsole(otherTarget);
assertNull("Console should no longer exist", console);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
index c4fe44a..82c4ecd 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener#hotCodeReplaceFailed(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.debug.core.DebugException)
*/
+ @Override
public synchronized void hotCodeReplaceFailed(IJavaDebugTarget target, DebugException exception) {
notified = true;
notifyAll();
@@ -46,6 +47,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener#hotCodeReplaceSucceeded(org.eclipse.jdt.debug.core.IJavaDebugTarget)
*/
+ @Override
public synchronized void hotCodeReplaceSucceeded(IJavaDebugTarget target) {
notified = true;
this.target = target;
@@ -55,6 +57,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener#obsoleteMethods(org.eclipse.jdt.debug.core.IJavaDebugTarget)
*/
+ @Override
public synchronized void obsoleteMethods(IJavaDebugTarget target) {
notified = true;
notifyAll();
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
index bd1043c..d0f3693 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -174,12 +174,14 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
*/
+ @Override
public void init(IConsole console) {
fConsole = console;
fStarted = true;
@@ -188,6 +190,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
*/
+ @Override
public void lineAppended(IRegion line) {
if (fStarted) {
try {
@@ -202,6 +205,7 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#streamClosed()
*/
+ @Override
public void consoleClosed() {
synchronized (fLock) {
fStopped = true;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
index 6bddee1..c8a2477 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -189,6 +189,7 @@
}
}
+ @Override
public void detailComputed(IValue value, String result) {
synchronized (this) {
fDetail = result;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
index 783c31b..e6be05d 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -310,8 +310,9 @@
assertTrue("Expected cycle to cause exception", false);
} catch (CoreException ce){
IStatus status = ce.getStatus();
- if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
- throw ce;
+ if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR) {
+ throw ce;
+ }
}
} finally {
manager.removeVariables(new IValueVariable[]{var1, var2});
@@ -336,8 +337,9 @@
assertTrue("Expected cycle to cause exception", false);
} catch (CoreException ce){
IStatus status = ce.getStatus();
- if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
- throw ce;
+ if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR) {
+ throw ce;
+ }
}
} finally {
manager.removeVariables(new IValueVariable[]{var1, var2});
@@ -368,8 +370,9 @@
assertTrue("Expected cycle to cause exception", false);
} catch (CoreException ce){
IStatus status = ce.getStatus();
- if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
- throw ce;
+ if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR) {
+ throw ce;
+ }
}
} finally {
manager.removeVariables(new IValueVariable[]{var1, var2, var3});
@@ -487,6 +490,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesAdded(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
*/
+ @Override
public void variablesAdded(IValueVariable[] variables) {
fAdded = variables;
}
@@ -494,6 +498,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesChanged(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
*/
+ @Override
public void variablesChanged(IValueVariable[] variables) {
fChanged = variables;
}
@@ -501,6 +506,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesRemoved(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
*/
+ @Override
public void variablesRemoved(IValueVariable[] variables) {
fRemoved = variables;
}
@@ -766,6 +772,7 @@
*/
protected void setSelection(final IResource resource) {
Runnable r = new Runnable() {
+ @Override
public void run() {
IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
assertNotNull("the active workbench window page should not be null", page);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTestsLibraryLocationResolver.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTestsLibraryLocationResolver.java
index 3f07dc9..e136faa 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTestsLibraryLocationResolver.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTestsLibraryLocationResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation and others.
+ * Copyright (c) 2013, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,12 +14,10 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.URIUtil;
-
+import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
import org.eclipse.jdt.launching.ILibraryLocationResolver;
@@ -29,6 +27,7 @@
*
* @see org.eclipse.jdt.launching.ILibraryLocationResolver#getPackageRoot(org.eclipse.core.runtime.IPath)
*/
+ @Override
public IPath getPackageRoot(IPath libraryPath) {
if (VMInstallTests.applies(libraryPath)) {
return new Path("src");
@@ -41,6 +40,7 @@
*
* @see org.eclipse.jdt.launching.ILibraryLocationResolver#getSourcePath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public IPath getSourcePath(IPath libraryPath) {
if (VMInstallTests.applies(libraryPath)) {
File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/test_resolver_src.zip"));
@@ -56,6 +56,7 @@
*
* @see org.eclipse.jdt.launching.ILibraryLocationResolver#getJavadocLocation(org.eclipse.core.runtime.IPath)
*/
+ @Override
public URL getJavadocLocation(IPath libraryPath) {
if (VMInstallTests.applies(libraryPath)) {
File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/test_resolver_javadoc.zip"));
@@ -76,6 +77,7 @@
*
* @see org.eclipse.jdt.launching.ILibraryLocationResolver#getIndexLocation(org.eclipse.core.runtime.IPath)
*/
+ @Override
public URL getIndexLocation(IPath libraryPath) {
if (VMInstallTests.applies(libraryPath)) {
File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/test_resolver_index.index"));
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
index a0a8ec6..3d1d081 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -194,6 +194,7 @@
super.setUp();
Display display = DebugUIPlugin.getStandardDisplay();
display.syncExec(new Runnable() {
+ @Override
public void run() {
try {
IWorkbench workbench = PlatformUI.getWorkbench();
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
index b5ad5bb..2e455f6 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
+ * Copyright (c) 2002, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -425,6 +425,7 @@
class Listener implements IEvaluationListener {
IEvaluationResult fResult;
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fResult= result;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
index 8f5d089..e738261 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -801,11 +801,9 @@
code.append("}\n");
- Writer file = new FileWriter(new File("NestedTypeFieldValue_" + lineNumber + ".java").getAbsoluteFile());
-
- file.write(code.toString());
-
- file.close();
-
+ try (Writer file = new FileWriter(new File("NestedTypeFieldValue_" + lineNumber + ".java").getAbsoluteFile())) {
+ file.write(code.toString());
+ }
+
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
index 7e0185d..d93e356 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
+ * Copyright (c) 2002, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -308,11 +308,9 @@
code.append("}\n");
- Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-
- file.write(code.toString());
-
- file.close();
+ try (Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile())) {
+ file.write(code.toString());
+ }
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
index a51bdba..749bd32 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1427,11 +1427,9 @@
code.append("\n}\n");
- Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-
- file.write(code.toString());
-
- file.close();
+ try (Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile())) {
+ file.write(code.toString());
+ }
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
index 14435d6..8b00b30 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -335,11 +335,9 @@
code.append("}\n");
- Writer file = new FileWriter(new File("TypeHierarchy_" + lineNumber + "_" + hitCount + ".java").getAbsoluteFile());
-
- file.write(code.toString());
-
- file.close();
+ try (Writer file = new FileWriter(new File("TypeHierarchy_" + lineNumber + "_" + hitCount + ".java").getAbsoluteFile())) {
+ file.write(code.toString());
+ }
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchTests.java
index 1e68cf0..19c4f68 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -110,6 +110,7 @@
/**
* @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch)
*/
+ @Override
public synchronized void launchRemoved(ILaunch launch) {
removed = true;
notifyAll();
@@ -118,6 +119,7 @@
/**
* @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
*/
+ @Override
public synchronized void launchAdded(ILaunch launch) {
added = true;
notifyAll();
@@ -126,6 +128,7 @@
/**
* @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch)
*/
+ @Override
public synchronized void launchChanged(ILaunch launch) {}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchesTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchesTests.java
index 7c04729..1076711 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchesTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/LaunchesTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -103,6 +103,7 @@
/**
* @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public synchronized void launchesTerminated(ILaunch[] launches) {
terminated = true;
notifyAll();
@@ -111,6 +112,7 @@
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public synchronized void launchesRemoved(ILaunch[] launches) {
removed = true;
notifyAll();
@@ -119,6 +121,7 @@
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public synchronized void launchesAdded(ILaunch[] launches) {
added = true;
notifyAll();
@@ -127,6 +130,7 @@
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public synchronized void launchesChanged(ILaunch[] launches) {}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/ProjectClasspathVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/ProjectClasspathVariableTests.java
index 64c8bd2..83d7850 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/ProjectClasspathVariableTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/ProjectClasspathVariableTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@
*/
protected void setSelection(final IResource resource) {
Runnable r = new Runnable() {
+ @Override
public void run() {
IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
assertNotNull("the active workbench window page should not be null", page);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
index a351fdc..b9a86c4 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -303,7 +303,8 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
*/
- public synchronized void breakpointAdded(IBreakpoint breakpoint) {
+ @Override
+ public synchronized void breakpointAdded(IBreakpoint breakpoint) {
breakpointCount++;
notifyAll();
}
@@ -311,7 +312,8 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
*/
- public synchronized void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
+ @Override
+ public synchronized void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
breakpointCount--;
notifyAll();
}
@@ -319,6 +321,7 @@
/**
* @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
*/
- public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
+ @Override
+ public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
index b69f026..94f3ddc 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,7 +44,8 @@
/**
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
- public void handleDebugEvents(DebugEvent[] events) {
+ @Override
+ public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
if (event.getKind() == DebugEvent.SUSPEND && event.getDetail() == DebugEvent.BREAKPOINT) {
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
index 41f1821..523ebf0 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -189,7 +189,8 @@
*/
protected void launchWorkingCopyAndWait(final ILaunchConfigurationWorkingCopy workingCopy) throws Exception {
Runnable runnable = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
DebugUITools.launch(workingCopy, ILaunchManager.RUN_MODE);
}
};
@@ -206,7 +207,8 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
*/
- public void consoleClosed() {
+ @Override
+ public void consoleClosed() {
if (fStarted) {
stopMeasuring();
}
@@ -219,7 +221,8 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
*/
- public void init(IConsole console) {
+ @Override
+ public void init(IConsole console) {
if (!fWarmingUp) {
fStarted = true;
startMeasuring();
@@ -229,12 +232,14 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
*/
- public void lineAppended(IRegion line) {
+ @Override
+ public void lineAppended(IRegion line) {
}
/**
* @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
index 3e69fc0..f915848 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,7 +46,8 @@
launchaction.selectionChanged(new BogusAction(), selection);
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
Shell shell = DebugUIPlugin.getStandardDisplay().getActiveShell();
Menu menu = launchaction.getMenu(new Menu(shell));
showMenu(launchaction, menu, 5);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
index b3161e1..adab869 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
/**
* @see org.eclipse.debug.core.IDebugEventFilter#filterDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
+ @Override
public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
index 5614a8d..e578db7 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,7 +39,8 @@
/**
* @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
*/
- public void detailComputed(IValue value, String result) {
+ @Override
+ public void detailComputed(IValue value, String result) {
synchronized (fLock) {
fLock.notifyAll();
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
index c7802cd..6717f90 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,18 +14,19 @@
import java.util.List;
import org.eclipse.core.runtime.OperationCanceledException;
-
import org.eclipse.jdt.internal.corext.refactoring.reorg.IConfirmQuery;
import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries;
public class MockReorgQueries implements IReorgQueries {
private final List<Integer> fQueriesRun= new ArrayList<Integer>();
+ @Override
public IConfirmQuery createYesNoQuery(String queryTitle, boolean allowCancel, int queryID) {
run(queryID);
return yesQuery;
}
+ @Override
public IConfirmQuery createYesYesToAllNoNoToAllQuery(String queryTitle, boolean allowCancel, int queryID) {
run(queryID);
return yesQuery;
@@ -41,15 +42,18 @@
}
private final IConfirmQuery yesQuery= new IConfirmQuery() {
+ @Override
public boolean confirm(String question) throws OperationCanceledException {
return true;
}
+ @Override
public boolean confirm(String question, Object[] elements) throws OperationCanceledException {
return true;
}
};
+ @Override
public IConfirmQuery createSkipQuery(String queryTitle, int queryID) {
run(queryID);
return yesQuery;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java
index e48c57c..761ed71 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/InstructionPointerManagerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -106,7 +106,8 @@
removeAllBreakpoints();
DebugUIPlugin.getDefault().getPreferenceStore().setValue(IDebugUIConstants.PREF_REUSE_EDITOR, restore);
Runnable cleanup = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.removePerspectiveListener(getPerspectiveListener());
}
@@ -137,7 +138,8 @@
removeAllBreakpoints();
DebugUIPlugin.getDefault().getPreferenceStore().setValue(IDebugUIConstants.PREF_REUSE_EDITOR, restore);
Runnable cleanup = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.removePerspectiveListener(getPerspectiveListener());
}
@@ -182,7 +184,8 @@
// Close all editors
Runnable closeAll = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.getActivePage().closeAllEditors(false);
activeWorkbenchWindow.addPerspectiveListener(getPerspectiveListener());
@@ -208,7 +211,8 @@
// Find and select the top stack frame of the other thread
Runnable openParent = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IDebugView debugView = (IDebugView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.debug.ui.DebugView");
Object[] newSegments = new Object[4];
newSegments[0] = target1.getLaunch();
@@ -238,7 +242,8 @@
// Select the same stack frame and make sure IPC count doesn't change
Runnable selectSameStackFrame = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IDebugView debugView = (IDebugView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.debug.ui.DebugView");
Object[] newSegments = new Object[4];
newSegments[0] = target1.getLaunch();
@@ -261,7 +266,8 @@
// Select the next stack frame in the same thread
Runnable selectSecondStackFrame = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IDebugView debugView = (IDebugView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.debug.ui.DebugView");
Object[] newSegments = new Object[4];
newSegments[0] = target1.getLaunch();
@@ -294,7 +300,8 @@
// Select the stack frame from the new debug target displaying ThreadStack
Runnable openOtherDebugTarget = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IDebugView debugView = (IDebugView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.debug.ui.DebugView");
ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches();
Object[] newSegments = new Object[4];
@@ -333,7 +340,8 @@
// Select the other thread from the new target displaying ClassTwo
Runnable openOtherThread = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IDebugView debugView = (IDebugView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.debug.ui.DebugView");
Object[] newSegments = new Object[4];
newSegments[0] = target2.getLaunch();
@@ -381,7 +389,8 @@
// Close the editor displaying ThreadStack.java if it is open
Runnable closeEditor2 = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IEditorReference[] editors = activeWorkbenchWindow.getActivePage().getEditorReferences();
for (int i = 0; i < editors.length; i++) {
@@ -402,7 +411,8 @@
// Close all editors
Runnable closeAllEditors = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
activeWorkbenchWindow.getActivePage().closeAllEditors(false);
}
@@ -448,6 +458,7 @@
// Synchronize with the UI thread so we know that the annotations have finished
Runnable runner = new Runnable(){
+ @Override
public void run() {
// Do nothing, just waiting for the UI thread to finish annotations
}
@@ -465,6 +476,7 @@
// Synchronize with the UI thread so we know that the annotations have finished
Runnable runner = new Runnable(){
+ @Override
public void run() {
// Do nothing, just waiting for the UI thread to finish annotations
}
@@ -477,12 +489,15 @@
private String fTypeName = IInternalDebugCoreConstants.EMPTY_STRING;
private String fTitle = IInternalDebugCoreConstants.EMPTY_STRING;
+ @Override
public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {}
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {}
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
if (partRef.getTitle().equals(fTitle) && changeId == IWorkbenchPage.CHANGE_EDITOR_OPEN) {
IEditorPart editor = (IEditorPart) partRef.getPart(true);
@@ -524,17 +539,25 @@
}
class MyPartListener implements IPartListener2{
+ @Override
public void partActivated(IWorkbenchPartReference partRef) {}
+ @Override
public void partDeactivated(IWorkbenchPartReference partRef) {}
+ @Override
public void partHidden(IWorkbenchPartReference partRef) {}
+ @Override
public void partOpened(IWorkbenchPartReference partRef) {}
+ @Override
public void partVisible(IWorkbenchPartReference partRef) {}
+ @Override
public void partBroughtToTop(IWorkbenchPartReference partRef) {}
+ @Override
public void partClosed(IWorkbenchPartReference partRef) {}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partInputChanged(IWorkbenchPartReference partRef) {
IEditorPart editor = (IEditorPart) partRef.getPart(true);
if (editor instanceof ITextEditor){
@@ -555,6 +578,7 @@
class MyAnnotationListener implements IAnnotationModelListener, IAnnotationModelListenerExtension{
+ @Override
public void modelChanged(AnnotationModelEvent event) {
Annotation[] annotations = event.getAddedAnnotations();
for (int i = 0; i < annotations.length; i++) {
@@ -578,6 +602,7 @@
}
}
+ @Override
public void modelChanged(IAnnotationModel model) {}
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
index ea8c2df..6fffdcc 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -134,6 +134,7 @@
private List<?> getJavaElementMatches(final String textData) {
final List<?> matches = new ArrayList<Object>();
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
fAccessor.invoke("getJavaElementMatches", new Class[] { String.class, List.class }, new Object[] { textData, matches });
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java
index ca8e77f..d90cda4 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/ViewManagementTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,15 +13,17 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Test;
-
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jdt.debug.core.IJavaThread;
import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.test.OrderedTestSuite;
-
+import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.preference.IPreferenceStore;
-
+import org.eclipse.test.OrderedTestSuite;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IPerspectiveListener3;
import org.eclipse.ui.IViewReference;
@@ -30,14 +32,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-
-import org.eclipse.jdt.ui.JavaUI;
+import junit.framework.Test;
/**
* Tests view management.
@@ -110,6 +105,7 @@
private IWorkbenchWindow resetPerspective(final String id) {
final IWorkbenchWindow[] windows = new IWorkbenchWindow[1];
Runnable r = new Runnable() {
+ @Override
public void run() {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
switchPerspective(window, id);
@@ -157,6 +153,7 @@
protected boolean isViewOpen(final IWorkbenchWindow window, final String id) {
final IViewReference[] refs = new IViewReference[1];
Runnable r = new Runnable() {
+ @Override
public void run() {
refs[0] = window.getActivePage().findViewReference(id);
}
@@ -410,30 +407,35 @@
/**
* @see org.eclipse.ui.IPerspectiveListener3#perspectiveOpened(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener3#perspectiveClosed(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener3#perspectiveDeactivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener3#perspectiveSavedAs(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective, IPerspectiveDescriptor newPerspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
if (changeId == IWorkbenchPage.CHANGE_VIEW_SHOW) {
fExpectingOpenEvents.remove(partRef.getId());
@@ -447,12 +449,14 @@
/**
* @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/**
* @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
index b935622..ec767e6 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,7 +24,8 @@
/**
* @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object)
*/
- public Object handleStatus(IStatus status, Object source) throws CoreException {
+ @Override
+ public Object handleStatus(IStatus status, Object source) throws CoreException {
ILaunchConfigurationDialog dialog = (ILaunchConfigurationDialog)source;
dialog.setActiveTab(3);
return null;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaArrayValue.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaArrayValue.java
index 07ebc8d..1642a20 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaArrayValue.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaArrayValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int)
*/
+ @Override
public IVariable getVariable(int offset) throws DebugException {
return null;
}
@@ -47,6 +48,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int)
*/
+ @Override
public IVariable[] getVariables(int offset, int length) throws DebugException {
return null;
}
@@ -54,6 +56,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getSize()
*/
+ @Override
public int getSize() throws DebugException {
return size;
}
@@ -61,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset()
*/
+ @Override
public int getInitialOffset() {
return 0;
}
@@ -68,6 +72,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#getValues()
*/
+ @Override
public IJavaValue[] getValues() throws DebugException {
return values;
}
@@ -75,6 +80,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#getValue(int)
*/
+ @Override
public IJavaValue getValue(int index) throws DebugException {
if(values != null && index > -1 && index < values.length) {
return values[index];
@@ -85,6 +91,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#getLength()
*/
+ @Override
public int getLength() throws DebugException {
return (values != null ? values.length : 0);
}
@@ -92,6 +99,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#setValue(int, org.eclipse.jdt.debug.core.IJavaValue)
*/
+ @Override
public void setValue(int index, IJavaValue value) throws DebugException {
if(values != null && index > -1 && index < values.length) {
values[index] = value;
@@ -101,6 +109,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#setValues(org.eclipse.jdt.debug.core.IJavaValue[])
*/
+ @Override
public void setValues(IJavaValue[] values) throws DebugException {
this.values = values;
}
@@ -108,6 +117,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaArray#setValues(int, int, org.eclipse.jdt.debug.core.IJavaValue[], int)
*/
+ @Override
public void setValues(int offset, int length, IJavaValue[] values, int startOffset) throws DebugException {
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaObjectValue.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaObjectValue.java
index e2265a4..23c39a6 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaObjectValue.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaObjectValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#sendMessage(java.lang.String, java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[], org.eclipse.jdt.debug.core.IJavaThread, boolean)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature, IJavaValue[] args, IJavaThread thread, boolean superSend)
throws DebugException {
return null;
@@ -45,6 +46,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#sendMessage(java.lang.String, java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[], org.eclipse.jdt.debug.core.IJavaThread, java.lang.String)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature, IJavaValue[] args, IJavaThread thread, String typeSignature) throws DebugException {
return null;
}
@@ -52,6 +54,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String, boolean)
*/
+ @Override
public IJavaFieldVariable getField(String name, boolean superField) throws DebugException {
return null;
}
@@ -59,6 +62,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String, java.lang.String)
*/
+ @Override
public IJavaFieldVariable getField(String name, String typeSignature) throws DebugException {
return null;
}
@@ -66,6 +70,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getWaitingThreads()
*/
+ @Override
public IJavaThread[] getWaitingThreads() throws DebugException {
return null;
}
@@ -73,6 +78,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getOwningThread()
*/
+ @Override
public IJavaThread getOwningThread() throws DebugException {
return null;
}
@@ -80,6 +86,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getReferringObjects(long)
*/
+ @Override
public IJavaObject[] getReferringObjects(long max) throws DebugException {
return null;
}
@@ -87,18 +94,21 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#enableCollection()
*/
+ @Override
public void enableCollection() throws DebugException {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#disableCollection()
*/
+ @Override
public void disableCollection() throws DebugException {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaObject#getUniqueId()
*/
+ @Override
public long getUniqueId() throws DebugException {
return 9999;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaType.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaType.java
index fdeeef0..ed2548a 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaType.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaType.java
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -40,6 +41,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return null;
}
@@ -47,6 +49,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return null;
}
@@ -54,6 +57,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return null;
}
@@ -61,6 +65,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaType#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return sig;
}
@@ -68,6 +73,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaType#getName()
*/
+ @Override
public String getName() throws DebugException {
return name;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaValue.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaValue.java
index fd1b8a2..3ee583f 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaValue.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/presentation/TestIJavaValue.java
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
return rtname;
}
@@ -47,6 +48,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getValueString()
*/
+ @Override
public String getValueString() throws DebugException {
return vstring;
}
@@ -54,6 +56,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#isAllocated()
*/
+ @Override
public boolean isAllocated() throws DebugException {
return true;
}
@@ -61,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getVariables()
*/
+ @Override
public IVariable[] getVariables() throws DebugException {
return new IVariable[0];
}
@@ -68,6 +72,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#hasVariables()
*/
+ @Override
public boolean hasVariables() throws DebugException {
return false;
}
@@ -75,6 +80,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -82,6 +88,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return null;
}
@@ -89,6 +96,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return null;
}
@@ -96,6 +104,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return null;
}
@@ -103,6 +112,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaValue#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return sig;
}
@@ -110,6 +120,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaValue#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return gsig;
}
@@ -117,6 +128,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaValue#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return type;
}
@@ -124,6 +136,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaValue#isNull()
*/
+ @Override
public boolean isNull() {
return false;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/DetailFormatterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/DetailFormatterTests.java
index 402267b..f71f772 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/DetailFormatterTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/DetailFormatterTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) Mar 12, 2013 IBM Corporation and others.
+ * Copyright (c) Mar 12, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@
IValue value;
String result;
+ @Override
public void detailComputed(IValue value, String result) {
this.value = value;
this.result = result;
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestAnonymousInspect.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestAnonymousInspect.java
index 3c9cdb5..2bf718c 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestAnonymousInspect.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestAnonymousInspect.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@
class Listener implements IEvaluationListener {
IEvaluationResult fResult;
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fResult= result;
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java
index 8a8b841..dd82c34 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/variables/TestIntegerAccessUnboxing15.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.eval.IEvaluationListener#evaluationComplete(org.eclipse.jdt.debug.eval.IEvaluationResult)
*/
+ @Override
public void evaluationComplete(IEvaluationResult result) {
synchronized (lock) {
this.endresult = result;
diff --git a/org.eclipse.jdt.debug.ui/.classpath b/org.eclipse.jdt.debug.ui/.classpath
index 9244319..9a31752 100644
--- a/org.eclipse.jdt.debug.ui/.classpath
+++ b/org.eclipse.jdt.debug.ui/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="ui"/>
<classpathentry kind="src" output="snippet_bin" path="Snippet Support"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jdt.debug.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug.ui/.settings/org.eclipse.jdt.core.prefs
index c932b44..98e2ea7 100644
--- a/org.eclipse.jdt.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index 2d49c4d..60dfee6 100644
--- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.6.400.qualifier
+Bundle-Version: 3.7.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -51,4 +51,4 @@
org.eclipse.core.resources,
org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index ce64d52..ca3e9cb 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,6 +18,6 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.ui</artifactId>
- <version>3.6.400-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
index 45cccb3..9051659 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
@@ -161,6 +161,7 @@
/**
* @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame)
*/
+ @Override
public Object getSourceElement(IStackFrame stackFrame) {
Object res = findSourceElement(stackFrame);
if (res == null && fAllowedToAsk) {
@@ -243,6 +244,7 @@
*/
private void showDebugSourcePage(final IJavaStackFrame frame) {
Runnable prompter = new Runnable() {
+ @Override
public void run() {
try {
String message = NLS.bind(LauncherMessages.JavaUISourceLocator_selectprojects_message, new String[] {frame.getDeclaringTypeName()});
@@ -275,6 +277,7 @@
/**
* @see IPersistableSourceLocator#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
String memento = fSourceLocator.getMemento();
String handle = fJavaProject.getHandleIdentifier();
@@ -294,6 +297,7 @@
/**
* @see IPersistableSourceLocator#initializeDefaults(ILaunchConfiguration)
*/
+ @Override
public void initializeDefaults(ILaunchConfiguration configuration)
throws CoreException {
fSourceLocator.initializeDefaults(configuration);
@@ -305,6 +309,7 @@
/**
* @see IPersistableSourceLocator#initializeFromMemento(String)
*/
+ @Override
public void initializeFromMemento(String memento) throws CoreException {
if (memento.startsWith("<project>")) { //$NON-NLS-1$
int index = memento.indexOf("</project>"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java
index 3b51f6a..cb8da9e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java
@@ -294,8 +294,10 @@
}
});
fDocumentListener = new IDocumentListener() {
+ @Override
public void documentAboutToBeChanged(DocumentEvent event) {
}
+ @Override
public void documentChanged(DocumentEvent event) {
setDirty(PROP_CONDITION);
}
@@ -389,18 +391,21 @@
gc.dispose();
fViewer.getControl().setLayoutData(gd);
fContentAssistHandler= new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
fViewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
return null;
}
};
fUndoHandler= new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
fViewer.doOperation(ITextOperationTarget.UNDO);
return null;
}
};
fRedoHandler= new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
fViewer.doOperation(ITextOperationTarget.REDO);
return null;
@@ -418,6 +423,7 @@
}
});
parent.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dispose();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletMainTab.java
index e3c57fa..0ec473c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletMainTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletMainTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,7 +72,9 @@
createVerticalSpacer(comp, 1);
fAppletViewerClassDefaultButton= createCheckButton(comp, LauncherMessages.AppletMainTab_2);
fAppletViewerClassDefaultButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {
handleAppletViewerClassDefaultSelected();
}
@@ -82,6 +84,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite projComp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
((GridLayout)projComp.getLayout()).verticalSpacing = 0;
@@ -105,6 +108,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.appletlauncher_maintab_name;
}
@@ -230,6 +234,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy config) {
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fMainText.getText());
@@ -259,6 +264,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
IJavaElement je= getContext();
if (je != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
index 065d515..109de1d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -73,6 +73,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
*/
+ @Override
public void modifyText(ModifyEvent e) {
updateLaunchConfigurationDialog();
}
@@ -118,6 +119,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_HORIZONTAL);
setControl(comp);
@@ -178,20 +180,25 @@
});
fViewer.setContentProvider(new IStructuredContentProvider() {
+ @Override
public Object[] getElements(Object inputElement) {
Map<?, ?> params = (Map<?, ?>) inputElement;
return params.keySet().toArray();
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
});
fViewer.setLabelProvider(new ITableLabelProvider() {
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
+ @Override
public String getColumnText(Object element, int columnIndex) {
if (columnIndex == 0) {
return element.toString();
@@ -205,13 +212,17 @@
}
return null;
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
});
@@ -339,6 +350,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
try {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_WIDTH, Integer.parseInt(getWidthText()));
@@ -371,6 +383,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
}
@@ -411,6 +424,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.appletlauncher_argumenttab_name;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
index 79b5b88..d56395e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -91,6 +91,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
Composite comp = new Composite(parent, SWT.NONE);
@@ -114,6 +115,7 @@
fPrgmArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
fPrgmArgumentsText.addTraverseListener(new TraverseListener() {
+ @Override
public void keyTraversed(TraverseEvent e) {
switch (e.detail) {
case SWT.TRAVERSE_ESCAPE:
@@ -141,6 +143,7 @@
fPrgmArgumentsText.setLayoutData(gd);
fPrgmArgumentsText.setFont(font);
fPrgmArgumentsText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
scheduleUpdateJob();
}
@@ -195,6 +198,7 @@
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
fVMArgumentsBlock.setDefaults(config);
@@ -219,6 +223,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getAttributeValueFrom(fPrgmArgumentsText));
fVMArgumentsBlock.performApply(configuration);
@@ -242,6 +247,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaArgumentsTab__Arguments_16;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
index df7c1d8..13afaae 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,6 +101,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -197,6 +198,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
}
@@ -282,6 +284,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (isDirty()) {
IRuntimeClasspathEntry[] classpath = getCurrentClasspath();
@@ -380,6 +383,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaClasspathTab_Cla_ss_path_3;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
index b4a10d7..368d484 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -82,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
Composite comp = SWTFactory.createComposite(parent, font, 1, 1, GridData.FILL_BOTH);
@@ -250,6 +251,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy config) {
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, fAllowTerminateButton.getSelection());
@@ -292,6 +294,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
IJavaElement javaElement = getContext();
if (javaElement == null) {
@@ -370,6 +373,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaConnectTab_Conn_ect_20;
}
@@ -403,6 +407,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
updateLaunchConfigurationDialog();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
index dd69382..fb2475c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -83,6 +83,7 @@
// Selection changed listener (checked JRE)
private IPropertyChangeListener fCheckListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
handleSelectedJREChanged();
}
@@ -109,6 +110,7 @@
/**
* @see ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
Composite topComp = SWTFactory.createComposite(parent, font, 1, 1, GridData.FILL_HORIZONTAL, 0, 0);
@@ -145,6 +147,7 @@
/**
* @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
setLaunchConfigurationWorkingCopy(config);
ILaunchConfigurationTab dynamicTab = getDynamicTab();
@@ -174,6 +177,7 @@
/**
* @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
*/
+ @Override
@SuppressWarnings("deprecation")
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (fJREBlock.isDefaultJRE()) {
@@ -313,6 +317,7 @@
/**
* @see ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaJRETab__JRE_1;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java
index 2f7c04c..d700c1b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java
@@ -261,6 +261,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
*/
+ @Override
public void launch(IEditorPart editor, String mode) {
IEditorInput input = editor.getEditorInput();
IJavaElement je = input.getAdapter(IJavaElement.class);
@@ -272,6 +273,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
*/
+ @Override
public void launch(ISelection selection, String mode) {
if (selection instanceof IStructuredSelection) {
searchAndLaunch(((IStructuredSelection)selection).toArray(), mode, getTypeSelectionTitle(), getSelectionEmptyMessage());
@@ -281,6 +283,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.ui.IEditorPart)
*/
+ @Override
public IResource getLaunchableResource(IEditorPart editorpart) {
return getLaunchableResource(editorpart.getEditorInput());
}
@@ -288,6 +291,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public IResource getLaunchableResource(ISelection selection) {
if (selection instanceof IStructuredSelection) {
IStructuredSelection ss = (IStructuredSelection) selection;
@@ -319,6 +323,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.ui.IEditorPart)
*/
+ @Override
public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) {
// let the framework resolve configurations based on resource mapping
return null;
@@ -327,6 +332,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {
// let the framework resolve configurations based on resource mapping
return null;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchTab.java
index 893a6c5..e99cb9c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchTab.java
@@ -118,6 +118,7 @@
*
* Subclasses may override this method and should call super.initializeFrom(...).
*/
+ @Override
public void initializeFrom(ILaunchConfiguration config) {
setCurrentLaunchConfiguration(config);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
index dc0961e..e414a09 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -85,6 +85,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
((GridLayout)comp.getLayout()).verticalSpacing = 0;
@@ -121,6 +122,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaMainTab__Main_19;
}
@@ -238,6 +240,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy config) {
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fMainText.getText().trim());
@@ -271,6 +274,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
IJavaElement javaElement = getContext();
if (javaElement != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
index ad3152d..c6934a4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
@@ -78,6 +79,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
// be default, use a prompting source locator
configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, JavaUISourceLocator.ID_PROMPTING_JAVA_SOURCE_LOCATOR);
@@ -96,6 +98,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, JavaUISourceLocator.ID_PROMPTING_JAVA_SOURCE_LOCATOR);
fSourceLookupBlock.performApply(configuration);
@@ -114,6 +117,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.JavaSourceLookupTab_Source_1;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ActionFilterAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ActionFilterAdapterFactory.java
index 55ac5d6..cc06cbb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ActionFilterAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ActionFilterAdapterFactory.java
@@ -27,6 +27,7 @@
/**
* @see IAdapterFactory#getAdapter(Object, Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object obj, Class<T> adapterType) {
if (adapterType.isInstance(obj)) {
@@ -52,6 +53,7 @@
/**
* @see IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[] {
IActionFilter.class
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
index b0277ce..e5dfae5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2014 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -71,6 +71,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IMarkerUpdater#getAttribute()
*/
+ @Override
public String[] getAttribute() {
return new String[] {IMarker.LINE_NUMBER};
}
@@ -78,6 +79,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IMarkerUpdater#getMarkerType()
*/
+ @Override
public String getMarkerType() {
return "org.eclipse.debug.core.breakpointMarker"; //$NON-NLS-1$
}
@@ -85,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IMarkerUpdater#updateMarker(org.eclipse.core.resources.IMarker, org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position)
*/
+ @Override
public boolean updateMarker(IMarker marker, IDocument document, Position position) {
if(position.isDeleted()) {
return false;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
index 15d40ec..c616ea8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -99,15 +99,17 @@
text.setFont(container.getFont());
text.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
validateChange();
- if (!filterValid)
- updateStatus(new StatusInfo(IStatus.ERROR, DebugUIMessages.CreateStepFilterDialog_4));
- else if (isDuplicateFilter(text.getText().trim())) {
+ if (!filterValid) {
+ updateStatus(new StatusInfo(IStatus.ERROR, DebugUIMessages.CreateStepFilterDialog_4));
+ } else if (isDuplicateFilter(text.getText().trim())) {
updateStatus(new StatusInfo(IStatus.WARNING, DebugUIMessages.CreateStepFilterDialog_5));
return;
- } else
- updateStatus(new StatusInfo());
+ } else {
+ updateStatus(new StatusInfo());
+ }
}
});
@@ -129,9 +131,11 @@
}
private boolean isDuplicateFilter(String trimmedValue) {
- for (int i=0; i<existingFilters.length; i++)
- if(existingFilters[i].getName().equals(trimmedValue))
+ for (int i=0; i<existingFilters.length; i++) {
+ if(existingFilters[i].getName().equals(trimmedValue)) {
return true;
+ }
+ }
return false;
}
/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
index b3b6f5b..3e18332 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -79,6 +79,7 @@
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(Object another) {
DetailFormatter detailFormatter= (DetailFormatter)another;
if (fTypeName == null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java
index c854ec9..28aa315 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java
@@ -173,6 +173,7 @@
fTypeNameText.setEditable(fEditTypeName);
fTypeNameText.setText(fDetailFormatter.getTypeName());
fTypeNameText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
fTypeSearched= false;
checkValues();
@@ -182,6 +183,7 @@
Button typeSearchButton = SWTFactory.createPushButton(innerContainer, DebugUIMessages.DetailFormatterDialog_Select__type_4, null);
typeSearchButton.setEnabled(fEditTypeName);
typeSearchButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
selectType();
}
@@ -205,6 +207,7 @@
// Set up content assist in the viewer
IHandler handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
if (fSnippetViewer.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS) && fSnippetViewer.getControl().isFocusControl()){
findCorrespondingType();
@@ -249,8 +252,10 @@
document.set(fDetailFormatter.getSnippet());
fSnippetViewer.getDocument().addDocumentListener(new IDocumentListener() {
+ @Override
public void documentAboutToBeChanged(DocumentEvent event) {
}
+ @Override
public void documentChanged(DocumentEvent event) {
checkValues();
}
@@ -374,6 +379,7 @@
/**
* Return the type object which corresponds to the given name.
*/
+ @Override
public IType getType() {
if (!fTypeSearched) {
findCorrespondingType();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
index 0397721..0b4d2be 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
@@ -100,18 +100,21 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getElements();
}
@@ -224,6 +227,7 @@
fParentComposite= parent;
IHandler handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
if(fSnippetViewer.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS) && fSnippetViewer.getControl().isFocusControl()){
findCorrespondingType();
@@ -385,6 +389,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
*/
+ @Override
public void handleEvent(Event event) {
Widget source= event.widget;
switch (event.type) {
@@ -541,6 +546,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
saveAttributeValue();
fCurrentAttributeSelection= (IStructuredSelection) event.getSelection();
@@ -643,6 +649,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
*/
+ @Override
public void documentAboutToBeChanged(DocumentEvent event) {
// nothing to do
}
@@ -650,6 +657,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
*/
+ @Override
public void documentChanged(DocumentEvent event) {
checkValues();
}
@@ -729,6 +737,7 @@
* Return the type object which corresponds to the given name.
* @return the {@link IType}
*/
+ @Override
public IType getType() {
if (!fTypeSearched) {
findCorrespondingType();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
index 2da4eb9..4784cb9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
@@ -71,6 +71,7 @@
public static void startup() {
Runnable r = new Runnable() {
+ @Override
public void run() {
if (fgManager == null) {
fgManager = new EvaluationContextManager();
@@ -90,6 +91,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowActivated(IWorkbenchWindow window) {
fActiveWindow = window;
}
@@ -97,18 +99,21 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowClosed(IWorkbenchWindow window) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowDeactivated(IWorkbenchWindow window) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowOpened(IWorkbenchWindow window) {
}
@@ -249,6 +254,7 @@
return frame;
}
+ @Override
public void debugContextChanged(DebugContextEvent event) {
if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
IWorkbenchPart part = event.getDebugContextProvider().getPart();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextStatusHandler.java
index 64dbe76..1b0d3fb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextStatusHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextStatusHandler.java
@@ -29,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object)
*/
+ @Override
public Object handleStatus(IStatus status, Object source) {
if (source instanceof IDebugElement) {
IDebugElement element = (IDebugElement) source;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationStackFrameContextStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationStackFrameContextStatusHandler.java
index 4767d15..1fd14bd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationStackFrameContextStatusHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationStackFrameContextStatusHandler.java
@@ -28,6 +28,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object)
*/
+ @Override
public Object handleStatus(IStatus status, Object source) {
if (source instanceof IDebugElement) {
IDebugElement element = (IDebugElement) source;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
index be9dc54..da64626 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2012 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -130,6 +130,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentPaneID()
*/
+ @Override
public String getCurrentPaneID() {
return fDetailPane.getCurrentPaneID();
}
@@ -137,6 +138,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentSelection()
*/
+ @Override
public IStructuredSelection getCurrentSelection() {
return (IStructuredSelection)fViewer.getSelection();
}
@@ -144,6 +146,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#refreshDetailPaneContents()
*/
+ @Override
public void refreshDetailPaneContents() {
fDetailPane.display(getCurrentSelection());
}
@@ -151,6 +154,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getParentComposite()
*/
+ @Override
public Composite getParentComposite() {
return fDetailPaneComposite;
}
@@ -158,6 +162,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getWorkbenchPartSite()
*/
+ @Override
public IWorkbenchPartSite getWorkbenchPartSite() {
return null;
}
@@ -165,6 +170,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#paneChanged(java.lang.String)
*/
+ @Override
public void paneChanged(String newPaneID) {
if (newPaneID.equals(DefaultDetailPane.ID)){
fDetailPane.getCurrentControl().setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
@@ -321,22 +327,28 @@
fTree = fViewer.getTree();
fTree.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
fDetailPane.display((IStructuredSelection)fViewer.getSelection());
}
- public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {}
});
initSashWeights();
// add update listener to auto-select and display details of root expression
fViewer.addViewerUpdateListener(new IViewerUpdateListener() {
+ @Override
public void viewerUpdatesComplete() {
}
+ @Override
public void viewerUpdatesBegin() {
}
+ @Override
public void updateStarted(IViewerUpdate update) {
}
+ @Override
public void updateComplete(IViewerUpdate update) {
if (update instanceof IChildrenUpdate) {
TreeSelection selection = new TreeSelection(new TreePath(new Object[]{fVariable}));
@@ -422,6 +434,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.IInformationControlExtension#hasContents()
*/
+ @Override
public boolean hasContents() {
return fVariable != null;
}
@@ -429,6 +442,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
*/
+ @Override
public void setInput(Object input) {
if (input instanceof IVariable) {
fVariable = (IVariable) input;
@@ -456,6 +470,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell)
*/
+ @Override
public IInformationControl createInformationControl(Shell parent) {
return new ExpressionInformationControl(parent, false);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
index ba014fb..9285967 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/**
* @see ITableLabelProvider#getColumnText(Object, int)
*/
+ @Override
public String getColumnText(Object object, int column) {
if (column == 0) {
return ((Filter) object).getName();
@@ -49,6 +50,7 @@
/**
* @see ITableLabelProvider#getColumnImage(Object, int)
*/
+ @Override
public Image getColumnImage(Object object, int column) {
String name = ((Filter) object).getName();
if (name.endsWith("*") || name.equals("(default package)")) { //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HeapWalkingPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HeapWalkingPreferencePage.java
index a1b2eb8..0e5af43 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HeapWalkingPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HeapWalkingPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {
fErrorMessages = new HashMap<Object, String>();
}
@@ -80,10 +81,13 @@
SWTFactory.createLabel(group, DebugUIMessages.HeapWalkingPreferencePage_1, 1);
fAllInstancesMaxCount = SWTFactory.createSingleText(group, 1);
fAllInstancesMaxCount.addModifyListener(new ModifyListener(){
+ @Override
public void modifyText(ModifyEvent e) {
try{
int result = Integer.parseInt(fAllInstancesMaxCount.getText());
- if (result < 0) throw new NumberFormatException();
+ if (result < 0) {
+ throw new NumberFormatException();
+ }
clearErrorMessage(fAllInstancesMaxCount);
} catch (NumberFormatException exception){
setErrorMessage(fAllInstancesMaxCount, DebugUIMessages.HeapWalkingPreferencePage_6);
@@ -95,10 +99,13 @@
SWTFactory.createLabel(group, DebugUIMessages.HeapWalkingPreferencePage_2, 1);
fAllReferencesMaxCount = SWTFactory.createSingleText(group, 1);
fAllReferencesMaxCount.addModifyListener(new ModifyListener(){
+ @Override
public void modifyText(ModifyEvent e) {
try{
int result = Integer.parseInt(fAllReferencesMaxCount.getText());
- if (result < 0) throw new NumberFormatException();
+ if (result < 0) {
+ throw new NumberFormatException();
+ }
clearErrorMessage(fAllReferencesMaxCount);
} catch (NumberFormatException exception){
setErrorMessage(fAllReferencesMaxCount, DebugUIMessages.HeapWalkingPreferencePage_6);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HotCodeReplaceErrorDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HotCodeReplaceErrorDialog.java
index 8f37a40..13a74fb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HotCodeReplaceErrorDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/HotCodeReplaceErrorDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,6 +92,7 @@
*/
protected void blockMnemonicWithoutModifier(Button button) {
button.addTraverseListener(new TraverseListener() {
+ @Override
public void keyTraversed(TraverseEvent e) {
if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit == true && e.stateMask != SWT.MOD3) {
e.doit= false;
@@ -110,6 +111,7 @@
final String[] operation = new String[1];
ex[0] = null;
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
if (id == TERMINATE_ID) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
index 75ba3e9..97b147f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,13 +16,11 @@
import java.util.Iterator;
import java.util.Map;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.core.runtime.Assert;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
/**
* A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
*/
@@ -59,17 +57,20 @@
* if the image descriptor can't create the requested image.
*/
public Image get(ImageDescriptor descriptor) {
- if (descriptor == null)
+ if (descriptor == null) {
descriptor= ImageDescriptor.getMissingImageDescriptor();
+ }
Image result= fRegistry.get(descriptor);
- if (result != null)
+ if (result != null) {
return result;
+ }
Assert.isTrue(fDisplay == JDIDebugUIPlugin.getStandardDisplay(), DebugUIMessages.ImageDescriptorRegistry_Allocating_image_for_wrong_display_1);
result= descriptor.createImage();
- if (result != null)
+ if (result != null) {
fRegistry.put(descriptor, result);
+ }
return result;
}
@@ -86,8 +87,10 @@
private void hookDisplay() {
fDisplay.asyncExec(new Runnable() {
+ @Override
public void run() {
fDisplay.disposeExec(new Runnable() {
+ @Override
public void run() {
dispose();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
index 39e1b2c..3f878a1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -341,6 +341,7 @@
final Object [] ret = new Object[1];
final CoreException [] exc = new CoreException[1];
BusyIndicator.showWhile(null, new Runnable() {
+ @Override
public void run() {
try {
ret[0] = element.createExecutableExtension(classAttribute);
@@ -411,9 +412,13 @@
new ExceptionInspector();
ResourcesPlugin.getWorkspace().addSaveParticipant(getUniqueIdentifier(), new ISaveParticipant() {
+ @Override
public void doneSaving(ISaveContext sc) {}
+ @Override
public void prepareToSave(ISaveContext sc) throws CoreException {}
+ @Override
public void rollback(ISaveContext sc) {}
+ @Override
public void saving(ISaveContext sc) throws CoreException {
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(getUniqueIdentifier());
if(prefs != null) {
@@ -497,8 +502,9 @@
public static Display getStandardDisplay() {
Display display;
display= Display.getCurrent();
- if (display == null)
+ if (display == null) {
display= Display.getDefault();
+ }
return display;
}
@@ -540,6 +546,7 @@
final JavaModelException[] exception= new JavaModelException[1];
final boolean[] monitorCanceled = new boolean[] {false};
IRunnableWithProgress r= new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) {
try {
Set<String> packageNameSet= new HashSet<String>();
@@ -652,6 +659,7 @@
final PreferenceDialog dialog = new PreferenceDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), manager);
final boolean [] result = new boolean[] { false };
BusyIndicator.showWhile(JDIDebugUIPlugin.getStandardDisplay(), new Runnable() {
+ @Override
public void run() {
dialog.create();
dialog.setMessage(targetNode.getLabelText());
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index f6aa34b..ec1781f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -156,6 +156,7 @@
/**
* @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener)
*/
+ @Override
public void computeDetail(IValue value, IValueDetailListener listener) {
IJavaThread thread = getEvaluationThread((IJavaDebugTarget)value.getDebugTarget());
if (thread == null) {
@@ -1121,6 +1122,7 @@
/**
* @see IDebugModelPresentation#getEditorInput(Object)
*/
+ @Override
public IEditorInput getEditorInput(Object item) {
if (item instanceof IMarker) {
item = getBreakpoint((IMarker)item);
@@ -1154,6 +1156,7 @@
/**
* @see IDebugModelPresentation#getEditorId(IEditorInput, Object)
*/
+ @Override
public String getEditorId(IEditorInput input, Object inputObject) {
try {
IEditorDescriptor descriptor= IDE.getEditorDescriptor(input.getName());
@@ -1166,6 +1169,7 @@
/**
* @see IDebugModelPresentation#setAttribute(String, Object)
*/
+ @Override
public void setAttribute(String id, Object value) {
if (value == null) {
return;
@@ -1317,7 +1321,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
*/
- public void detailComputed(IValue computedValue, String result) {
+ @Override
+ public void detailComputed(IValue computedValue, String result) {
synchronized (lock) {
detail[0]= result;
lock.notifyAll();
@@ -2029,6 +2034,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
*/
+ @Override
public Color getForeground(Object element) {
if (element instanceof JavaContendedMonitor && ((JavaContendedMonitor)element).getMonitor().isInDeadlock()) {
return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry().get(IJDIPreferencesConstants.PREF_THREAD_MONITOR_IN_DEADLOCK_COLOR);
@@ -2051,6 +2057,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
*/
+ @Override
public Color getBackground(Object element) {
return null;
}
@@ -2062,6 +2069,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDebugModelPresentationExtension#requiresUIThread(java.lang.Object)
*/
+ @Override
public synchronized boolean requiresUIThread(Object element) {
return !isInitialized();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
index 85ba02f..4a92484 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -76,6 +76,7 @@
StyledText text= this.getTextWidget();
final int baseLevel= (styles & SWT.RIGHT_TO_LEFT) != 0 ? Bidi.DIRECTION_RIGHT_TO_LEFT : Bidi.DIRECTION_LEFT_TO_RIGHT;
text.addBidiSegmentListener(new BidiSegmentListener() {
+ @Override
public void lineGetSegments(BidiSegmentEvent event) {
try {
event.segments= getBidiLineSegments(getDocument(), baseLevel, widgetOffset2ModelOffset(event.lineOffset), event.lineText);
@@ -239,6 +240,7 @@
/**
* @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
IContentAssistant assistant= getContentAssistant();
if (assistant instanceof ContentAssistant) {
@@ -331,12 +333,14 @@
*/
protected static int[] getBidiLineSegments(IDocument document, int baseLevel, int lineStart, String lineText) throws BadLocationException {
- if (lineText == null || document == null)
+ if (lineText == null || document == null) {
return null;
+ }
int lineLength= lineText.length();
- if (lineLength <= 2)
+ if (lineLength <= 2) {
return null;
+ }
// Have ICU compute embedding levels. Consume these levels to reduce
// the Bidi impact, by creating selective segments (preceding
@@ -347,14 +351,16 @@
// unavailability of such methods as isLeftToRight and getLevels.
Bidi bidi= new Bidi(lineText, baseLevel);
- if (bidi.isLeftToRight())
+ if (bidi.isLeftToRight()) {
// Bail out if this is not Bidi text.
return null;
+ }
IRegion line= document.getLineInformationOfOffset(lineStart);
ITypedRegion[] linePartitioning= TextUtilities.computePartitioning(document, IJavaPartitions.JAVA_PARTITIONING, lineStart, line.getLength(), false);
- if (linePartitioning == null || linePartitioning.length < 1)
+ if (linePartitioning == null || linePartitioning.length < 1) {
return null;
+ }
int segmentIndex= 1;
int[] segments= new int[lineLength + 1];
@@ -386,15 +392,18 @@
}
}
}
- if (segmentIndex <= 1)
+ if (segmentIndex <= 1) {
return null;
+ }
segments[0]= 0;
- if (segments[segmentIndex - 1] != lineLength)
+ if (segments[segmentIndex - 1] != lineLength) {
segments[segmentIndex++]= lineLength;
+ }
- if (segmentIndex == segments.length)
+ if (segmentIndex == segments.length) {
return segments;
+ }
int[] newSegments= new int[segmentIndex];
System.arraycopy(segments, 0, newSegments, 0, segmentIndex);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaBreakpointWorkbenchAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaBreakpointWorkbenchAdapterFactory.java
index d57f1a0..6fe66fb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaBreakpointWorkbenchAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaBreakpointWorkbenchAdapterFactory.java
@@ -27,6 +27,7 @@
*/
@SuppressWarnings("unchecked")
public class JavaBreakpointWorkbenchAdapterFactory implements IAdapterFactory {
+ @Override
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType != IWorkbenchAdapter.class || !(adaptableObject instanceof IJavaBreakpoint)) {
return null;
@@ -34,10 +35,12 @@
return (T) new IWorkbenchAdapter() {
private JavaElementLabelProvider fJavaLabelProvider;
+ @Override
public Object[] getChildren(Object o) {
return null;
}
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return null;
}
@@ -48,6 +51,7 @@
* in situations where the user is changing values (like the title bar
* of the property dialog).
*/
+ @Override
public String getLabel(Object o) {
if (!(o instanceof IJavaBreakpoint)) {
return null;
@@ -106,6 +110,7 @@
return label.toString();
}
+ @Override
public Object getParent(Object o) {
return null;
}
@@ -119,6 +124,7 @@
};
}
+ @Override
public Class<?>[] getAdapterList() {
return new Class[] { IWorkbenchAdapter.class };
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
index ef41fcb..30fc593 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
@@ -68,6 +68,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover#setEditor(org.eclipse.ui.IEditorPart)
*/
+ @Override
public void setEditor(IEditorPart editor) {
fEditor = editor;
}
@@ -75,6 +76,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
*/
+ @Override
public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
return JavaWordFinder.findWord(textViewer.getDocument(), offset);
}
@@ -97,6 +99,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
*/
+ @Override
public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
Object object = getHoverInfo2(textViewer, hoverRegion);
if (object instanceof IVariable) {
@@ -230,6 +233,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
*/
+ @Override
public IInformationControlCreator getHoverControlCreator() {
return new ExpressionInformationControlCreator();
}
@@ -237,6 +241,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
*/
+ @Override
public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
IJavaStackFrame frame = getFrame();
if (frame != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
index 6d80b95..bfb7f63 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
@@ -307,6 +307,7 @@
/**
* @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
String property = event.getProperty();
if (property.equals(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS)) {
@@ -502,6 +503,7 @@
*
* @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
@@ -540,12 +542,14 @@
/**
* @see IJavaBreakpointListener#addingBreakpoint(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/**
* @see IJavaBreakpointListener#installingBreakpoint(IJavaDebugTarget, IJavaBreakpoint, IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return DONT_CARE;
}
@@ -553,6 +557,7 @@
/**
* @see IJavaBreakpointListener#breakpointHit(IJavaThread, IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
return DONT_CARE;
}
@@ -560,12 +565,14 @@
/**
* @see IJavaBreakpointListener#breakpointInstalled(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/**
* @see IJavaBreakpointListener#breakpointRemoved(IJavaDebugTarget, IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
@@ -603,6 +610,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(final IJavaLineBreakpoint breakpoint, final DebugException exception) {
IStatus status;
Throwable wrappedException= exception.getStatus().getException();
@@ -619,6 +627,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(final IJavaLineBreakpoint breakpoint, final Message[] errors) {
StringBuffer message= new StringBuffer();
Message error;
@@ -638,6 +647,7 @@
}
final String message= NLS.bind(errorMessage, new String[] {fLabelProvider.getText(breakpoint)});
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
@@ -679,12 +689,14 @@
*
* @see ILaunchListener#launchAdded(ILaunch)
*/
+ @Override
public void launchAdded(ILaunch launch) {
launchChanged(launch);
}
/**
* @see ILaunchListener#launchChanged(ILaunch)
*/
+ @Override
public void launchChanged(ILaunch launch) {
activate();
DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
@@ -693,6 +705,7 @@
/**
* @see ILaunchListener#launchRemoved(ILaunch)
*/
+ @Override
public void launchRemoved(ILaunch launch) {
}
@@ -701,6 +714,7 @@
*
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[])
*/
+ @Override
public void breakpointsAdded(final IBreakpoint[] breakpoints) {
// if a breakpoint is added, but already has a message, do not update it
List<IBreakpoint> update = new ArrayList<IBreakpoint>();
@@ -726,6 +740,7 @@
*/
private void updateBreakpointMessages(final IBreakpoint[] breakpoints) {
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
for (int i = 0; i < breakpoints.length; i++) {
IBreakpoint breakpoint = breakpoints[i];
@@ -756,6 +771,7 @@
*
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
*/
+ @Override
public void breakpointsChanged(
IBreakpoint[] breakpoints,
IMarkerDelta[] deltas) {
@@ -766,6 +782,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
*/
+ @Override
public void breakpointsRemoved(
IBreakpoint[] breakpoints,
IMarkerDelta[] deltas) {
@@ -774,7 +791,8 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.core.logicalstructures.IJavaStructuresListener#logicalStructuresChanged()
*/
- public void logicalStructuresChanged() {
+ @Override
+ public void logicalStructuresChanged() {
variableViewSettingsChanged();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
index 88e6097..8e6f26a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -172,6 +172,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {}
/* (non-Javadoc)
@@ -285,6 +286,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(FieldEditor.IS_VALID)) {
boolean newValue = ((Boolean) event.getNewValue()).booleanValue();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
index 7bf797f..9ec16bd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
@@ -130,6 +130,7 @@
*/
public void computeValueDetail(final IJavaValue objectValue, final IJavaThread thread, final IValueDetailListener listener) {
thread.queueRunnable(new Runnable() {
+ @Override
public void run() {
resolveFormatter(objectValue, thread, listener);
}
@@ -433,6 +434,7 @@
/**
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
String property = event.getProperty();
if (property.equals(IJDIPreferencesConstants.PREF_DETAIL_FORMATTERS_LIST) ||
@@ -456,6 +458,7 @@
/**
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
@@ -468,18 +471,21 @@
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(ILaunch[])
*/
+ @Override
public void launchesAdded(ILaunch[] launches) {
}
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(ILaunch[])
*/
+ @Override
public void launchesChanged(ILaunch[] launches) {
}
/**
* @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(ILaunch[])
*/
+ @Override
public void launchesRemoved(ILaunch[] launches) {
for (int i = 0; i < launches.length; i++) {
ILaunch launch = launches[i];
@@ -590,6 +596,7 @@
fListener= listener;
}
+ @Override
public void evaluationComplete(IEvaluationResult result) {
if (result.hasErrors()) {
StringBuffer error= new StringBuffer(DebugUIMessages.JavaDetailFormattersManager_Detail_formatter_error___1);
@@ -650,6 +657,7 @@
}
IEvaluationRunnable eval = new IEvaluationRunnable() {
+ @Override
public void run(IJavaThread thread, IProgressMonitor monitor) throws DebugException {
StringBuffer buf= new StringBuffer();
if (objectValue instanceof IJavaArray) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java
index 8b804c6..81d327d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,6 +108,7 @@
/**
* @see IWorkbenchPreferencePage#init(IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {
}
@@ -168,16 +169,19 @@
}
});
fFormatterListViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
((DetailFormatter)event.getElement()).setEnabled(event.getChecked());
}
});
fFormatterListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updatePage((IStructuredSelection)event.getSelection());
}
});
fFormatterListViewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
if (!event.getSelection().isEmpty()) {
editType();
@@ -230,6 +234,7 @@
fAddFormatterButton.setFont(font);
setButtonLayoutData(fAddFormatterButton);
fAddFormatterButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
addType();
}
@@ -242,6 +247,7 @@
fEditFormatterButton.setFont(font);
setButtonLayoutData(fEditFormatterButton);
fEditFormatterButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
editType();
}
@@ -255,6 +261,7 @@
fRemoveFormatterButton.setFont(font);
setButtonLayoutData(fRemoveFormatterButton);
fRemoveFormatterButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
removeTypes();
}
@@ -452,6 +459,7 @@
/**
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return fDetailFormattersSet.toArray();
}
@@ -463,12 +471,14 @@
/**
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
index b312d52..3a347e9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
@@ -11,25 +11,19 @@
package org.eclipse.jdt.internal.debug.ui;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener;
-import org.eclipse.osgi.util.NLS;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
-
import org.eclipse.debug.ui.DebugUITools;
-
+import org.eclipse.jdt.debug.core.IJavaDebugTarget;
+import org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener;
import org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookLauncher;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
public class JavaHotCodeReplaceListener implements IJavaHotCodeReplaceListener {
@@ -40,12 +34,14 @@
/**
* @see IJavaHotCodeReplaceListener#hotCodeReplaceSucceeded(IJavaDebugTarget)
*/
+ @Override
public void hotCodeReplaceSucceeded(IJavaDebugTarget target) {
}
/**
* @see IJavaHotCodeReplaceListener#hotCodeReplaceFailed(IJavaDebugTarget, DebugException)
*/
+ @Override
public void hotCodeReplaceFailed(final IJavaDebugTarget target, final DebugException exception) {
if ((exception != null &&!JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED)) ||
((exception == null) && !JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED))) {
@@ -90,6 +86,7 @@
final String title = DebugUIMessages.JDIDebugUIPlugin_Hot_code_replace_failed_1;
final String message = NLS.bind(DebugUIMessages.JDIDebugUIPlugin__0__was_unable_to_replace_the_running_code_with_the_code_in_the_workspace__2, new Object[] {vmName, launchName});
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
@@ -117,6 +114,7 @@
/**
* @see IJavaHotCodeReplaceListener#obsoleteMethods(IJavaDebugTarget)
*/
+ @Override
public void obsoleteMethods(final IJavaDebugTarget target) {
if (!JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS)) {
return;
@@ -131,6 +129,7 @@
final IStatus status= new Status(IStatus.WARNING, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, DebugUIMessages.JDIDebugUIPlugin_Stepping_may_be_hazardous_1, null);
final String toggleMessage= DebugUIMessages.JDIDebugUIPlugin_2;
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
index c28d728..3f223fb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -71,7 +71,8 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
- public String getColumnText(Object element, int columnIndex) {
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
JavaLogicalStructure logicalStructure= (JavaLogicalStructure) element;
StringBuffer buffer= new StringBuffer();
if (columnIndex == 0) {
@@ -96,6 +97,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
*/
+ @Override
public Color getForeground(Object element) {
if (element instanceof JavaLogicalStructure) {
if (((JavaLogicalStructure) element).isContributed()) {
@@ -108,6 +110,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
*/
+ @Override
public Color getBackground(Object element) {
if (element instanceof JavaLogicalStructure) {
if (((JavaLogicalStructure) element).isContributed()) {
@@ -120,7 +123,8 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
- public Image getColumnImage(Object element, int columnIndex) {
+ @Override
+ public Image getColumnImage(Object element, int columnIndex) {
return null;
}
}
@@ -140,20 +144,23 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
- public Object[] getElements(Object inputElement) {
+ @Override
+ public Object[] getElements(Object inputElement) {
return fLogicalStructures.toArray();
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
/**
@@ -347,7 +354,8 @@
fLogicalStructuresViewer.addSelectionChangedListener(this);
fLogicalStructuresViewer.setInput(this);
fLogicalStructuresViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
+ @Override
+ public void doubleClick(DoubleClickEvent event) {
IStructuredSelection selection= ((IStructuredSelection) fLogicalStructuresViewer.getSelection());
if (selection.size() == 1 && !((JavaLogicalStructure) selection.getFirstElement()).isContributed()) {
editLogicalStructure();
@@ -389,11 +397,13 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection= event.getSelection();
if (selection instanceof IStructuredSelection) {
@@ -455,6 +465,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
*/
+ @Override
public void handleEvent(Event event) {
Widget source= event.widget;
if (source == fAddLogicalStructureButton) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java
index b58a6ee..27b3bfb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaPrimitivesPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -86,6 +86,7 @@
/**
* @see IWorkbenchPreferencePage#init(IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java
index 6d7a94e..f03aebf 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaSourceLocationWorkbenchAdapterFactory.java
@@ -41,6 +41,7 @@
/**
* @see IWorkbenchAdapter#getChildren(Object)
*/
+ @Override
public Object[] getChildren(Object o) {
return new Object[0];
}
@@ -48,6 +49,7 @@
/**
* @see IWorkbenchAdapter#getImageDescriptor(Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object o) {
if (o instanceof JavaProjectSourceLocation) {
return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(IDE.SharedImages.IMG_OBJ_PROJECT);
@@ -62,6 +64,7 @@
/**
* @see IWorkbenchAdapter#getLabel(Object)
*/
+ @Override
public String getLabel(Object o) {
if (o instanceof JavaProjectSourceLocation) {
return fJavaElementLabelProvider.getText(((JavaProjectSourceLocation)o).getJavaProject());
@@ -81,6 +84,7 @@
/**
* @see IWorkbenchAdapter#getParent(Object)
*/
+ @Override
public Object getParent(Object o) {
return null;
}
@@ -89,6 +93,7 @@
/**
* @see IAdapterFactory#getAdapter(Object, Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object obj, Class<T> adapterType) {
if (adapterType.isInstance(obj)) {
@@ -105,6 +110,7 @@
/**
* @see IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[] {
IWorkbenchAdapter.class,
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameActionFilter.java
index c7fb97e..1b3e7c9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameActionFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameActionFilter.java
@@ -21,6 +21,7 @@
/**
* @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
*/
+ @Override
public boolean testAttribute(Object target, String name, String value) {
IJavaStackFrame frame = null;
if (target instanceof IStackFrame) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
index 97267bd..614f4e1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -71,10 +71,13 @@
initTableState(false);
}
+ @Override
public Object[] getElements(Object inputElement) {return getAllFiltersFromTable();}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+ @Override
public void dispose() {}
}
@@ -119,6 +122,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {}
/**
@@ -138,9 +142,11 @@
Composite container = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_BOTH, 0, 0);
fUseStepFiltersButton = SWTFactory.createCheckButton(container, DebugUIMessages.JavaStepFilterPreferencePage__Use_step_filters, null, DebugUITools.isUseStepFilters(), 2);
fUseStepFiltersButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
setPageEnablement(fUseStepFiltersButton.getSelection());
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
}
);
@@ -153,11 +159,13 @@
fTableViewer.setInput(getAllStoredFilters(false));
fTableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
fTableViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
((Filter)event.getElement()).setChecked(event.getChecked());
}
});
fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (selection.isEmpty()) {
@@ -260,6 +268,7 @@
DebugUIMessages.JavaStepFilterPreferencePage_Add__Filter_9,
DebugUIMessages.JavaStepFilterPreferencePage_Key_in_the_name_of_a_new_step_filter_10, null);
fAddFilterButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
addFilter();
}
@@ -269,6 +278,7 @@
DebugUIMessages.JavaStepFilterPreferencePage_Add__Type____11,
DebugUIMessages.JavaStepFilterPreferencePage_Choose_a_Java_type_and_add_it_to_step_filters_12, null);
fAddTypeButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
addType();
}
@@ -278,6 +288,7 @@
DebugUIMessages.JavaStepFilterPreferencePage_Add__Package____13,
DebugUIMessages.JavaStepFilterPreferencePage_Choose_a_package_and_add_it_to_step_filters_14, null);
fAddPackageButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
addPackage();
}
@@ -288,6 +299,7 @@
DebugUIMessages.JavaStepFilterPreferencePage_Remove_all_selected_step_filters_16,
null);
fRemoveFilterButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
removeFilters();
}
@@ -306,6 +318,7 @@
DebugUIMessages.JavaStepFilterPreferencePage__Select_All_1,
DebugUIMessages.JavaStepFilterPreferencePage_Selects_all_step_filters_2, null);
fSelectAllButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
fTableViewer.setAllChecked(true);
}
@@ -315,6 +328,7 @@
DebugUIMessages.JavaStepFilterPreferencePage_Deselect_All_3,
DebugUIMessages.JavaStepFilterPreferencePage_Deselects_all_step_filters_4, null);
fDeselectAllButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
fTableViewer.setAllChecked(false);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaThreadActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaThreadActionFilter.java
index e73f57a..4386386 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaThreadActionFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaThreadActionFilter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@
*/
public class JavaThreadActionFilter implements IActionFilter {
+ @Override
public boolean testAttribute(Object target, String name, String value) {
if (target instanceof IJavaThread) {
if (name.equals("TerminateEvaluationActionFilter") //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java
index 2a0b5dc..f12edd1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -159,6 +159,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String, java.lang.String)
*/
+ @Override
public boolean testAttribute(Object target, String name, String value) {
if (target instanceof IJavaVariable) {
IJavaVariable var = (IJavaVariable) target;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWatchExpressionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWatchExpressionDelegate.java
index 0d48523..c4e5ef4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWatchExpressionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWatchExpressionDelegate.java
@@ -43,6 +43,7 @@
/**
* @see org.eclipse.debug.core.model.IWatchExpressionDelegate#getValue(java.lang.String, org.eclipse.debug.core.model.IDebugElement)
*/
+ @Override
public void evaluateExpression(String expression, IDebugElement context, IWatchExpressionListener listener) {
fExpressionText= expression;
fListener= listener;
@@ -108,6 +109,7 @@
fStackFrame= frame;
}
+ @Override
public void run() {
IJavaProject project = JavaDebugUtils.resolveJavaProject(fStackFrame);
if (project == null) {
@@ -117,20 +119,26 @@
IAstEvaluationEngine evaluationEngine= JDIDebugPlugin.getDefault().getEvaluationEngine(project, (IJavaDebugTarget) fStackFrame.getDebugTarget());
// the evaluation listener
IEvaluationListener listener= new IEvaluationListener() {
+ @Override
public void evaluationComplete(final IEvaluationResult result) {
IWatchExpressionResult watchResult= new IWatchExpressionResult() {
+ @Override
public IValue getValue() {
return result.getValue();
}
+ @Override
public boolean hasErrors() {
return result.hasErrors();
}
+ @Override
public String[] getErrorMessages() {
return JavaInspectExpression.getErrorMessages(result);
}
+ @Override
public String getExpressionText() {
return result.getSnippet();
}
+ @Override
public DebugException getException() {
return result.getException();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
index daf13c3..d61c7c4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,6 +25,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#exists()
*/
+ @Override
public boolean exists() {
return ((LocalFileStorage)getStorage()).getFile().exists();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java
index 0dfe3fe..e9f7a1d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java
@@ -33,6 +33,7 @@
/**
* @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
*/
+ @Override
public boolean testAttribute(Object target, String name, String value) {
if (name.equals("MemberActionFilter")) { //$NON-NLS-1$
if (target instanceof IMember) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java
index e9fe3bf..9b81ef5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
/**
* @see org.eclipse.debug.core.IStatusHandler#handleStatus(IStatus, Object)
*/
+ @Override
public Object handleStatus(IStatus status, Object source) {
ReferenceType type= (ReferenceType) source;
IPreferenceStore preferenceStore= JDIDebugUIPlugin.getDefault().getPreferenceStore();
@@ -36,6 +37,7 @@
preferenceStore);
Display display= JDIDebugUIPlugin.getStandardDisplay();
display.syncExec(new Runnable() {
+ @Override
public void run() {
dialog.open();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StatusInfo.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StatusInfo.java
index 76b3a26..957a9ab 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StatusInfo.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StatusInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -45,6 +45,7 @@
/**
* Returns if the status' severity is OK.
*/
+ @Override
public boolean isOK() {
return fSeverity == IStatus.OK;
}
@@ -73,6 +74,7 @@
/**
* @see IStatus#getMessage
*/
+ @Override
public String getMessage() {
return fStatusMessage;
}
@@ -118,6 +120,7 @@
/*
* @see IStatus#matches(int)
*/
+ @Override
public boolean matches(int severityMask) {
return (fSeverity & severityMask) != 0;
}
@@ -126,6 +129,7 @@
* Returns always <code>false</code>.
* @see IStatus#isMultiStatus()
*/
+ @Override
public boolean isMultiStatus() {
return false;
}
@@ -133,6 +137,7 @@
/*
* @see IStatus#getSeverity()
*/
+ @Override
public int getSeverity() {
return fSeverity;
}
@@ -140,6 +145,7 @@
/*
* @see IStatus#getPlugin()
*/
+ @Override
public String getPlugin() {
return JavaUI.ID_PLUGIN;
}
@@ -148,6 +154,7 @@
* Returns always <code>null</code>.
* @see IStatus#getException()
*/
+ @Override
public Throwable getException() {
return null;
}
@@ -156,6 +163,7 @@
* Returns always the error severity.
* @see IStatus#getCode()
*/
+ @Override
public int getCode() {
return fSeverity;
}
@@ -164,6 +172,7 @@
* Returns always <code>null</code>.
* @see IStatus#getChildren()
*/
+ @Override
public IStatus[] getChildren() {
return new IStatus[0];
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
index ae8b504..aba5ea9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@
/**
* @see IStorageEditorInput#getStorage()
*/
+ @Override
public IStorage getStorage() {
return fStorage;
}
@@ -44,6 +45,7 @@
/**
* @see IEditorInput#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_CUNIT);
}
@@ -51,6 +53,7 @@
/**
* @see IEditorInput#getName()
*/
+ @Override
public String getName() {
return getStorage().getName();
}
@@ -58,6 +61,7 @@
/**
* @see IEditorInput#getPersistable()
*/
+ @Override
public IPersistableElement getPersistable() {
return null;
}
@@ -65,6 +69,7 @@
/**
* @see IEditorInput#getToolTipText()
*/
+ @Override
public String getToolTipText() {
return getStorage().getFullPath().toOSString();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
index 719557b..04c7562 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,11 +24,13 @@
/**
* @see IStatusHandler#handleStatus(IStatus, Object)
*/
+ @Override
public Object handleStatus(IStatus status, Object source) throws CoreException {
IJavaThread thread= (IJavaThread) source;
final ErrorDialog dialog= new ErrorDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), DebugUIMessages.SuspendTimeoutHandler_suspend, NLS.bind(DebugUIMessages.SuspendTimeoutHandler_timeout_occurred, new String[] {thread.getName()}), status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO); //
Display display= JDIDebugUIPlugin.getStandardDisplay();
display.syncExec(new Runnable() {
+ @Override
public void run() {
dialog.open();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
index 6ea7869..09562eb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#exists()
*/
+ @Override
public boolean exists() {
return true;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractAddStepFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractAddStepFilterAction.java
index c044fde..1eda4c9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractAddStepFilterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractAddStepFilterAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
// Make sure there is a current selection
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
index 44b535c..09cd098 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
@@ -62,6 +62,7 @@
/**
* @see IPartListener#partActivated(IWorkbenchPart)
*/
+ @Override
public void partActivated(IWorkbenchPart part) {
checkToSetTextEditor(part);
}
@@ -69,12 +70,14 @@
/**
* @see IPartListener#partBroughtToTop(IWorkbenchPart)
*/
+ @Override
public void partBroughtToTop(IWorkbenchPart part) {
}
/**
* @see IPartListener#partClosed(IWorkbenchPart)
*/
+ @Override
public void partClosed(IWorkbenchPart part) {
if (part == getTextEditor()) {
cleanup();
@@ -84,12 +87,14 @@
/**
* @see IPartListener#partDeactivated(IWorkbenchPart)
*/
+ @Override
public void partDeactivated(IWorkbenchPart part) {
}
/**
* @see IPartListener#partOpened(IWorkbenchPart)
*/
+ @Override
public void partOpened(IWorkbenchPart part) {
}
@@ -170,6 +175,7 @@
/**
* @see IWindowListener#windowActivated(IWorkbenchWindow)
*/
+ @Override
public void windowActivated(IWorkbenchWindow window) {
if (fCurrentWindow != null) {
fCurrentWindow.getPartService().removePartListener(this);
@@ -186,6 +192,7 @@
/**
* @see IWindowListener#windowClosed(IWorkbenchWindow)
*/
+ @Override
public void windowClosed(IWorkbenchWindow window) {
if (fCurrentWindow == window) {
fCurrentWindow= null;
@@ -196,12 +203,14 @@
/**
* @see IWindowListener#windowDeactivated(IWorkbenchWindow)
*/
+ @Override
public void windowDeactivated(IWorkbenchWindow window) {
}
/**
* @see IWindowListener#windowOpened(IWorkbenchWindow)
*/
+ @Override
public void windowOpened(IWorkbenchWindow window) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
index 89d90fc..0ab39a5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,6 +78,7 @@
ISelectionStatusValidator validator= new ISelectionStatusValidator() {
List<IResource> fAlreadySelected = getSelectedFolders();
+ @Override
public IStatus validate(Object[] selection) {
for (int i= 0; i < selection.length; i++) {
if (!(selection[i] instanceof IContainer)) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
index 5cacaca..71ea23e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@
checkbox.setSelection(true);
fHitCountEnabled = true;
checkbox.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
fHitCountEnabled = checkbox.getSelection();
getText().setEnabled(fHitCountEnabled);
@@ -77,6 +78,7 @@
}
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
});
@@ -93,6 +95,7 @@
/**
* @see IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getCurrentSelection();
if (selection == null) {
@@ -125,6 +128,7 @@
String message= ActionMessages.BreakpointHitCountAction__Enter_the_new_hit_count_for_the_breakpoint__3;
IInputValidator validator= new IInputValidator() {
int hitCount= -1;
+ @Override
public String isValid(String value) {
try {
hitCount= Integer.valueOf(value.trim()).intValue();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
index 44b58dd..4c469f7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
@@ -232,6 +232,7 @@
*/
protected void report(final String message) {
JDIDebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (fStatusLine != null) {
fStatusLine.setMessage(true, message, null);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
index 91c50af..78f0227 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@
/**
* @see IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getStructuredSelection();
Iterator<IJavaBreakpoint> itr= selection.iterator();
@@ -61,6 +62,7 @@
/**
* @see IActionDelegate#selectionChanged(IAction, ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
setAction(action);
if (selection.isEmpty()) {
@@ -159,12 +161,14 @@
/**
* @see IBreakpointsListener#breakpointsAdded(IBreakpoint[])
*/
+ @Override
public void breakpointsAdded(IBreakpoint[] breakpoints) {
}
/**
* @see IBreakpointsListener#breakpointsChanged(IBreakpoint[], IMarkerDelta[])
*/
+ @Override
public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
if (getAction() != null) {
IStructuredSelection selection= getStructuredSelection();
@@ -184,6 +188,7 @@
/**
* @see IBreakpointsListener#breakpointsRemoved(IBreakpoint[], IMarkerDelta[])
*/
+ @Override
public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
}
@@ -206,18 +211,21 @@
/**
* @see IPartListener#partActivated(IWorkbenchPart)
*/
+ @Override
public void partActivated(IWorkbenchPart part) {
}
/**
* @see IPartListener#partBroughtToTop(IWorkbenchPart)
*/
+ @Override
public void partBroughtToTop(IWorkbenchPart part) {
}
/**
* @see IPartListener#partClosed(IWorkbenchPart)
*/
+ @Override
public void partClosed(IWorkbenchPart part) {
if (part == getPart()) {
getBreakpointManager().removeBreakpointListener(this);
@@ -228,18 +236,21 @@
/**
* @see IPartListener#partDeactivated(IWorkbenchPart)
*/
+ @Override
public void partDeactivated(IWorkbenchPart part) {
}
/**
* @see IPartListener#partOpened(IWorkbenchPart)
*/
+ @Override
public void partOpened(IWorkbenchPart part) {
}
/**
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
IWorkbenchPart oldPart= getPart();
if (oldPart != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
index dc88573..67df9b8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
if (evaluationResult.hasErrors()) {
final Display display = JDIDebugUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
@@ -68,6 +69,7 @@
resultString= ""; //$NON-NLS-1$
}
getDebugModelPresentation().computeDetail(resultValue, new IValueDetailListener() {
+ @Override
public void detailComputed(IValue value, String result) {
displayStringResult(snippet, NLS.bind(ActionMessages.DisplayAction_result_pattern, new Object[] { resultString, trimDisplayResult(result)}));
}
@@ -82,6 +84,7 @@
final IDataDisplay directDisplay= getDirectDataDisplay();
final Display display= JDIDebugUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (!display.isDisposed()) {
IDataDisplay dataDisplay= getDataDisplay();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
index 90a7a09..1ca8827 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection = getCurrentSelection();
if(selection != null && selection.size() == 1) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditVariableLogicalStructureAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditVariableLogicalStructureAction.java
index 4112d68..1d623bd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditVariableLogicalStructureAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditVariableLogicalStructureAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,7 +44,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
*/
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ @Override
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
index b9aa040..35713c7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
@@ -189,6 +189,7 @@
/**
* @see IEvaluationListener#evaluationComplete(IEvaluationResult)
*/
+ @Override
public void evaluationComplete(final IEvaluationResult result) {
// if plug-in has shutdown, ignore - see bug# 8693
if (JDIDebugUIPlugin.getDefault() == null) {
@@ -233,7 +234,8 @@
setNewTargetPart(getTargetPart());
IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ @Override
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
if (stackFrame.isSuspended()) {
IJavaElement javaElement= getJavaElement(stackFrame);
if (javaElement != null) {
@@ -585,6 +587,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
update();
run();
@@ -593,6 +596,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
setAction(action);
}
@@ -600,6 +604,7 @@
/**
* @see IWorkbenchWindowActionDelegate#dispose()
*/
+ @Override
public void dispose() {
disposeDebugModelPresentation();
IWorkbenchWindow win = getWindow();
@@ -611,6 +616,7 @@
/**
* @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
setWindow(window);
IWorkbenchPage page= window.getActivePage();
@@ -655,6 +661,7 @@
/**
* @see IEditorActionDelegate#setActiveEditor(IAction, IEditorPart)
*/
+ @Override
public void setActiveEditor(IAction action, IEditorPart targetEditor) {
setAction(action);
setTargetPart(targetEditor);
@@ -663,6 +670,7 @@
/**
* @see IPartListener#partActivated(IWorkbenchPart)
*/
+ @Override
public void partActivated(IWorkbenchPart part) {
setTargetPart(part);
}
@@ -670,12 +678,14 @@
/**
* @see IPartListener#partBroughtToTop(IWorkbenchPart)
*/
+ @Override
public void partBroughtToTop(IWorkbenchPart part) {
}
/**
* @see IPartListener#partClosed(IWorkbenchPart)
*/
+ @Override
public void partClosed(IWorkbenchPart part) {
if (part == getTargetPart()) {
setTargetPart(null);
@@ -688,18 +698,21 @@
/**
* @see IPartListener#partDeactivated(IWorkbenchPart)
*/
+ @Override
public void partDeactivated(IWorkbenchPart part) {
}
/**
* @see IPartListener#partOpened(IWorkbenchPart)
*/
+ @Override
public void partOpened(IWorkbenchPart part) {
}
/**
* @see IViewActionDelegate#init(IViewPart)
*/
+ @Override
public void init(IViewPart view) {
setTargetPart(view);
}
@@ -735,6 +748,7 @@
/**
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
setAction(action);
setTargetPart(targetPart);
@@ -752,6 +766,7 @@
/**
* @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)
*/
+ @Override
public void snippetStateChanged(JavaSnippetEditor editor) {
if (editor != null && !editor.isEvaluating() && editor.getFile() != null) {
update();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExcludeExceptionLocationAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExcludeExceptionLocationAction.java
index 1826355..4a1ba1b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExcludeExceptionLocationAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExcludeExceptionLocationAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
/**
* @see IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getCurrentSelection();
if (selection == null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExecuteAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExecuteAction.java
index f801c22..72e155c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExecuteAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExecuteAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@
if (result.hasErrors()) {
final Display display = JDIDebugUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java
index 32372d2..005e6f79 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java
@@ -206,9 +206,11 @@
document.set(getInitialText(fVariable));
fDocumentListener= new IDocumentListener() {
- public void documentAboutToBeChanged(DocumentEvent event) {
+ @Override
+ public void documentAboutToBeChanged(DocumentEvent event) {
}
- public void documentChanged(DocumentEvent event) {
+ @Override
+ public void documentChanged(DocumentEvent event) {
refreshValidState(fSourceViewer);
}
};
@@ -222,6 +224,7 @@
*/
private void activateHandler(){
IHandler handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
fSourceViewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
return null;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ForceReturnAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ForceReturnAction.java
index f468764..0aee073 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ForceReturnAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ForceReturnAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@
// error with evaluation
if (result.hasErrors()) {
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
@@ -60,6 +61,7 @@
frame.forceReturn(value);
if (!Signature.SIG_VOID.equals(value)) {
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
@@ -73,6 +75,7 @@
} catch (DebugException e) {
final IStatus status = e.getStatus();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (display.isDisposed()) {
return;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
index 43e18d2..ea50bbf 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,6 +42,7 @@
protected void displayResult(final IEvaluationResult result) {
final Display display= JDIDebugUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if (!display.isDisposed()) {
showExpressionView();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java
index 2074afe..b2f69e0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -117,6 +117,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection = getCurrentSelection();
if (selection == null || selection.size() > 1) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
index b4f5e6e..58caf24 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/**
* @see IActionDelegate#run(IAction)
*/
+ @Override
public void run(IAction action) {
//hack to prevent https://bugs.eclipse.org/bugs/show_bug.cgi?id=269878
//where conditions randomly seem to have errors while using an IBM VM in testing mode
@@ -49,6 +50,7 @@
/**
* @see IActionDelegate#selectionChanged(IAction, ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
if (selection instanceof IStructuredSelection) {
IStructuredSelection ss= (IStructuredSelection)selection;
@@ -76,5 +78,6 @@
/**
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
index 7a4b3a8..d6eb147 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,13 +50,17 @@
if (getBreakpoint() != null) {
PropertyDialogAction action=
new PropertyDialogAction(getEditor().getEditorSite(), new ISelectionProvider() {
+ @Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
}
+ @Override
public ISelection getSelection() {
return new StructuredSelection(getBreakpoint());
}
+ @Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
}
+ @Override
public void setSelection(ISelection selection) {
}
});
@@ -67,6 +71,7 @@
/**
* @see IUpdate#update()
*/
+ @Override
public void update() {
fBreakpoint = null;
IBreakpoint breakpoint = getBreakpoint();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaObjectValueEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaObjectValueEditor.java
index 8794cf5..bb7d5a0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaObjectValueEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaObjectValueEditor.java
@@ -51,7 +51,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#editVariable(org.eclipse.debug.core.model.IVariable, org.eclipse.swt.widgets.Shell)
*/
- public boolean editVariable(IVariable variable, Shell shell) {
+ @Override
+ public boolean editVariable(IVariable variable, Shell shell) {
try {
IJavaVariable javaVariable = (IJavaVariable) variable;
String signature = javaVariable.getSignature();
@@ -81,7 +82,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#saveVariable(org.eclipse.debug.core.model.IVariable, java.lang.String, org.eclipse.swt.widgets.Shell)
*/
- public boolean saveVariable(IVariable variable, String expression, Shell shell) {
+ @Override
+ public boolean saveVariable(IVariable variable, String expression, Shell shell) {
IJavaVariable javaVariable = (IJavaVariable) variable;
String signature= null;
try {
@@ -154,7 +156,8 @@
final IEvaluationResult[] results= new IEvaluationResult[1];
IAstEvaluationEngine engine = JDIDebugPlugin.getDefault().getEvaluationEngine(project, (IJavaDebugTarget) thread.getDebugTarget());
IEvaluationListener listener= new IEvaluationListener() {
- public void evaluationComplete(IEvaluationResult result) {
+ @Override
+ public void evaluationComplete(IEvaluationResult result) {
synchronized (JavaObjectValueEditor.this) {
results[0]= result;
JavaObjectValueEditor.this.notifyAll();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java
index 04f7b3e..8e8a400 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,7 +47,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#editVariable(org.eclipse.debug.core.model.IVariable, org.eclipse.swt.widgets.Shell)
*/
- public boolean editVariable(IVariable variable, Shell shell) {
+ @Override
+ public boolean editVariable(IVariable variable, Shell shell) {
try {
String name= variable.getName();
String title= ActionMessages.JavaPrimitiveValueEditor_0;
@@ -83,7 +84,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#saveVariable(org.eclipse.debug.core.model.IVariable, java.lang.String, org.eclipse.swt.widgets.Shell)
*/
- public boolean saveVariable(IVariable variable, String expression, Shell shell) {
+ @Override
+ public boolean saveVariable(IVariable variable, String expression, Shell shell) {
return false;
}
@@ -114,7 +116,8 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IInputValidator#isValid(java.lang.String)
*/
- public String isValid(String newText) {
+ @Override
+ public String isValid(String newText) {
String type= null;
switch (fSignature.charAt(0)) {
case 'B':
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaVariableValueEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaVariableValueEditor.java
index 190441b..38025e1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaVariableValueEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaVariableValueEditor.java
@@ -27,7 +27,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#editVariable(org.eclipse.debug.core.model.IVariable, org.eclipse.swt.widgets.Shell)
*/
- public boolean editVariable(IVariable variable, Shell shell) {
+ @Override
+ public boolean editVariable(IVariable variable, Shell shell) {
String signature= null;
try {
signature= getSignature(variable);
@@ -50,7 +51,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IVariableValueEditor#saveVariable(org.eclipse.debug.core.model.IVariable, java.lang.String, org.eclipse.swt.widgets.Shell)
*/
- public boolean saveVariable(IVariable variable, String expression, Shell shell) {
+ @Override
+ public boolean saveVariable(IVariable variable, String expression, Shell shell) {
// set the value of chars directly if expression is a single character (not an expression to evaluate)
if (expression.length() == 1 && variable instanceof IJavaVariable){
IJavaVariable javaVariable = (IJavaVariable)variable;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/NewDetailFormatterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/NewDetailFormatterAction.java
index 61b53e0..70ebe2a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/NewDetailFormatterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/NewDetailFormatterAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getCurrentSelection();
if (selection == null || selection.size() != 1) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
index 10ebfce..ee61d60 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/**
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
fPart = targetPart;
}
@@ -44,6 +45,7 @@
/**
* @see IActionDelegate#selectionChanged(IAction, ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection sel) {
}
@@ -79,6 +81,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {
fPart = null;
}
@@ -86,12 +89,14 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
index dba454b..458b63e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,41 +16,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.widgets.Display;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
@@ -65,14 +33,38 @@
import org.eclipse.jdt.core.search.SearchRequestor;
import org.eclipse.jdt.core.search.TypeNameMatch;
import org.eclipse.jdt.core.search.TypeNameMatchRequestor;
-
import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsole;
import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsoleFactory;
-
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
/**
* Action delegate for Open from Clipboard action.
@@ -195,6 +187,7 @@
/*
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
Clipboard clipboard = new Clipboard(Display.getDefault());
TextTransfer textTransfer = TextTransfer.getInstance();
@@ -258,24 +251,33 @@
}
private static int getMatchingPattern(String s) {
- if (s.matches(JAVA_FILE_LINE_PATTERN))
+ if (s.matches(JAVA_FILE_LINE_PATTERN)) {
return JAVA_FILE_LINE;
- if (s.matches(JAVA_FILE_PATTERN))
+ }
+ if (s.matches(JAVA_FILE_PATTERN)) {
return JAVA_FILE;
- if (s.matches(TYPE_LINE_PATTERN))
+ }
+ if (s.matches(TYPE_LINE_PATTERN)) {
return TYPE_LINE;
- if (s.matches(STACK_TRACE_LINE_PATTERN))
+ }
+ if (s.matches(STACK_TRACE_LINE_PATTERN)) {
return STACK_TRACE_LINE;
- if (s.matches(METHOD_PATTERN))
+ }
+ if (s.matches(METHOD_PATTERN)) {
return METHOD;
- if (s.matches(STACK_PATTERN))
+ }
+ if (s.matches(STACK_PATTERN)) {
return STACK;
- if (s.matches(MEMBER_PATTERN))
+ }
+ if (s.matches(MEMBER_PATTERN)) {
return MEMBER;
- if (s.matches(METHOD_JAVADOC_REFERENCE_PATTERN))
+ }
+ if (s.matches(METHOD_JAVADOC_REFERENCE_PATTERN)) {
return METHOD_JAVADOC_REFERENCE;
- if (s.matches(QUALIFIED_NAME_PATTERN))
+ }
+ if (s.matches(QUALIFIED_NAME_PATTERN)) {
return QUALIFIED_NAME;
+ }
return INVALID;
}
@@ -383,6 +385,7 @@
*/
private static void getTypeMatches(final String typeName, final List<Object> matches) throws InterruptedException {
executeRunnable(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
doTypeSearch(typeName, matches, monitor);
}
@@ -399,6 +402,7 @@
*/
private static void getMethodMatches(final String s, final List<Object> matches) throws InterruptedException {
executeRunnable(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
doMemberSearch(s, matches, true, true, false, monitor, 100);
}
@@ -415,6 +419,7 @@
*/
private static void getMemberMatches(final String s, final List<Object> matches) throws InterruptedException {
executeRunnable(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
doMemberSearch(s, matches, true, true, true, monitor, 100);
}
@@ -431,6 +436,7 @@
*/
private static void getNameMatches(final String s, final List<Object> matches) throws InterruptedException {
executeRunnable(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
SubMonitor progress = SubMonitor.convert(monitor, 100);
progress.beginTask(TASK_NAME, 100);
@@ -477,8 +483,9 @@
dialog.setMultipleSelection(true);
int result = dialog.open();
- if (result != IDialogConstants.OK_ID)
+ if (result != IDialogConstants.OK_ID) {
return;
+ }
Object[] elements = dialog.getResult();
if (elements != null && elements.length > 0) {
@@ -560,14 +567,16 @@
private static void openInputEditDialog(String inputText) {
IWorkbenchWindow window = JDIDebugUIPlugin.getActiveWorkbenchWindow();
IInputValidator validator = new IInputValidator() {
+ @Override
public String isValid(String newText) {
return newText.length() == 0 ? "" : null; //$NON-NLS-1$
}
};
InputDialog dialog = new InputDialog(window.getShell(), ActionMessages.OpenFromClipboardAction_OpenFromClipboard, ActionMessages.OpenFromClipboardAction_ElementToOpen, inputText, validator);
int result = dialog.open();
- if (result != IDialogConstants.OK_ID)
+ if (result != IDialogConstants.OK_ID) {
return;
+ }
inputText = dialog.getValue();
handleSingleLineInput(inputText);
@@ -585,8 +594,9 @@
return new SearchRequestor() {
@Override
public void acceptSearchMatch(SearchMatch match) {
- if (match.getAccuracy() == SearchMatch.A_ACCURATE)
+ if (match.getAccuracy() == SearchMatch.A_ACCURATE) {
matches.add(match.getElement());
+ }
}
};
}
@@ -718,18 +728,21 @@
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action .IAction,
* org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
/*
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
*/
+ @Override
public void dispose() {
}
/*
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui. IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
index 681fc3c..cc2eef1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,6 +42,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getCurrentSelection();
if (selection == null) {
@@ -188,6 +189,7 @@
char[][] typeNames) throws JavaModelException {
final IType[] result = { null };
TypeNameMatchRequestor requestor= new TypeNameMatchRequestor() {
+ @Override
public void acceptTypeNameMatch(TypeNameMatch match) {
if (result[0] == null) {
result[0]= match.getType();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupDisplayAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupDisplayAction.java
index 5aecf45..c3bdcf3 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupDisplayAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupDisplayAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -115,7 +115,8 @@
snippet = currentSnippet;
resultString = currentResultString;
Display.getDefault().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
showPopup(textWidget);
}
});
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
index 44964f5..a9d73d2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,7 +41,8 @@
} else {
expression = new JavaInspectExpression(result);
JDIDebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
showPopup(styledText);
}
});
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveDetailFormatterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveDetailFormatterAction.java
index 4f5996d..dcb3527 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveDetailFormatterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveDetailFormatterAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection selection= getCurrentSelection();
if (selection == null || selection.size() != 1) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java
index 7854a82..5479995 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java
@@ -25,6 +25,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType == IRunToLineTarget.class) {
@@ -38,6 +39,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IRunToLineTarget.class, IToggleBreakpointsTarget.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java
index f7ee687..97ce8b3 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java
@@ -50,6 +50,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IRunToLineTarget#runToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
*/
+ @Override
public void runToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException {
ITextEditor textEditor = getTextEditor(part);
String errorMessage = null;
@@ -69,6 +70,7 @@
final int[] lineNumber = new int[1];
final ITextSelection textSelection = (ITextSelection) selection;
Runnable r = new Runnable() {
+ @Override
public void run() {
lineNumber[0] = textSelection.getStartLine() + 1;
ASTParser parser = ASTParser.newParser(AST.JLS4);
@@ -114,6 +116,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IRunToLineTarget#canRunToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
*/
+ @Override
public boolean canRunToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
if (target instanceof IDebugElement && target.canResume()) {
IDebugElement element = (IDebugElement) target;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
index 99a423d..95756d2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
@@ -59,6 +59,7 @@
if (pres != null) {
pres.setAttribute(JDIModelPresentation.DISPLAY_QUALIFIED_NAMES, (getValue() ? Boolean.TRUE : Boolean.FALSE));
BusyIndicator.showWhile(viewer.getControl().getDisplay(), new Runnable() {
+ @Override
public void run() {
viewer.refresh();
IPreferenceStore store = getPreferenceStore();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStratumAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStratumAction.java
index ab7a218..6e47fb2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStratumAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStratumAction.java
@@ -44,20 +44,23 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
*/
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ @Override
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
fPart = targetPart;
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
if (selection instanceof IStructuredSelection) {
fSelection = (IStructuredSelection) selection;
action.setMenuCreator(this);
@@ -69,14 +72,16 @@
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
*/
- public Menu getMenu(Control parent) {
+ @Override
+ public Menu getMenu(Control parent) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
*/
- public Menu getMenu(Menu parent) {
+ @Override
+ public Menu getMenu(Menu parent) {
//Create the new menu. The menu will get filled when it is about to be shown. see fillMenu(Menu).
Menu menu = new Menu(parent);
menu.addMenuListener(new MenuAdapter() {
@@ -148,7 +153,8 @@
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowSystemThreadsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowSystemThreadsAction.java
index 98e829c..5d8379e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowSystemThreadsAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowSystemThreadsAction.java
@@ -87,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
if (getValue()) {
// if showing system threads, no need to worry about displaying/hiding
@@ -111,6 +112,7 @@
try {
if (thread.isSystemThread()) {
Runnable r = new Runnable() {
+ @Override
public void run() {
getStructuredViewer().refresh();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoEditorSelectionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoEditorSelectionHandler.java
index 648c66f..35527a8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoEditorSelectionHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoEditorSelectionHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) Jan 14, 2013 IBM Corporation and others.
+ * Copyright (c) 2013, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IEditorPart editor = HandlerUtil.getActiveEditor(event);
if(editor != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
index 21fd345..3831632 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -129,6 +129,7 @@
/**
* @see org.eclipse.debug.core.IDebugEventFilter#filterDebugEvents(org.eclipse.debug.core.DebugEvent)
*/
+ @Override
public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
// we only expect one event from our thread - find the event
DebugEvent event = null;
@@ -205,7 +206,8 @@
if (frame.isSynthetic()) {
// step thru synthetic methods
r = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_INTO);
frame.stepInto();
@@ -218,7 +220,8 @@
};
} else {
r = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_RETURN);
frame.stepReturn();
@@ -237,6 +240,7 @@
return events;
}
r = new Runnable() {
+ @Override
public void run() {
try {
setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_INTO);
@@ -274,6 +278,7 @@
protected void missed() {
cleanup();
Runnable r = new Runnable() {
+ @Override
public void run() {
String methodName = null;
try {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHyperlinkDetector.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHyperlinkDetector.java
index e5907f1..ade17e8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHyperlinkDetector.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHyperlinkDetector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,24 +54,28 @@
/**
* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
*/
+ @Override
public IRegion getHyperlinkRegion() {
return new Region(fSelection.getOffset(), fSelection.getLength());
}
/**
* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
*/
+ @Override
public String getHyperlinkText() {
return ActionMessages.StepIntoSelectionHyperlinkDetector_0;
}
/**
* @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
*/
+ @Override
public String getTypeLabel() {
return null;
}
/**
* @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
*/
+ @Override
public void open() {
StepIntoSelectionUtils.stepIntoSelection(fSelection);
}
@@ -81,6 +85,7 @@
/**
* @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean)
*/
+ @Override
public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor editor = (ITextEditor) getAdapter(ITextEditor.class);
if(editor != null && EvaluationContextManager.getEvaluationContext(JDIDebugUIPlugin.getActiveWorkbenchWindow()) != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionUtils.java
index 87b2a8f..d40b63a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionUtils.java
@@ -237,6 +237,7 @@
/**
* @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
@@ -266,6 +267,7 @@
DebugPlugin plugin = DebugPlugin.getDefault();
plugin.removeDebugEventListener(this);
plugin.asyncExec(new Runnable() {
+ @Override
public void run() {
try {
doStepIn(editor, frame, method);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StringValueInputDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StringValueInputDialog.java
index 9cc89cc..8eefb2c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StringValueInputDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StringValueInputDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -140,9 +140,11 @@
});
IDocumentListener listener = new IDocumentListener() {
- public void documentAboutToBeChanged(DocumentEvent event) {
+ @Override
+ public void documentAboutToBeChanged(DocumentEvent event) {
}
- public void documentChanged(DocumentEvent event) {
+ @Override
+ public void documentChanged(DocumentEvent event) {
refreshValidState(fTextViewer);
}
};
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/TerminateEvaluationAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/TerminateEvaluationAction.java
index ffda909..e0ac526 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/TerminateEvaluationAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/TerminateEvaluationAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,15 +34,18 @@
private IJavaThread fThread;
private boolean fTerminated;
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
+ @Override
public void run(IAction action) {
if (fThread == null) {
return;
}
DebugPlugin.getDefault().addDebugEventListener(this);
Thread timerThread= new Thread(new Runnable() {
+ @Override
public void run() {
fTerminated= false;
try {
@@ -54,6 +57,7 @@
fTerminated= true;
final Display display= JDIDebugUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
MessageDialog dialog = new MessageDialog(display.getActiveShell(), ActionMessages.TerminateEvaluationActionTerminate_Evaluation_1, null,
ActionMessages.TerminateEvaluationActionAttempts_to_terminate_an_evaluation_can_only_stop_a_series_of_statements__The_currently_executing_statement__such_as_a_method_invocation__cannot_be_interrupted__2, MessageDialog.INFORMATION, new String[] { IDialogConstants.OK_LABEL }, 0);
@@ -73,6 +77,7 @@
}
}
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
if (selection instanceof IStructuredSelection) {
IStructuredSelection ss= (IStructuredSelection)selection;
@@ -90,6 +95,7 @@
fThread= thread;
}
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
DebugEvent event;
for (int i= 0, numEvents= events.length; i < numEvents; i++) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBooleanPreferenceAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBooleanPreferenceAction.java
index cc2e63f..a20486b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBooleanPreferenceAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBooleanPreferenceAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
public void run(IAction action) {
final StructuredViewer viewer = getStructuredViewer();
BusyIndicator.showWhile(viewer.getControl().getDisplay(), new Runnable() {
+ @Override
public void run() {
// note, this uses the pref key, not the composite key - the prefs are global, not view specific.
IPreferenceStore store = getPreferenceStore();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
index 9282ba7..85c0e25 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
@@ -123,7 +123,8 @@
*/
protected void report(final String message, final IWorkbenchPart part) {
JDIDebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IEditorStatusLine statusLine = part.getAdapter(IEditorStatusLine.class);
if (statusLine != null) {
if (message != null) {
@@ -188,7 +189,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
- public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
+ @Override
+ public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
toggleLineBreakpoints(part, selection, false, null);
}
@@ -216,7 +218,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleLineBreakpoints(IWorkbenchPart,
* ISelection)
*/
- public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) {
+ @Override
+ public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) {
if (isRemote(part, selection)) {
return false;
}
@@ -229,7 +232,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public void toggleMethodBreakpoints(final IWorkbenchPart part, final ISelection finalSelection) {
+ @Override
+ public void toggleMethodBreakpoints(final IWorkbenchPart part, final ISelection finalSelection) {
Job job = new Job("Toggle Method Breakpoints") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -601,7 +605,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) {
+ @Override
+ public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) {
if (isRemote(part, selection)) {
return false;
}
@@ -858,7 +863,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public void toggleWatchpoints(final IWorkbenchPart part, final ISelection finalSelection) {
+ @Override
+ public void toggleWatchpoints(final IWorkbenchPart part, final ISelection finalSelection) {
Job job = new Job("Toggle Watchpoints") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -1171,7 +1177,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
+ @Override
+ public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
if (isRemote(part, selection)) {
return false;
}
@@ -1282,7 +1289,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public void toggleBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
+ @Override
+ public void toggleBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
ISelection sel = translateToMembers(part, selection);
if(sel instanceof IStructuredSelection) {
IMember member = (IMember) ((IStructuredSelection)sel).getFirstElement();
@@ -1340,6 +1348,7 @@
Display display= shell != null && !shell.isDisposed() ? shell.getDisplay() : PlatformUI.getWorkbench().getDisplay();
if (!display.isDisposed()) {
display.syncExec(new Runnable() {
+ @Override
public void run() {
MessageDialogWithToggle dialog= MessageDialogWithToggle.openOkCancelConfirm(shell, ActionMessages.ToggleBreakpointAdapter_confirmDeleteTitle,
ActionMessages.ToggleBreakpointAdapter_confirmDeleteMessage, ActionMessages.ToggleBreakpointAdapter_confirmDeleteShowAgain, false,
@@ -1363,7 +1372,8 @@
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
- public boolean canToggleBreakpoints(IWorkbenchPart part, ISelection selection) {
+ @Override
+ public boolean canToggleBreakpoints(IWorkbenchPart part, ISelection selection) {
if (isRemote(part, selection)) {
return false;
}
@@ -1373,6 +1383,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension2#toggleBreakpointsWithEvent(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void toggleBreakpointsWithEvent(IWorkbenchPart part, ISelection selection, Event event) throws CoreException {
if(event != null) {
if((event.stateMask & SWT.MOD2) > 0) {
@@ -1413,6 +1424,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension2#canToggleBreakpointsWithEvent(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.swt.widgets.Event)
*/
+ @Override
public boolean canToggleBreakpointsWithEvent(IWorkbenchPart part, ISelection selection, Event event) {
return canToggleBreakpoints(part, selection);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java
index c371043..dcc857f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ViewFilterAction.java
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(getPreferenceKey()) ||
event.getProperty().equals(getCompositeKey())) {
@@ -57,6 +58,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/
+ @Override
public void init(IViewPart view) {
fView = view;
fAction.setChecked(getPreferenceValue());
@@ -67,6 +69,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {
fAction = action;
}
@@ -74,6 +77,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {
getPreferenceStore().removePropertyChangeListener(fListener);
}
@@ -81,6 +85,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
@@ -88,6 +93,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
StructuredViewer viewer = getStructuredViewer();
ViewerFilter[] filters = viewer.getFilters();
@@ -112,6 +118,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
index 9118ddd..12281fc 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -71,6 +71,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane3#addPropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void addPropertyListener(IPropertyListener listener) {
fListeners.add(listener);
}
@@ -78,6 +79,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane3#removePropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void removePropertyListener(IPropertyListener listener) {
fListeners.remove(listener);
}
@@ -104,18 +106,22 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
*/
+ @Override
public void init(IWorkbenchPartSite partSite) {
fSite = partSite;
}
+ @Override
public String getID() {
return fId;
}
+ @Override
public String getName() {
return fName;
}
+ @Override
public String getDescription() {
return fDescription;
}
@@ -123,6 +129,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#dispose()
*/
+ @Override
public void dispose() {
fEditor = null;
fSite = null;
@@ -146,12 +153,14 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Control createControl(Composite parent) {
fEditorParent = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
fEditorParent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
fEditor = createEditor(fEditorParent);
fEditor.setMnemonics(false);
fEditor.addPropertyListener(new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
if (fAutoSaveProperties.contains(new Integer(propId))) {
try {
@@ -177,6 +186,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSaveAs()
*/
+ @Override
public void doSaveAs() {
// do nothing
}
@@ -184,6 +194,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
*/
+ @Override
public boolean isSaveAsAllowed() {
return false;
}
@@ -191,6 +202,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
*/
+ @Override
public boolean isSaveOnCloseNeeded() {
return isDirty() && fEditor.getStatus().isOK();
}
@@ -198,6 +210,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#setFocus()
*/
+ @Override
public boolean setFocus() {
return false;
}
@@ -205,6 +218,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void doSave(IProgressMonitor monitor) {
IStatusLineManager statusLine = getStatusLine();
if (statusLine != null) {
@@ -251,6 +265,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isDirty()
*/
+ @Override
public boolean isDirty() {
return fEditor != null && fEditor.isDirty();
}
@@ -267,6 +282,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void display(IStructuredSelection selection) {
// clear status line
IStatusLineManager statusLine = getStatusLine();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
index 4a55da4..0132a71 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -110,7 +110,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
Shell shell = JDIDebugUIPlugin.getActiveWorkbenchShell();
SelectionDialog dialog = null;
try {
@@ -129,19 +130,22 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {}
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
workbenchWindow = null;
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
- public void init(IWorkbenchWindow window) {
+ @Override
+ public void init(IWorkbenchWindow window) {
workbenchWindow = window;
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
index 54eb9d0..7e26d7e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -60,6 +60,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
try {
IDialogSettings settings = getDialogSettings();
@@ -200,16 +201,19 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/
+ @Override
public void init(IViewPart view) {}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
*/
+ @Override
public void dispose() {
fWindow = null;
}
@@ -217,6 +221,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
fWindow = window;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionTypeDialogExtension.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionTypeDialogExtension.java
index 5dbb831..10834ac 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionTypeDialogExtension.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionTypeDialogExtension.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -60,7 +60,9 @@
Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_HORIZONTAL);
fCaughtButton = SWTFactory.createCheckButton(comp, BreakpointMessages.AddExceptionDialog_15, null, fCaught, 1);
fCaughtButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {
fCaught = fCaughtButton.getSelection();
}
@@ -68,7 +70,9 @@
((GridData) fCaughtButton.getLayoutData()).grabExcessHorizontalSpace = true;
fUncaughtButton = SWTFactory.createCheckButton(comp, BreakpointMessages.AddExceptionDialog_16, null, fUncaught, 1);
fUncaughtButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {
fUncaught = fUncaughtButton.getSelection();
}
@@ -83,6 +87,7 @@
@Override
public ISelectionStatusValidator getSelectionValidator() {
return new ISelectionStatusValidator() {
+ @Override
public IStatus validate(Object[] selection) {
if(selection.length == 1) {
try {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/BreakpointDetailPaneFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/BreakpointDetailPaneFactory.java
index c9f9423..3c38f30 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/BreakpointDetailPaneFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/BreakpointDetailPaneFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#getDetailPaneTypes(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public Set<String> getDetailPaneTypes(IStructuredSelection selection) {
HashSet<String> set = new HashSet<String>();
if (selection.size() == 1) {
@@ -65,6 +66,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public String getDefaultDetailPane(IStructuredSelection selection) {
if (selection.size() == 1) {
IBreakpoint b = (IBreakpoint) selection.getFirstElement();
@@ -89,6 +91,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#createDetailPane(java.lang.String)
*/
+ @Override
public IDetailPane createDetailPane(String paneID) {
if (LineBreakpointDetailPane.DETAIL_PANE_LINE_BREAKPOINT.equals(paneID)) {
return new LineBreakpointDetailPane();
@@ -111,6 +114,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#getDetailPaneName(java.lang.String)
*/
+ @Override
public String getDetailPaneName(String paneID) {
return getNameMap().get(paneID);
}
@@ -118,6 +122,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDetailPaneFactory#getDetailPaneDescription(java.lang.String)
*/
+ @Override
public String getDetailPaneDescription(String paneID) {
return getNameMap().get(paneID);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ExceptionInspector.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ExceptionInspector.java
index 5bcfd70..47211ac 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ExceptionInspector.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ExceptionInspector.java
@@ -71,6 +71,7 @@
/**
* @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent)
*/
+ @Override
public void debugContextChanged(DebugContextEvent event) {
if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
IWorkbenchPart part = event.getDebugContextProvider().getPart();
@@ -122,6 +123,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (IJDIPreferencesConstants.PREF_OPEN_INSPECT_POPUP_ON_EXCEPTION.equals(event.getKey())) {
IDebugContextManager manager = DebugUITools.getDebugContextManager();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java
index 3d0306b..c4e6792 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java
@@ -43,6 +43,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType.equals(IBreakpointTypeCategory.class)) {
@@ -108,6 +109,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IBreakpointTypeCategory.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
index 8edc8e5..6dcadf7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -83,6 +83,7 @@
GridData gd = (GridData) fHitCountText.getLayoutData();
gd.minimumWidth = 50;
fHitCountText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
setDirty(PROP_HIT_COUNT);
}
@@ -106,6 +107,7 @@
}
});
composite.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dispose();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnCompilationErrorListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnCompilationErrorListener.java
index 5393c65..264c105 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnCompilationErrorListener.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnCompilationErrorListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,24 +38,28 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
IJavaExceptionBreakpoint exception = (IJavaExceptionBreakpoint) breakpoint;
if (exception.getExceptionTypeName().equals("java.lang.Error")) { //$NON-NLS-1$
@@ -79,18 +83,21 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return DONT_CARE;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnUncaughtExceptionListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnUncaughtExceptionListener.java
index 4aa5d86..95c3b5e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnUncaughtExceptionListener.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/SuspendOnUncaughtExceptionListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,24 +36,28 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
// the "uncaught" exceptions breakpoint subsumes the "compilation error" breakpoint
// since "Throwable" is a supertype of "Error". Thus, if there is actually a compilation
@@ -78,18 +82,21 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
return DONT_CARE;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ToggleClassPrepareBreakpointAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ToggleClassPrepareBreakpointAction.java
index 7b71184..64f6237 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ToggleClassPrepareBreakpointAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/ToggleClassPrepareBreakpointAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,27 +42,32 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
IStructuredSelection ss = (IStructuredSelection)fSelection;
Iterator<IType> iterator = ss.iterator();
@@ -106,6 +111,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
fSelection = selection;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/AbstractClasspathEntry.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/AbstractClasspathEntry.java
index c3ed509..c7d2593 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/AbstractClasspathEntry.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/AbstractClasspathEntry.java
@@ -22,6 +22,7 @@
/* (non-Javadoc)
* @see org.eclipse.ant.internal.ui.preferences.IClasspathEntry#moveChild(int)
*/
+ @Override
public void moveChild(boolean up, IClasspathEntry child) {
int index= childEntries.indexOf(child);
int direction= 1;
@@ -36,6 +37,7 @@
/* (non-Javadoc)
* @see org.eclipse.ant.internal.ui.preferences.IClasspathEntry#getEntries()
*/
+ @Override
public IClasspathEntry[] getEntries() {
return childEntries.toArray(new IClasspathEntry[childEntries.size()]);
}
@@ -43,6 +45,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.ui.launchConfigurations.IClasspathEntry#hasEntries()
*/
+ @Override
public boolean hasEntries() {
return !childEntries.isEmpty();
}
@@ -50,6 +53,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.ui.launchConfigurations.IClasspathEntry#getParent()
*/
+ @Override
public IClasspathEntry getParent() {
return parent;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
index 28e3e7c..9d2f899 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -86,6 +86,7 @@
/**
* @see ITreeContentProvider#getParent(Object)
*/
+ @Override
public Object getParent(Object element) {
if (element instanceof ClasspathEntry) {
return ((ClasspathEntry)element).getParent();
@@ -100,6 +101,7 @@
/**
* @see ITreeContentProvider#hasChildren(Object)
*/
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof ClasspathEntry) {
return (((ClasspathEntry)element).hasChildren());
@@ -118,6 +120,7 @@
/**
* @see IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
@@ -126,6 +129,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
@@ -133,6 +137,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
treeViewer = (TreeViewer) viewer;
@@ -149,6 +154,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof ClasspathGroup) {
return ((ClasspathGroup)parentElement).getEntries();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntry.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntry.java
index 335ceb8..fd43ef1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntry.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntry.java
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getJavaProject()
*/
+ @Override
public IJavaProject getJavaProject() {
return entry.getJavaProject();
}
@@ -71,6 +72,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
*/
+ @Override
public int getType() {
return entry.getType();
}
@@ -78,6 +80,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
return entry.getMemento();
}
@@ -85,6 +88,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getPath()
*/
+ @Override
public IPath getPath() {
return entry.getPath();
}
@@ -92,6 +96,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getResource()
*/
+ @Override
public IResource getResource() {
return entry.getResource();
}
@@ -99,6 +104,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentPath()
*/
+ @Override
public IPath getSourceAttachmentPath() {
return entry.getSourceAttachmentPath();
}
@@ -106,6 +112,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentPath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public void setSourceAttachmentPath(IPath path) {
entry.setSourceAttachmentPath(path);
}
@@ -113,6 +120,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootPath()
*/
+ @Override
public IPath getSourceAttachmentRootPath() {
return entry.getSourceAttachmentRootPath();
}
@@ -120,6 +128,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentRootPath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public void setSourceAttachmentRootPath(IPath path) {
entry.setSourceAttachmentRootPath(path);
@@ -128,6 +137,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathProperty()
*/
+ @Override
public int getClasspathProperty() {
return entry.getClasspathProperty();
}
@@ -135,6 +145,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setClasspathProperty(int)
*/
+ @Override
public void setClasspathProperty(int location) {
entry.setClasspathProperty(location);
@@ -143,6 +154,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getLocation()
*/
+ @Override
public String getLocation() {
return entry.getLocation();
}
@@ -150,6 +162,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentLocation()
*/
+ @Override
public String getSourceAttachmentLocation() {
return entry.getSourceAttachmentLocation();
}
@@ -157,6 +170,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootLocation()
*/
+ @Override
public String getSourceAttachmentRootLocation() {
return entry.getSourceAttachmentRootLocation();
}
@@ -164,6 +178,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getVariableName()
*/
+ @Override
public String getVariableName() {
return entry.getVariableName();
}
@@ -171,6 +186,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathEntry()
*/
+ @Override
public org.eclipse.jdt.core.IClasspathEntry getClasspathEntry() {
return entry.getClasspathEntry();
}
@@ -206,6 +222,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEntry#isEditable()
*/
+ @Override
public boolean isEditable() {
return getParent() instanceof ClasspathGroup;
}
@@ -213,6 +230,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
if (getDelegate() instanceof IAdaptable) {
return ((IAdaptable) getDelegate()).getAdapter(adapter);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntryAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntryAdapterFactory.java
index e55b7c6..a0dd645 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntryAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathEntryAdapterFactory.java
@@ -21,6 +21,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (IClasspathEditor.class.equals(adapterType)) {
@@ -34,6 +35,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IClasspathEditor.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java
index aef9125..007375b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -69,6 +69,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEntry#isEditable()
*/
+ @Override
public boolean isEditable() {
return false;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
index a493793..31f25dd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
*/
+ @Override
public Image getImage(Object element) {
if (element instanceof ClasspathEntry) {
ClasspathEntry entry = (ClasspathEntry) element;
@@ -43,6 +44,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
if (element instanceof ClasspathEntry) {
ClasspathEntry entry = (ClasspathEntry) element;
@@ -54,6 +56,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
*/
+ @Override
public Color getBackground(Object element) {
if (element instanceof ClasspathGroup) {
Display display= Display.getCurrent();
@@ -65,6 +68,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
*/
+ @Override
public Color getForeground(Object element) {
if (element instanceof ClasspathGroup) {
Display display= Display.getCurrent();
@@ -76,12 +80,14 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
+ @Override
public void addListener(ILabelProviderListener listener) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
*/
+ @Override
public void dispose() {
runtimeClasspathLabelProvider.dispose();
}
@@ -89,6 +95,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
*/
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
@@ -96,6 +103,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
index 852ac27..fbfc61e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -219,6 +219,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEntry#isEditable()
*/
+ @Override
public boolean isEditable() {
return false;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryEditor.java
index 6e40fcb..e7e4aa1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEditor#canEdit(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public boolean canEdit(ILaunchConfiguration configuration, IRuntimeClasspathEntry[] entries) {
return entries.length == 1 && entries[0] instanceof DefaultProjectClasspathEntry;
}
@@ -28,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEditor#edit(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public IRuntimeClasspathEntry[] edit(Shell shell, ILaunchConfiguration configuration, IRuntimeClasspathEntry[] entries) {
DefaultClasspathEntryDialog dialog = new DefaultClasspathEntryDialog(shell, entries[0]);
if (dialog.open() == Window.OK) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java
index a422950..65219ea0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/RuntimeClasspathViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -55,11 +55,13 @@
private IPreferenceChangeListener fPrefListeners = new IPreferenceChangeListener() {
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (DebugUIPlugin.getStandardDisplay().getThread().equals(Thread.currentThread())) {
refresh(true);
} else {
DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
refresh(true);
}
@@ -93,6 +95,7 @@
}
});
getTree().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(LaunchingPlugin.ID_PLUGIN);
if(prefs != null) {
@@ -109,6 +112,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#setEntries(org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public void setEntries(IRuntimeClasspathEntry[] entries) {
getClasspathContentProvider().setRefreshEnabled(false);
resolveCurrentParent(getSelection());
@@ -121,6 +125,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#getEntries()
*/
+ @Override
public IRuntimeClasspathEntry[] getEntries() {
return getClasspathContentProvider().getModel().getAllEntries();
}
@@ -128,6 +133,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#addEntries(org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public void addEntries(IRuntimeClasspathEntry[] entries) {
getClasspathContentProvider().setRefreshEnabled(false);
IStructuredSelection sel = (IStructuredSelection) getSelection();
@@ -174,6 +180,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return true;
}
@@ -199,6 +206,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#notifyChanged()
*/
+ @Override
public void notifyChanged() {
Object[] listeners = fListeners.getListeners();
for (int i = 0; i < listeners.length; i++) {
@@ -209,6 +217,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#indexOf(org.eclipse.jdt.launching.IRuntimeClasspathEntry)
*/
+ @Override
public int indexOf(IRuntimeClasspathEntry entry) {
IClasspathEntry[] entries= getClasspathContentProvider().getBootstrapClasspathEntries();
for (int i = 0; i < entries.length; i++) {
@@ -232,6 +241,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#getShell()
*/
+ @Override
public Shell getShell() {
return getControl().getShell();
}
@@ -243,6 +253,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#updateSelection(int, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public boolean updateSelection(int actionType, IStructuredSelection selection) {
if (selection.isEmpty()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryAdapterFactory.java
index d51e7df..6a02cc2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryAdapterFactory.java
@@ -21,6 +21,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType.equals(IWorkbenchAdapter.class)) {
@@ -31,6 +32,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IWorkbenchAdapter.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryWorkbenchAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryWorkbenchAdapter.java
index 2a7bb19..e59a15c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryWorkbenchAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/VariableClasspathEntryWorkbenchAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,12 +25,14 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object o) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
if (object instanceof VariableClasspathEntry) {
return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_JAR);
@@ -41,6 +43,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
*/
+ @Override
public String getLabel(Object o) {
if (o instanceof VariableClasspathEntry) {
return ((VariableClasspathEntry)o).getName();
@@ -50,6 +53,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object o) {
return null;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/FormatStackTraceActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/FormatStackTraceActionDelegate.java
index ada92ce..dd200c2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/FormatStackTraceActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/FormatStackTraceActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,7 +31,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/
- public void init(IViewPart view) {
+ @Override
+ public void init(IViewPart view) {
if (view instanceof IConsoleView) {
fView = (IConsoleView) view;
}
@@ -40,7 +41,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
if (fConsole != null) {
fConsole.format();
}
@@ -56,5 +58,6 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {}
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaConsoleTracker.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaConsoleTracker.java
index cdb8e7b..1c1c254 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaConsoleTracker.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaConsoleTracker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,14 +30,16 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.IConsole)
*/
- public void connect(TextConsole console) {
+ @Override
+ public void connect(TextConsole console) {
fConsole = console;
}
/* (non-Javadoc)
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#disconnect()
*/
- public void disconnect() {
+ @Override
+ public void disconnect() {
fConsole = null;
}
@@ -48,7 +50,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IPatternMatchListenerDelegate#matchFound(org.eclipse.ui.console.PatternMatchEvent)
*/
- public void matchFound(PatternMatchEvent event) {
+ @Override
+ public void matchFound(PatternMatchEvent event) {
try {
int offset = event.getOffset();
int length = event.getLength();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaLikeExtensionsResolver.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaLikeExtensionsResolver.java
index 4654eab..a6f3699 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaLikeExtensionsResolver.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaLikeExtensionsResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
*/
public class JavaLikeExtensionsResolver implements IDynamicVariableResolver {
+ @Override
public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
String[] javaLikeExtensions = JavaCore.getJavaLikeExtensions();
StringBuffer buffer = new StringBuffer();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
index 4b7cac7..5de4ab4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,11 +56,13 @@
getDocument().setDocumentPartitioner(this);
}
- public boolean isReadOnly(int offset) {
+ @Override
+ public boolean isReadOnly(int offset) {
return false;
}
- public StyleRange[] getStyleRanges(int offset, int length) {
+ @Override
+ public StyleRange[] getStyleRanges(int offset, int length) {
return null;
}
@@ -71,7 +73,8 @@
private JavaStackTraceConsolePartitioner partitioner = new JavaStackTraceConsolePartitioner();
private IPropertyChangeListener propertyListener = new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
String property = event.getProperty();
if (property.equals(IDebugUIConstants.PREF_CONSOLE_FONT)) {
setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT));
@@ -95,16 +98,14 @@
void initializeDocument() {
File file = new File(FILE_NAME);
if (file.exists()) {
- try {
+ try (InputStream fin = new BufferedInputStream(new FileInputStream(file))) {
int len = (int) file.length();
byte[] b = new byte[len];
- InputStream fin = new BufferedInputStream(new FileInputStream(file));
int read = 0;
while (read < len) {
read += fin.read(b);
}
getDocument().set(new String(b));
- fin.close();
} catch (IOException e) {
}
} else {
@@ -134,14 +135,12 @@
* Saves the backing document for this console
*/
void saveDocument() {
- try {
+ try (FileOutputStream fout = new FileOutputStream(FILE_NAME)) {
IDocument document = getDocument();
if (document != null) {
if (document.getLength() > 0) {
String contents = document.get();
- FileOutputStream fout = new FileOutputStream(FILE_NAME);
fout.write(contents.getBytes());
- fout.close();
} else {
File file = new File(FILE_NAME);
file.delete();
@@ -221,7 +220,9 @@
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
if (token.length() == 0)
- continue; // paranoid
+ {
+ continue; // paranoid
+ }
char c = token.charAt(0);
// handle delimiters
switch (c) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
index 0383efc..ee24f88 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,10 +29,12 @@
public JavaStackTraceConsoleFactory() {
fConsoleManager = ConsolePlugin.getDefault().getConsoleManager();
fConsoleManager.addConsoleListener(new IConsoleListener() {
- public void consolesAdded(IConsole[] consoles) {
+ @Override
+ public void consolesAdded(IConsole[] consoles) {
}
- public void consolesRemoved(IConsole[] consoles) {
+ @Override
+ public void consolesRemoved(IConsole[] consoles) {
for (int i = 0; i < consoles.length; i++) {
if(consoles[i] == fConsole) {
fConsole.saveDocument();
@@ -47,7 +49,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IConsoleFactory#openConsole()
*/
- public void openConsole() {
+ @Override
+ public void openConsole() {
openConsole(null);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
index 83293c9..be68e48 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -57,18 +57,21 @@
/**
* @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkEntered()
*/
+ @Override
public void linkEntered() {
}
/**
* @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkExited()
*/
+ @Override
public void linkExited() {
}
/**
* @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkActivated()
*/
+ @Override
public void linkActivated() {
String typeName;
int lineNumber;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTracePageParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTracePageParticipant.java
index 5c4d2a2..35227ed 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTracePageParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTracePageParticipant.java
@@ -40,7 +40,8 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IConsolePageParticipant#init(org.eclipse.ui.part.IPageBookViewPage, org.eclipse.ui.console.IConsole)
*/
- public void init(IPageBookViewPage page, IConsole console) {
+ @Override
+ public void init(IPageBookViewPage page, IConsole console) {
fCloseAction = new CloseConsoleAction(console);
IToolBarManager manager = page.getSite().getActionBars().getToolBarManager();
@@ -52,27 +53,31 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IConsolePageParticipant#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
deactivated();
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
- public <T> T getAdapter(Class<T> adapter) {
+ @Override
+ public <T> T getAdapter(Class<T> adapter) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.ui.console.IConsolePageParticipant#activated()
*/
+ @Override
public void activated() {
// add EOF submissions
IWorkbench workbench = PlatformUI.getWorkbench();
IHandlerService handlerService = workbench.getAdapter(IHandlerService.class);
IHandler formatHandler = new AbstractHandler() {
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
fFormatAction.run(null);
return null;
}
@@ -87,6 +92,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.console.IConsolePageParticipant#deactivated()
*/
+ @Override
public void deactivated() {
// remove EOF submissions
IWorkbench workbench = PlatformUI.getWorkbench();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java
index 9ab14db..76ed79a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/JavaDebugContentAssistProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@
/**
* @see IContentAssistProcessor#getErrorMessage()
*/
+ @Override
public String getErrorMessage() {
if (fErrorMessage != null) {
return fErrorMessage;
@@ -92,6 +93,7 @@
/**
* @see IContentAssistProcessor#getContextInformationValidator()
*/
+ @Override
public IContextInformationValidator getContextInformationValidator() {
if (fValidator == null) {
fValidator= new JavaParameterListValidator();
@@ -102,6 +104,7 @@
/**
* @see IContentAssistProcessor#getContextInformationAutoActivationCharacters()
*/
+ @Override
public char[] getContextInformationAutoActivationCharacters() {
return null;
}
@@ -109,6 +112,7 @@
/**
* @see IContentAssistProcessor#computeContextInformation(ITextViewer, int)
*/
+ @Override
public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
return null;
}
@@ -116,6 +120,7 @@
/**
* @see IContentAssistProcessor#computeProposals(ITextViewer, int)
*/
+ @Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
setErrorMessage(null);
try {
@@ -203,6 +208,7 @@
/**
* @see IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
*/
+ @Override
public char[] getCompletionProposalAutoActivationCharacters() {
return fProposalAutoActivationSet;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java
index 1e6a6a2..69a28c5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/contentassist/TypeContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.text.IJavaDebugCompletionProcessorContext#getType()
*/
+ @Override
public IType getType() throws CoreException {
if (fType == null) {
unableToResolveType();
@@ -61,6 +62,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.text.IJavaDebugCompletionProcessorContext#getInsertionPosition()
*/
+ @Override
public int getInsertionPosition() throws CoreException {
return fPosition;
}
@@ -68,6 +70,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.text.IJavaDebugCompletionProcessorContext#getLocalVariables()
*/
+ @Override
public String[][] getLocalVariables() throws CoreException {
return new String[0][];
}
@@ -75,6 +78,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.text.IJavaDebugCompletionProcessorContext#isStatic()
*/
+ @Override
public boolean isStatic() throws CoreException {
return false;
}
@@ -82,6 +86,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.contentassist.IJavaDebugContentAssistContext#getSnippet(java.lang.String)
*/
+ @Override
public String getSnippet(String snippet) throws CoreException {
return snippet;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
index 72f6c37..9ace5ef 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @see IDataDisplay#clear()
*/
+ @Override
public void clear() {
IDocument document= getTextViewer().getDocument();
if (document != null) {
@@ -49,6 +50,7 @@
/**
* @see IDataDisplay#displayExpression(String)
*/
+ @Override
public void displayExpression(String expression) {
IDocument document= fTextViewer.getDocument();
int offset= document.getLength();
@@ -68,6 +70,7 @@
/**
* @see IDataDisplay#displayExpressionValue(String)
*/
+ @Override
public void displayExpressionValue(String value) {
value= System.getProperty("line.separator") + '\t' + value; //$NON-NLS-1$
ITextSelection selection= (ITextSelection)fTextViewer.getSelectionProvider().getSelection();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
index c31ef00..0360ee8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@
/**
* @see IDataDisplay#clear()
*/
+ @Override
public void clear() {
IDocument document= fSourceViewer.getDocument();
if (document != null) {
@@ -104,6 +105,7 @@
/**
* @see IDataDisplay#displayExpression(String)
*/
+ @Override
public void displayExpression(String expression) {
IDocument document= fSourceViewer.getDocument();
int offset= document.getLength();
@@ -123,6 +125,7 @@
/**
* @see IDataDisplay#displayExpressionValue(String)
*/
+ @Override
public void displayExpressionValue(String value) {
value= System.getProperty("line.separator") + '\t' + value; //$NON-NLS-1$
ITextSelection selection= (ITextSelection)fSourceViewer.getSelection();
@@ -179,6 +182,7 @@
MenuManager menuMgr = new MenuManager("#PopUp"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager mgr) {
fillContextMenu(mgr);
}
@@ -208,11 +212,13 @@
/**
* @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
*/
+ @Override
public void documentAboutToBeChanged(DocumentEvent event) {
}
/**
* @see IDocumentListener#documentChanged(DocumentEvent)
*/
+ @Override
public void documentChanged(DocumentEvent event) {
updateAction(ActionFactory.FIND.getId());
}
@@ -284,6 +290,7 @@
getViewSite().getActionBars().updateActionBars();
IHandler handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
fContentAssistAction.run();
return null;
@@ -477,6 +484,7 @@
protected final ISelectionChangedListener getSelectionChangedListener() {
return new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updateSelectionDependentActions();
}
@@ -500,12 +508,14 @@
/**
* @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument)
*/
+ @Override
public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
}
/**
* @see ITextInputListener#inputDocumentChanged(IDocument, IDocument)
*/
+ @Override
public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
oldInput.removeDocumentListener(fDocumentListener);
}
@@ -529,6 +539,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
if (partRef instanceof IViewReference && changeId.equals(IWorkbenchPage.CHANGE_VIEW_HIDE)) {
String id = ((IViewReference) partRef).getId();
@@ -546,12 +557,14 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
*/
+ @Override
public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
*/
+ @Override
public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
index 95afa77..00cf43f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
@@ -59,6 +59,7 @@
* editor's <code>ITextOperationTarget</code> adapter, and sets the
* enabled state accordingly.
*/
+ @Override
public void update() {
if (fOperationTarget == null && fTargetProvider != null && fOperationCode != -1){
fOperationTarget = fTargetProvider.getAdapter(ITextOperationTarget.class);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
index ff89ff5..f676424 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -79,6 +79,7 @@
/**
* @see IExpression#getExpressionText()
*/
+ @Override
public String getExpressionText() {
return fExpression;
}
@@ -86,6 +87,7 @@
/**
* @see IExpression#getValue()
*/
+ @Override
public IValue getValue() {
return fValue;
}
@@ -93,6 +95,7 @@
/**
* @see IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
IValue value= getValue();
if (value != null) {
@@ -109,6 +112,7 @@
/**
* @see IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return getDebugTarget().getModelIdentifier();
}
@@ -116,6 +120,7 @@
/**
* @see IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return getDebugTarget().getLaunch();
}
@@ -123,6 +128,7 @@
/**
* @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
@@ -149,6 +155,7 @@
/**
* @see IExpression#dispose()
*/
+ @Override
public void dispose() {
DebugPlugin.getDefault().removeDebugEventListener(this);
}
@@ -156,6 +163,7 @@
/**
* @see org.eclipse.debug.core.model.IErrorReportingExpression#hasErrors()
*/
+ @Override
public boolean hasErrors() {
return fResult != null && fResult.hasErrors();
}
@@ -163,6 +171,7 @@
/**
* @see org.eclipse.debug.core.model.IErrorReportingExpression#getErrorMessages()
*/
+ @Override
public String[] getErrorMessages() {
return getErrorMessages(fResult);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java
index f95afe1..0575925 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java
@@ -77,6 +77,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
if (getPart() != null){
ISelectionProvider provider = getPart().getSite().getSelectionProvider();
@@ -222,7 +223,8 @@
*/
protected void report(final String message, final IWorkbenchPart part) {
JDIDebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
IEditorStatusLine statusLine = part.getAdapter(IEditorStatusLine.class);
if (statusLine != null) {
if (message != null) {
@@ -326,6 +328,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
*/
+ @Override
public void setActiveEditor(IAction action, IEditorPart targetEditor) {
setActivePart(action, targetEditor);
}
@@ -333,6 +336,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
fWindow = window;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java
index b8b8a23..2e486dd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java
@@ -45,6 +45,7 @@
protected IWorkbenchWindow fWindow;
+ @Override
public void run(IAction action) {
IStructuredSelection currentSelection = getCurrentSelection();
if (currentSelection != null && (currentSelection.getFirstElement() instanceof IJavaVariable)){
@@ -86,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
fWindow = window;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesInViewActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesInViewActionDelegate.java
index 5152cbb..91cdc01 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesInViewActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesInViewActionDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,6 +42,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
HeapWalkingManager.getDefault().setShowReferenceInVarView(action.isChecked());
// If the current target doesn't support instance retrieval, warn the user that turning the option on will not do anything.
@@ -57,6 +58,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
*/
+ @Override
public void init(IAction action) {
fAction = action;
action.setChecked(HeapWalkingManager.getDefault().isShowReferenceInVarView());
@@ -69,6 +71,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/
+ @Override
public void init(IViewPart view) {
if (view instanceof IDebugView){
fView = (IDebugView)view;
@@ -78,12 +81,14 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
+ @Override
public void dispose() {
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JDIDebugPlugin.getUniqueIdentifier());
if(prefs != null) {
@@ -94,6 +99,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
*/
+ @Override
public void runWithEvent(IAction action, Event event) {
run(action);
}
@@ -101,6 +107,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (JDIDebugPlugin.PREF_SHOW_REFERENCES_IN_VAR_VIEW.equals(event.getKey()) || JDIDebugPlugin.PREF_ALL_REFERENCES_MAX_COUNT.equals(event.getKey())){
if (fAction != null){
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java
index 9867c0d..d5dfb59 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension#canCreateWatchExpression(org.eclipse.debug.core.model.IVariable)
*/
+ @Override
public boolean canCreateWatchExpression(IVariable variable) {
if (variable instanceof JDIReferenceListVariable || variable instanceof JDIReferenceListEntryVariable ||
variable instanceof JDIArrayEntryVariable || variable instanceof IndexedVariablePartition){
@@ -49,6 +50,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter#createWatchExpression(org.eclipse.debug.core.model.IVariable)
*/
+ @Override
public String createWatchExpression(IVariable variable) throws CoreException {
return variable.getName();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java
index a63af68..8be24e4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/EEVMPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -82,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite p) {
// create a composite with standard margins and spacing
Composite composite = new Composite(p, SWT.NONE);
@@ -125,6 +126,7 @@
initializeFields();
//add the listeners now to prevent them from monkeying with initialized settings
fVMName.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!fIgnoreCallbacks) {
validateVMName();
@@ -132,6 +134,7 @@
}
});
fEEFile.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!fIgnoreCallbacks && validateDefinitionFile().isOK()) {
initializeFields();
@@ -139,7 +142,9 @@
}
});
folders.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(getShell());
dialog.setFilterExtensions(new String[]{"*.ee"}); //$NON-NLS-1$
@@ -189,6 +194,7 @@
final IStatus[] temp = new IStatus[1];
final VMStandin[] standin = new VMStandin[1];
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
standin[0] = JavaRuntime.createVMFromDefinitionFile(file, fVM.getName(), fVM.getId());
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java
index dd20120..b2c8904 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/ExecutionEnvironmentsPreferencePage.java
@@ -71,6 +71,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return ((IExecutionEnvironment)inputElement).getCompatibleVMs();
}
@@ -78,12 +79,14 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
@@ -99,6 +102,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {
}
@@ -205,6 +209,7 @@
fJREsViewer = new CheckboxTableViewer(table);
fJREsViewer.setContentProvider(new JREsContentProvider());
fJREsViewer.setLabelProvider(new JREsEnvironmentLabelProvider(new JREsEnvironmentLabelProvider.IExecutionEnvironmentProvider() {
+ @Override
public IExecutionEnvironment getEnvironment() {
return (IExecutionEnvironment) fJREsViewer.getInput();
}
@@ -222,12 +227,14 @@
fDescription = text;
fProfilesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
handleEESelectionAndJREViewer((IStructuredSelection) event.getSelection());
}
});
fJREsViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
if (event.getChecked()) {
Object element = event.getElement();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
index d86f5c5..0983917 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
@@ -19,37 +19,25 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.osgi.util.NLS;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SubMonitor;
-
+import org.eclipse.debug.internal.ui.SWTFactory;
+import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+import org.eclipse.jdt.internal.launching.MacInstalledJREs;
+import org.eclipse.jdt.launching.AbstractVMInstall;
+import org.eclipse.jdt.launching.AbstractVMInstallType;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMInstallChangedListener;
+import org.eclipse.jdt.launching.IVMInstallType;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.PropertyChangeEvent;
+import org.eclipse.jdt.launching.VMStandin;
+import org.eclipse.jdt.ui.ISharedImages;
+import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -76,23 +64,28 @@
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.debug.internal.ui.SWTFactory;
-
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.launching.MacInstalledJREs;
-
-import org.eclipse.jdt.launching.AbstractVMInstall;
-import org.eclipse.jdt.launching.AbstractVMInstallType;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallChangedListener;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.PropertyChangeEvent;
-import org.eclipse.jdt.launching.VMStandin;
-
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
/**
* A composite that displays installed JRE's in a table. JREs can be
@@ -116,6 +109,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
//do nothing, we do not want other bundles changing the default JRE this way
}
@@ -123,6 +117,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(PropertyChangeEvent event) {
//do nothing, we do not want other bundles making VM install edits without user interaction
}
@@ -130,6 +125,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall vm) {
if(!fVMs.contains(vm)) {
fVMs.add(vm);
@@ -140,6 +136,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall vm) {
//do nothing, we do not want other bundles removing VM installs without user interaction
}
@@ -154,6 +151,7 @@
}
else {
display.syncExec(new Runnable() {
+ @Override
public void run() {
fVMList.refresh();
}
@@ -222,11 +220,14 @@
* Content provider to show a list of JREs
*/
class JREsContentProvider implements IStructuredContentProvider {
+ @Override
public Object[] getElements(Object input) {
return fVMs.toArray();
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
+ @Override
public void dispose() {
}
}
@@ -241,6 +242,7 @@
/**
* @see ITableLabelProvider#getColumnText(Object, int)
*/
+ @Override
public String getColumnText(Object element, int columnIndex) {
if (element instanceof IVMInstall) {
IVMInstall vm= (IVMInstall)element;
@@ -265,6 +267,7 @@
/**
* @see ITableLabelProvider#getColumnImage(Object, int)
*/
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
if (columnIndex == 0) {
return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_LIBRARY);
@@ -272,6 +275,7 @@
return null;
}
+ @Override
public Font getFont(Object element) {
if(fVMList.getChecked(element)) {
if (bold == null) {
@@ -297,6 +301,7 @@
super.dispose();
}
+ @Override
public Color getForeground(Object element) {
if (isUnmodifiable(element)) {
Display display = Display.getCurrent();
@@ -305,6 +310,7 @@
return null;
}
+ @Override
public Color getBackground(Object element) {
if (isUnmodifiable(element)) {
Display display = Display.getCurrent();
@@ -326,6 +332,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
*/
+ @Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
fSelectionListeners.add(listener);
}
@@ -333,6 +340,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
*/
+ @Override
public ISelection getSelection() {
return new StructuredSelection(fVMList.getCheckedElements());
}
@@ -340,6 +348,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
*/
+ @Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
fSelectionListeners.remove(listener);
}
@@ -347,6 +356,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void setSelection(ISelection selection) {
if (selection instanceof IStructuredSelection) {
if (!selection.equals(fPrevSelection)) {
@@ -430,12 +440,14 @@
sortByName();
fVMList.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent evt) {
enableButtons();
}
});
fVMList.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
if (event.getChecked()) {
setCheckedJRE((IVMInstall)event.getElement());
@@ -446,6 +458,7 @@
});
fVMList.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent e) {
if (!fVMList.getSelection().isEmpty()) {
editVM();
@@ -467,6 +480,7 @@
fAddButton = SWTFactory.createPushButton(buttons, JREMessages.InstalledJREsBlock_3, null);
fAddButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event evt) {
addVM();
}
@@ -474,6 +488,7 @@
fEditButton= SWTFactory.createPushButton(buttons, JREMessages.InstalledJREsBlock_4, null);
fEditButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event evt) {
editVM();
}
@@ -481,6 +496,7 @@
fCopyButton = SWTFactory.createPushButton(buttons, JREMessages.InstalledJREsBlock_16, null);
fCopyButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event evt) {
copyVM();
}
@@ -488,6 +504,7 @@
fRemoveButton= SWTFactory.createPushButton(buttons, JREMessages.InstalledJREsBlock_5, null);
fRemoveButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event evt) {
removeVMs();
}
@@ -497,6 +514,7 @@
fSearchButton = SWTFactory.createPushButton(buttons, JREMessages.InstalledJREsBlock_6, null);
fSearchButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event evt) {
search();
}
@@ -732,6 +750,7 @@
/**
* @see IAddVMDialogRequestor#vmAdded(IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall vm) {
boolean makeselection = fVMs.size() < 1;
fVMs.add(vm);
@@ -748,6 +767,7 @@
/**
* @see IAddVMDialogRequestor#isDuplicateName(String)
*/
+ @Override
public boolean isDuplicateName(String name) {
for (int i= 0; i < fVMs.size(); i++) {
IVMInstall vm = fVMs.get(i);
@@ -855,6 +875,7 @@
final List<IVMInstallType> types = new ArrayList<IVMInstallType>();
IRunnableWithProgress r = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) {
monitor.beginTask(JREMessages.InstalledJREsBlock_11, IProgressMonitor.UNKNOWN);
search(rootDir, locations, types, exstingLocations, monitor);
@@ -922,6 +943,7 @@
private void doMacSearch() {
final List<VMStandin> added = new ArrayList<VMStandin>();
IRunnableWithProgress r = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException {
Set<String> exists = new HashSet<String>();
for (IVMInstall vm : fVMs) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREContainerWizardPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREContainerWizardPage.java
index f5807de..f9c3a6e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREContainerWizardPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREContainerWizardPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 20010 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,6 +51,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#finish()
*/
+ @Override
public boolean finish() {
IPath path = fJREBlock.getPath();
fSelection = JavaCore.newContainerEntry(path);
@@ -60,6 +61,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#getSelection()
*/
+ @Override
public IClasspathEntry getSelection() {
return fSelection;
}
@@ -67,6 +69,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#setSelection(org.eclipse.jdt.core.IClasspathEntry)
*/
+ @Override
public void setSelection(IClasspathEntry containerEntry) {
fSelection = containerEntry;
initializeFromSelection();
@@ -92,6 +95,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
fJREBlock = new JREsComboBlock(false);
@@ -102,6 +106,7 @@
fJREBlock.getControl().setLayoutData(gd);
setControl(composite);
fJREBlock.addPropertyChangeListener(new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
IStatus status = fJREBlock.getStatus();
if (status.isOK()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
index 1ee1250..3c5067a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -218,6 +218,7 @@
fManageEnvironmentsButton = SWTFactory.createPushButton(comp, JREMessages.JREsComboBlock_14, null);
fManageEnvironmentsButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
showPrefPage(ExecutionEnvironmentsPreferencePage.ID);
}
@@ -262,6 +263,7 @@
fManageButton = SWTFactory.createPushButton(comp, JREMessages.JREsComboBlock_2, null);
fManageButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
showPrefPage(JREsPreferencePage.ID);
}
@@ -340,6 +342,7 @@
fVMs.addAll(jres);
// sort by name
Collections.sort(fVMs, new Comparator<Object>() {
+ @Override
public int compare(Object o1, Object o2) {
IVMInstall left = (IVMInstall)o1;
IVMInstall right = (IVMInstall)o2;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java
index 76d0796..098b818 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -84,6 +84,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
*/
+ @Override
public Font getFont(Object element) {
if (isStrictlyCompatible(element)) {
if (fFont == null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java
index 882680c..cee9aa8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,6 +78,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
+ @Override
public void init(IWorkbench workbench) {
}
@@ -130,13 +131,16 @@
fCompliance.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fCompliance.setVisible(false);
fCompliance.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {openCompliancePreferencePage();}
});
PlatformUI.getWorkbench().getHelpSystem().setHelp(ancestor, IJavaDebugHelpContextIds.JRE_PREFERENCE_PAGE);
initDefaultVM();
fJREBlock.initializeTimeStamp();
fJREBlock.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
IVMInstall install = getCurrentDefaultVM();
if (install == null) {
@@ -242,6 +246,7 @@
public boolean performOk() {
final boolean[] canceled = new boolean[] {false};
BusyIndicator.showWhile(null, new Runnable() {
+ @Override
public void run() {
IVMInstall defaultVM = getCurrentDefaultVM();
IVMInstall[] vms = fJREBlock.getJREs();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java
index eab9d2f..6a13165 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsUpdater.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -81,6 +81,7 @@
private void saveVMDefinitions(final VMDefinitionsContainer container) {
IRunnableWithProgress runnable = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
monitor.beginTask(JREMessages.JREsUpdater_0, 100);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java
index 7b7a4be..115d393 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -82,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
fChildren.clear();
}
@@ -89,6 +90,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
fViewer = viewer;
}
@@ -96,6 +98,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return fLibraries;
}
@@ -103,6 +106,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof LibraryStandin) {
LibraryStandin standin= (LibraryStandin) parentElement;
@@ -119,6 +123,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
if (element instanceof SubElement) {
return ((SubElement)element).getParent();
@@ -129,6 +134,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(Object element) {
return element instanceof LibraryStandin;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java
index d44781e..7c3c2f4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@
/**
* @see ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
Composite comp = new Composite(parent, parent.getStyle());
@@ -98,6 +99,7 @@
fJavaCommandText.setLayoutData(gd);
fJavaCommandText.setFont(font);
fJavaCommandText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
updateLaunchConfigurationDialog();
}
@@ -121,6 +123,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return JREMessages.AbstractJavaCommandTab_3;
}
@@ -128,6 +131,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
String javaCommand= null;
try {
@@ -154,6 +158,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (fDefaultButton.getSelection()) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, (Map<String, String>)null);
@@ -168,6 +173,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, (Map<String, String>)null);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java
index 3d19f3e..f74912c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -85,6 +85,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite p) {
// create a composite with standard margins and spacing
Composite composite = new Composite(p, SWT.NONE);
@@ -121,17 +122,21 @@
//add the listeners now to prevent them from monkeying with initialized settings
fVMName.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
validateVMName();
}
});
fJRERoot.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
validateJRELocation();
}
});
folders.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
+ @Override
public void widgetSelected(SelectionEvent e) {
DirectoryDialog dialog = new DirectoryDialog(getShell());
File file = new File(fJRERoot.getText());
@@ -185,6 +190,7 @@
final IStatus[] temp = new IStatus[1];
final File tempFile = file;
Runnable r = new Runnable() {
+ @Override
public void run() {
temp[0] = fVM.getVMInstallType().validateInstallLocation(tempFile);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
index ad51478..e0afe02 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -96,6 +96,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -121,6 +122,7 @@
fSourceButton.setEnabled(false);
fSourceButton.addSelectionListener(this);
fLibraryViewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
IStructuredSelection sel = (IStructuredSelection)event.getViewer().getSelection();
Object obj = sel.getFirstElement();
@@ -242,6 +244,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
*/
+ @Override
public void widgetSelected(SelectionEvent e) {
boolean completed = true;
Object source= e.getSource();
@@ -271,6 +274,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
*/
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
/**
@@ -342,6 +346,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updateButtons();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java
index 0fb95f5..fdb234f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMTypePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,6 +101,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
@@ -116,6 +117,7 @@
fTypesViewer.setLabelProvider(new TypeLabelProvider());
fTypesViewer.setComparator(new ViewerComparator());
fTypesViewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
setPageComplete(true);
updateNextPage();
@@ -123,6 +125,7 @@
}
});
fTypesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent event) {
if (event.getSelection().isEmpty()){
setPageComplete(false);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaClasspathTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaClasspathTab.java
index e882088..d3bda87 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaClasspathTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaClasspathTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IEntriesChangedListener#entriesChanged(org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer)
*/
+ @Override
public void entriesChanged(IClasspathViewer viewer) {
setDirty(true);
updateLaunchConfigurationDialog();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java
index 7aef556..82375f0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaMainTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,12 +56,15 @@
*/
private class WidgetListener implements ModifyListener, SelectionListener {
+ @Override
public void modifyText(ModifyEvent e) {
updateLaunchConfigurationDialog();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {/*do nothing*/}
+ @Override
public void widgetSelected(SelectionEvent e) {
Object source = e.getSource();
if (source == fProjButton) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
index 3e14013..e6e501a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -214,6 +214,7 @@
if (elements.length > 0) {
IRunnableWithProgress runnable= new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor pm) throws InterruptedException {
int nElements= elements.length;
pm.beginTask(LauncherMessages.appletlauncher_search_task_inprogress, nElements);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
index d78129e..95f2286 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -116,6 +116,7 @@
boolean canceled = false;
try {
fRunnableContext.run(true, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) {
monitor.beginTask(LauncherMessages.AppletSelectionDialog_Searching____1, projectCount);
for (int i = 0; i < projectCount; i++) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
index 16fccec..4ded676 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
@@ -54,6 +54,7 @@
public class DebugTypeLabelProvider implements ILabelProvider {
HashMap<ImageDescriptor, Image> fImageMap = new HashMap<ImageDescriptor, Image>();
+ @Override
public Image getImage(Object element) {
if(element instanceof IAdaptable) {
IWorkbenchAdapter adapter = ((IAdaptable) element).getAdapter(IWorkbenchAdapter.class);
@@ -69,6 +70,7 @@
}
return null;
}
+ @Override
public String getText(Object element) {
if(element instanceof IType) {
IType type = (IType) element;
@@ -113,12 +115,16 @@
return outer;
}
+ @Override
public void dispose() {
fImageMap.clear();
fImageMap = null;
}
+ @Override
public void addListener(ILabelProviderListener listener) {}
+ @Override
public boolean isLabelProperty(Object element, String property) {return false;}
+ @Override
public void removeListener(ILabelProviderListener listener) {}
}
@@ -238,7 +244,8 @@
@Override
protected Comparator getItemsComparator() {
Comparator<?> comp = new Comparator<Object>() {
- public int compare(Object o1, Object o2) {
+ @Override
+ public int compare(Object o1, Object o2) {
if(o1 instanceof IType && o2 instanceof IType) {
return ((IType)o1).getElementName().compareTo(((IType)o2).getElementName());
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DefineSystemLibraryQuickFix.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DefineSystemLibraryQuickFix.java
index 58cc174..66afcf6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DefineSystemLibraryQuickFix.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DefineSystemLibraryQuickFix.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
*/
+ @Override
public void run(IMarker marker) {
JDIDebugUIPlugin.showPreferencePage(JREsPreferencePage.ID);
}
@@ -35,6 +36,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#getLabel()
*/
+ @Override
public String getLabel() {
return LauncherMessages.DefineSystemLibraryQuickFix_Create_a_system_library_definition_2;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ExecutionEnvironmentSelector.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ExecutionEnvironmentSelector.java
index e90ccbd..81241d3 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ExecutionEnvironmentSelector.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ExecutionEnvironmentSelector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@
public ExecutionEnvironmentSelector() {
}
+ @Override
public String selectArgument(IStringVariable variable, Shell shell) {
ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, new ExecutionEnvironmentsLabelProvider());
dialog.setTitle(LauncherMessages.ExecutionEnvironmentSelector_0);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaAppletTabGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaAppletTabGroup.java
index e427981..e6f3e33 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaAppletTabGroup.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaAppletTabGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
*/
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new AppletMainTab(),
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
index d8eed58..d8924d9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@
/**
* @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
*/
+ @Override
public IMarkerResolution[] getResolutions(IMarker marker) {
try {
if(JavaRuntime.JRE_CONTAINER_MARKER.equals(marker.getType())) {
@@ -103,6 +104,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IMarkerResolutionGenerator2#hasResolutions(org.eclipse.core.resources.IMarker)
*/
+ @Override
public boolean hasResolutions(IMarker marker) {
try {
String type = marker.getType();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
index 0624fb6..0c982eb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@
/**
* @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
*/
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new JavaMainTab(),
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
index 67b8cde..ee84fd2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -158,6 +158,7 @@
final IType[][] res= new IType[1][];
IRunnableWithProgress runnable= new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor pm) throws InvocationTargetException {
res[0]= searchMainMethods(pm, scope, includeSubtypes);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
index c55eab6..11d5339 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,6 +62,7 @@
fNameLabel.setFont(font);
ModifyListener listener= new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updateButtons();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPreferencePageResolution.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPreferencePageResolution.java
index ac5bdd3..3413508 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPreferencePageResolution.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPreferencePageResolution.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IMarkerResolution2#getDescription()
*/
+ @Override
public String getDescription() {
return this.description;
}
@@ -57,6 +58,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IMarkerResolution2#getImage()
*/
+ @Override
public Image getImage() {
return null;
}
@@ -64,6 +66,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IMarkerResolution#getLabel()
*/
+ @Override
public String getLabel() {
return this.label;
}
@@ -71,6 +74,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
*/
+ @Override
public void run(IMarker marker) {
UIJob job = new UIJob(""){ //$NON-NLS-1$
@Override
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProjectClasspathArgumentSelector.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProjectClasspathArgumentSelector.java
index dbbe8af..f78410e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProjectClasspathArgumentSelector.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProjectClasspathArgumentSelector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@
public ProjectClasspathArgumentSelector() {
}
+ @Override
public String selectArgument(IStringVariable variable, Shell shell) {
ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, new WorkbenchLabelProvider());
dialog.setTitle(LauncherMessages.ProjectClasspathArugumentSelector_0);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
index ec0cb24..79e0b1c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
*/
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new JavaConnectTab(),
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
index b9ffc44..b31874b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/**
* @see IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getEntries();
}
@@ -61,12 +62,14 @@
/**
* @see IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see IContentProvider#inputChanged(Viewer, Object, Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
@@ -100,6 +103,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#setEntries(org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public void setEntries(IRuntimeClasspathEntry[] entries) {
fEntries.clear();
for (int i = 0; i < entries.length; i++) {
@@ -112,6 +116,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#getEntries()
*/
+ @Override
public IRuntimeClasspathEntry[] getEntries() {
return fEntries.toArray(new IRuntimeClasspathEntry[fEntries.size()]);
}
@@ -119,6 +124,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#addEntries(org.eclipse.jdt.launching.IRuntimeClasspathEntry[])
*/
+ @Override
public void addEntries(IRuntimeClasspathEntry[] entries) {
IStructuredSelection sel = (IStructuredSelection)getSelection();
if (sel.isEmpty()) {
@@ -155,6 +161,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return fEnabled;
}
@@ -179,6 +186,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#notifyChanged()
*/
+ @Override
public void notifyChanged() {
Object[] listeners = fListeners.getListeners();
for (int i = 0; i < listeners.length; i++) {
@@ -189,6 +197,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#indexOf(org.eclipse.jdt.launching.IRuntimeClasspathEntry)
*/
+ @Override
public int indexOf(IRuntimeClasspathEntry entry) {
return fEntries.indexOf(entry);
}
@@ -196,6 +205,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#getShell()
*/
+ @Override
public Shell getShell() {
return getControl().getShell();
}
@@ -203,6 +213,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer#updateSelection(int, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public boolean updateSelection(int actionType, IStructuredSelection selection) {
return isEnabled();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectDefaultSystemLibraryQuickFix.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectDefaultSystemLibraryQuickFix.java
index 03fff74..f115d2a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectDefaultSystemLibraryQuickFix.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectDefaultSystemLibraryQuickFix.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
*/
+ @Override
public void run(IMarker marker) {
try {
String title = LauncherMessages.SelectDefaultSystemLibraryQuickFix_Select_Default_System_Library_1;
@@ -48,6 +49,7 @@
}
IRunnableWithProgress runnable = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
JavaRuntime.setDefaultVMInstall(vm, monitor);
@@ -75,6 +77,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#getLabel()
*/
+ @Override
public String getLabel() {
return LauncherMessages.SelectDefaultSystemLibraryQuickFix_Select_default_system_library_5;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java
index c8ecdef..bbd0a72 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
*/
+ @Override
public void run(IMarker marker) {
try {
handleContainerResolutionError(fOldPath, fProject);
@@ -70,6 +71,7 @@
}
IRunnableWithProgress runnable = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
IPath newPath = containerEntry.getPath();
@@ -102,6 +104,7 @@
/**
* @see org.eclipse.ui.IMarkerResolution#getLabel()
*/
+ @Override
public String getLabel() {
return NLS.bind(LauncherMessages.JREContainerResolution_Select_a_system_library_to_use_when_building__0__2, new String[]{fProject.getElementName()});
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SharedJavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SharedJavaMainTab.java
index 48545c9..0c2788e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SharedJavaMainTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SharedJavaMainTab.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@
Group group = SWTFactory.createGroup(parent, text, 2, 1, GridData.FILL_HORIZONTAL);
fMainText = SWTFactory.createSingleText(group, 1);
fMainText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updateLaunchConfigurationDialog();
}
@@ -66,8 +67,10 @@
ControlAccessibleListener.addListener(fMainText, group.getText());
fSearchButton = createPushButton(group, LauncherMessages.AbstractJavaMainTab_2, null);
fSearchButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
+ @Override
public void widgetSelected(SelectionEvent e) {
handleSearchButtonSelected();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
index bf49865..8fd4244 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -69,6 +69,7 @@
*
* @param parent the parent widget of this control
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -277,6 +278,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (isDirty()) {
boolean def = fDefaultButton.getSelection();
@@ -335,6 +337,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.SourceLookupBlock_Source_1;
}
@@ -342,6 +345,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, (String)null);
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH, (List<String>)null);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMArgumentsBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMArgumentsBlock.java
index 642e9ba..21a7156 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMArgumentsBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMArgumentsBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -63,6 +64,7 @@
fVMArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP| SWT.BORDER | SWT.V_SCROLL);
fVMArgumentsText.addTraverseListener(new TraverseListener() {
+ @Override
public void keyTraversed(TraverseEvent e) {
switch (e.detail) {
case SWT.TRAVERSE_ESCAPE:
@@ -90,6 +92,7 @@
fVMArgumentsText.setLayoutData(gd);
fVMArgumentsText.setFont(font);
fVMArgumentsText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
scheduleUpdateJob();
}
@@ -125,6 +128,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, (String)null);
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_USE_START_ON_FIRST_THREAD, true);
@@ -149,6 +153,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getAttributeValueFrom(fVMArgumentsText));
if(fUseStartOnFirstThread != null) {
@@ -159,6 +164,7 @@
/**
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LauncherMessages.VMArgumentsBlock_VM_Arguments;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
index 1ecc633..a6e5fa6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,9 +25,11 @@
/**
* @see IStatusHandler#handleStatus(IStatus, Object)
*/
+ @Override
public Object handleStatus(IStatus status, Object source) {
final boolean[] result = new boolean[1];
JDIDebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
String title= LauncherMessages.VMConnectTimeoutStatusHandler_Java_Application_1;
String message= LauncherMessages.jdkLauncher_error_timeout;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkspaceOperationRunner.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkspaceOperationRunner.java
index 24a65d1..354d8d2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkspaceOperationRunner.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkspaceOperationRunner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,19 +48,22 @@
* @return the progress monitor
*/
public IProgressMonitor getProgressMonitor() {
- if (fProgressMonitor == null)
+ if (fProgressMonitor == null) {
fProgressMonitor= new NullProgressMonitor();
+ }
return fProgressMonitor;
}
/*
* @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
*/
+ @Override
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
- if (runnable instanceof ISchedulingRuleProvider)
+ if (runnable instanceof ISchedulingRuleProvider) {
run(fork, cancelable, runnable, ((ISchedulingRuleProvider)runnable).getSchedulingRule());
- else
+ } else {
run(fork, cancelable, runnable, ResourcesPlugin.getWorkspace().getRoot());
+ }
}
/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java
index 1f735c9..ebd74c7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaContendedMonitor.java
@@ -88,6 +88,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return fMonitor.getModelIdentifier();
}
@@ -95,6 +96,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fMonitor.getDebugTarget();
}
@@ -102,6 +104,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fMonitor.getLaunch();
}
@@ -141,6 +144,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return getDebugTarget().canTerminate();
}
@@ -148,6 +152,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getDebugTarget().isTerminated();
}
@@ -155,6 +160,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
getDebugTarget().terminate();
}
@@ -162,6 +168,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/
+ @Override
public boolean canResume() {
JavaOwningThread owningThread = getOwningThread();
if(owningThread != null) {
@@ -176,6 +183,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/
+ @Override
public boolean canSuspend() {
return false;
}
@@ -183,6 +191,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/
+ @Override
public boolean isSuspended() {
JavaOwningThread owningThread = getOwningThread();
if(owningThread != null) {
@@ -197,6 +206,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/
+ @Override
public void resume() throws DebugException {
getOwningThread().getThread().getOriginalThread().resume();
}
@@ -204,6 +214,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/
+ @Override
public void suspend() throws DebugException {
getOwningThread().getThread().getOriginalThread().suspend();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaElementContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaElementContentProvider.java
index 48a8c52..2f39ce8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaElementContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaElementContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@
static {
IPreferenceStore preferenceStore = JDIDebugUIPlugin.getDefault().getPreferenceStore();
preferenceStore.addPropertyChangeListener(new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(IJavaDebugUIConstants.PREF_SHOW_MONITOR_THREAD_INFO)) {
fgDisplayMonitors= JDIDebugUIPreferenceInitializer.getBoolean(event);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java
index efd98f7..038c041 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwnedMonitor.java
@@ -103,6 +103,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return fMonitor.getModelIdentifier();
}
@@ -110,6 +111,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fMonitor.getDebugTarget();
}
@@ -117,6 +119,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fMonitor.getLaunch();
}
@@ -156,6 +159,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return getDebugTarget().canTerminate();
}
@@ -163,6 +167,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getDebugTarget().isTerminated();
}
@@ -170,6 +175,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
getDebugTarget().terminate();
}
@@ -177,6 +183,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/
+ @Override
public boolean canResume() {
IThread thread = getParentThread();
if(thread != null) {
@@ -188,6 +195,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/
+ @Override
public boolean canSuspend() {
IThread thread = getParentThread();
if(thread != null) {
@@ -199,6 +207,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/
+ @Override
public boolean isSuspended() {
IThread thread = getParentThread();
if(thread != null) {
@@ -210,6 +219,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/
+ @Override
public void resume() throws DebugException {
IThread thread = getParentThread();
if(thread != null) {
@@ -220,6 +230,7 @@
/**
* @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/
+ @Override
public void suspend() throws DebugException {
IThread thread = getParentThread();
if(thread != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java
index 0f38757..7604000 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaOwningThread.java
@@ -82,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return fThread.getModelIdentifier();
}
@@ -89,6 +90,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fThread.getDebugTarget();
}
@@ -96,6 +98,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fThread.getLaunch();
}
@@ -126,6 +129,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return getDebugTarget().canTerminate();
}
@@ -133,6 +137,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getDebugTarget().isTerminated();
}
@@ -140,6 +145,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
getDebugTarget().terminate();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java
index ff2bae9..d1cb07a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaWaitingThread.java
@@ -81,6 +81,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return fThread.getModelIdentifier();
}
@@ -88,6 +89,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fThread.getDebugTarget();
}
@@ -95,6 +97,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fThread.getLaunch();
}
@@ -102,6 +105,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if(adapter == IDebugTarget.class) {
@@ -124,6 +128,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return getDebugTarget().canTerminate();
}
@@ -131,6 +136,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getDebugTarget().isTerminated();
}
@@ -138,6 +144,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
getDebugTarget().terminate();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsAdapterFactory.java
index a11b4b9..976a10c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsAdapterFactory.java
@@ -32,6 +32,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
@@ -61,6 +62,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[] {IElementContentProvider.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/NoMonitorInformationElement.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/NoMonitorInformationElement.java
index f87a257..2f65649 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/NoMonitorInformationElement.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/NoMonitorInformationElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,7 +25,8 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
- public String getModelIdentifier() {
+ @Override
+ public String getModelIdentifier() {
return getDebugTarget().getModelIdentifier();
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java
index aae53a4..78c4556 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadMonitorManager.java
@@ -74,6 +74,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i= 0; i < events.length; i++) {
DebugEvent debugEvent= events[i];
@@ -233,6 +234,7 @@
}
class DetectDeadlock implements Runnable {
+ @Override
public void run() {
JavaMonitorThread[] threads= getJavaMonitorThreads();
JavaMonitor[] monitors= getJavaMonitors();
@@ -283,6 +285,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(IJavaDebugUIConstants.PREF_SHOW_MONITOR_THREAD_INFO)) {
fIsEnabled= JDIDebugUIPreferenceInitializer.getBoolean(event);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
index dcd89c7..bd6d856 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -147,12 +147,14 @@
gd.heightHint = 100;
fFilterViewer.getTable().setLayoutData(gd);
fFilterViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
Filter filter = (Filter) event.getElement();
fFilterContentProvider.toggleFilter(filter);
}
});
fFilterViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (selection.isEmpty()) {
@@ -325,6 +327,7 @@
// traverse away to dialog's default button. Without this, hitting
// CR in the text field closes the entire dialog.
text.addListener(SWT.Traverse, new Listener() {
+ @Override
public void handleEvent(Event event) {
event.doit = false;
}
@@ -400,6 +403,7 @@
fNewTableItem = null;
fTableEditor.setEditor(null, null, 0);
fEditorText.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
fEditorText.dispose();
fEditorText = null;
@@ -556,6 +560,7 @@
/**
* @see IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return fFilters.toArray();
}
@@ -563,12 +568,14 @@
/**
* @see IContentProvider#inputChanged(Viewer, Object, Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
/**
* @see IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
index 2204f34..2229e77 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -114,6 +114,7 @@
class CheckHandler implements ICheckStateListener {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
fInstanceViewer.setChecked(event.getElement(), event.getChecked());
}
@@ -129,6 +130,7 @@
/**
* @see ITreeContentProvider#getChildren(Object)
*/
+ @Override
public Object[] getChildren(Object parent) {
if (parent instanceof IJavaBreakpoint) {
try {
@@ -143,6 +145,7 @@
/**
* @see ITreeContentProvider#getParent(Object)
*/
+ @Override
public Object getParent(Object element) {
if (element instanceof IJavaObject) {
return fBreakpoint;
@@ -153,6 +156,7 @@
/**
* @see ITreeContentProvider#hasChildren(Object)
*/
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof IJavaBreakpoint) {
return getChildren(element).length > 0;
@@ -163,6 +167,7 @@
/**
* @see IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
@@ -170,12 +175,14 @@
/**
* @see IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see IContentProvider#inputChanged(Viewer, Object, Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
index bf08fb3..1361494 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
@@ -86,6 +86,7 @@
@Override
public boolean performOk() {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
IJavaBreakpoint breakpoint = getBreakpoint();
boolean delOnCancel = breakpoint.getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null;
@@ -180,18 +181,23 @@
try {
if (getBreakpoint().getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null) {
getShell().addShellListener(new ShellListener() {
- public void shellActivated(ShellEvent e) {
+ @Override
+ public void shellActivated(ShellEvent e) {
Shell shell = (Shell)e.getSource();
shell.setText(NLS.bind(PropertyPageMessages.JavaBreakpointPage_10, new String[]{getName(getBreakpoint())}));
shell.removeShellListener(this);
}
- public void shellClosed(ShellEvent e) {
+ @Override
+ public void shellClosed(ShellEvent e) {
}
- public void shellDeactivated(ShellEvent e) {
+ @Override
+ public void shellDeactivated(ShellEvent e) {
}
- public void shellDeiconified(ShellEvent e) {
+ @Override
+ public void shellDeiconified(ShellEvent e) {
}
- public void shellIconified(ShellEvent e) {
+ @Override
+ public void shellIconified(ShellEvent e) {
}
});
}
@@ -330,6 +336,7 @@
}
fEditor.createControl(parent);
fEditor.addPropertyListener(new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
IStatus status = fEditor.getStatus();
if (status.isOK()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
index 09b530a..80a35ca 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
@@ -141,6 +141,7 @@
}
class CheckHandler implements ICheckStateListener {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
Object element= event.getElement();
if (element instanceof IDebugTarget) {
@@ -285,6 +286,7 @@
/**
* @see ITreeContentProvider#getChildren(Object)
*/
+ @Override
public Object[] getChildren(Object parent) {
if (parent instanceof IDebugTarget) {
IJavaDebugTarget target = ((IDebugTarget)parent).getAdapter(IJavaDebugTarget.class);
@@ -318,6 +320,7 @@
/**
* @see ITreeContentProvider#getParent(Object)
*/
+ @Override
public Object getParent(Object element) {
if (element instanceof IThread) {
return ((IThread)element).getDebugTarget();
@@ -334,6 +337,7 @@
/**
* @see ITreeContentProvider#hasChildren(Object)
*/
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof IStackFrame) {
return false;
@@ -353,6 +357,7 @@
/**
* @see IStructuredContentProvider#getElements(Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
@@ -360,12 +365,14 @@
/**
* @see IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see IContentProvider#inputChanged(Viewer, Object, Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
index 6cf8e1f..fdc20bc 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
@@ -16,46 +16,35 @@
import java.util.StringTokenizer;
import java.util.regex.Pattern;
-import org.eclipse.core.variables.VariablesPlugin;
-
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-import org.eclipse.ui.PartInitException;
-
+import org.eclipse.core.variables.VariablesPlugin;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
-
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.ILaunchGroup;
-
-import org.eclipse.search.ui.text.Match;
-
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jdt.core.search.IJavaSearchScope;
-
import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
import org.eclipse.jdt.ui.search.ElementQuerySpecification;
import org.eclipse.jdt.ui.search.IMatchPresentation;
import org.eclipse.jdt.ui.search.IQueryParticipant;
import org.eclipse.jdt.ui.search.ISearchRequestor;
import org.eclipse.jdt.ui.search.PatternQuerySpecification;
import org.eclipse.jdt.ui.search.QuerySpecification;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.search.ui.text.Match;
+import org.eclipse.ui.PartInitException;
/**
* This class provides a search participant to find class references in the
@@ -75,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.search.IQueryParticipant#estimateTicks(org.eclipse.jdt.ui.search.QuerySpecification)
*/
+ @Override
public int estimateTicks(QuerySpecification query) {
if (isValid(query)) {
return 50;
@@ -85,6 +75,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.search.IQueryParticipant#getUIParticipant()
*/
+ @Override
public synchronized IMatchPresentation getUIParticipant() {
if (uiParticipant == null) {
uiParticipant = new UIParticipant();
@@ -95,6 +86,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.search.IQueryParticipant#search(org.eclipse.jdt.ui.search.ISearchRequestor, org.eclipse.jdt.ui.search.QuerySpecification, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void search(ISearchRequestor requestor, QuerySpecification query, IProgressMonitor monitor) throws CoreException {
if (!isValid(query)) {
return;
@@ -293,6 +285,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.search.IMatchPresentation#createLabelProvider()
*/
+ @Override
public ILabelProvider createLabelProvider() {
return DebugUITools.newDebugModelPresentation();
}
@@ -300,6 +293,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.ui.search.IMatchPresentation#showMatch(org.eclipse.search.ui.text.Match, int, int, boolean)
*/
+ @Override
public void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException {
Object o = match.getElement();
if (o instanceof ILaunchConfiguration) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
index 14a3762..60b6d6d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -58,6 +58,7 @@
/**
* @see IContentAssistProcessor#getErrorMessage()
*/
+ @Override
public String getErrorMessage() {
return fErrorMessage;
}
@@ -72,6 +73,7 @@
/**
* @see IContentAssistProcessor#getContextInformationValidator()
*/
+ @Override
public IContextInformationValidator getContextInformationValidator() {
if (fValidator == null) {
fValidator= new JavaParameterListValidator();
@@ -82,6 +84,7 @@
/**
* @see IContentAssistProcessor#getContextInformationAutoActivationCharacters()
*/
+ @Override
public char[] getContextInformationAutoActivationCharacters() {
return null;
}
@@ -89,6 +92,7 @@
/**
* @see IContentAssistProcessor#computeContextInformation(ITextViewer, int)
*/
+ @Override
public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
return null;
}
@@ -96,6 +100,7 @@
/**
* @see IContentAssistProcessor#computeProposals(ITextViewer, int)
*/
+ @Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int position) {
try {
setErrorMessage(null);
@@ -140,6 +145,7 @@
/**
* @see IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
*/
+ @Override
public char[] getCompletionProposalAutoActivationCharacters() {
return fProposalAutoActivationSet;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
index 503d6bf..73accba 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
@@ -210,6 +210,7 @@
// Make sure that all events in the asynchronous event queue
// are dispatched.
fDisplay.syncExec(new Runnable() {
+ @Override
public void run() {
// do nothing
}
@@ -243,6 +244,7 @@
*/
private IPartListener2 fActivationListener = new IPartListener2() {
+ @Override
public void partActivated(IWorkbenchPartReference partRef) {
if ("org.eclipse.jdt.debug.ui.SnippetEditor".equals(partRef.getId())) { //$NON-NLS-1$
System.setProperty(JDIDebugUIPlugin.getUniqueIdentifier() + ".scrapbookActive", "true"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -251,24 +253,31 @@
}
}
+ @Override
public void partBroughtToTop(IWorkbenchPartReference partRef) {
}
+ @Override
public void partClosed(IWorkbenchPartReference partRef) {
}
+ @Override
public void partDeactivated(IWorkbenchPartReference partRef) {
}
+ @Override
public void partHidden(IWorkbenchPartReference partRef) {
}
+ @Override
public void partInputChanged(IWorkbenchPartReference partRef) {
}
+ @Override
public void partOpened(IWorkbenchPartReference partRef) {
}
+ @Override
public void partVisible(IWorkbenchPartReference partRef) {
}
@@ -465,6 +474,7 @@
protected boolean performIncrementalBuild() {
IRunnableWithProgress r= new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor pm) throws InvocationTargetException {
try {
getJavaProject().getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, pm);
@@ -613,6 +623,7 @@
protected void fireEvalStateChanged() {
Runnable r= new Runnable() {
+ @Override
public void run() {
Shell shell= getShell();
if (fSnippetStateListeners != null && shell != null && !shell.isDisposed()) {
@@ -659,6 +670,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.debug.eval.IEvaluationListener#evaluationComplete(org.eclipse.jdt.debug.eval.IEvaluationResult)
*/
+ @Override
public void evaluationComplete(IEvaluationResult result) {
boolean severeErrors = false;
if (result.hasErrors()) {
@@ -693,6 +705,7 @@
*/
protected void showExpressionView() {
Runnable r = new Runnable() {
+ @Override
public void run() {
IWorkbenchPage page = JDIDebugUIPlugin.getActivePage();
if (page != null) {
@@ -779,6 +792,7 @@
final String message = resultString.toString();
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
getSourceViewer().getDocument().replace(fSnippetEnd, 0, message);
@@ -816,6 +830,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
*/
+ @Override
public synchronized void detailComputed(IValue value, final String result) {
fResult= result;
this.notifyAll();
@@ -831,6 +846,7 @@
}
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
getSourceViewer().getDocument().replace(fSnippetStart, 0, errorString.toString());
@@ -844,7 +860,8 @@
private void showExpression(final JavaInspectExpression expression) {
Runnable r = new Runnable() {
- public void run() {
+ @Override
+ public void run() {
new InspectPopupDialog(getShell(), EvaluateAction.getPopupAnchor(getSourceViewer().getTextWidget()), PopupInspectAction.ACTION_DEFININITION_ID, expression).open();
}
};
@@ -868,6 +885,7 @@
final String message = bos.toString();
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
getSourceViewer().getDocument().replace(fSnippetEnd, 0, message);
@@ -886,6 +904,7 @@
String eName= ref.referenceType().name();
final String message= SnippetMessages.getFormattedString("SnippetEditor.exception", eName); //$NON-NLS-1$
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
getSourceViewer().getDocument().replace(fSnippetEnd, 0, message);
@@ -1025,6 +1044,7 @@
protected void evaluationEnds() {
Runnable r = new Runnable() {
+ @Override
public void run() {
fEvaluating= false;
setTitleImage();
@@ -1058,6 +1078,7 @@
/**
* @see IDebugEventFilter#filterDebugEvents(DebugEvent[])
*/
+ @Override
public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent e = events[i];
@@ -1069,6 +1090,7 @@
if (e.getKind() == DebugEvent.TERMINATE) {
setThread(null);
Runnable r = new Runnable() {
+ @Override
public void run() {
vmTerminated();
}
@@ -1174,6 +1196,7 @@
fLaunchedVMArgs = getVMArgsAttribute();
fLaunchedVM = getVMInstall();
Runnable r = new Runnable() {
+ @Override
public void run() {
ScrapbookLauncher.getDefault().launch(getFile());
}
@@ -1409,6 +1432,7 @@
protected void showAndSelect(final String text, final int offset) {
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
getSourceViewer().getDocument().replace(offset, 0, text);
@@ -1427,6 +1451,7 @@
public Object getAdapter(Class required) {
if (required == IShowInTargetList.class) {
return new IShowInTargetList() {
+ @Override
public String[] getShowInTargetIds() {
return new String[] { JavaUI.ID_PACKAGES, IPageLayout.ID_RES_NAV };
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileCreationWizard.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileCreationWizard.java
index 56291ef..ad3449b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileCreationWizard.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileCreationWizard.java
@@ -64,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
fSelection= selection;
setDefaultPageImageDescriptor(JavaDebugImages.getImageDescriptor(JavaDebugImages.IMG_WIZBAN_NEWSCRAPPAGE));
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileWizardPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileWizardPage.java
index 943bb5d..d65164f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileWizardPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/NewSnippetFileWizardPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,6 +65,7 @@
final IWorkbenchPart focusPart= page.getActivePart();
if (focusPart instanceof ISetSelectionTarget) {
shell.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
ISelection selection= new StructuredSelection(file);
((ISetSelectionTarget) focusPart).selectReveal(selection);
@@ -88,8 +89,9 @@
protected boolean validatePage() {
// check whether file with extension doesn't exist
boolean valid= super.validatePage();
- if (!valid)
+ if (!valid) {
return false;
+ }
IWorkspaceRoot workspaceRoot= ResourcesPlugin.getWorkspace().getRoot();
IPath containerPath= getContainerFullPath();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
index ddb50ac..475a4fa 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -260,6 +260,7 @@
/**
* @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
index 55e0bd2..7d2a57b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
/**
* @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)
*/
+ @Override
public void snippetStateChanged(JavaSnippetEditor editor) {
setEnabled(editor != null && !editor.isEvaluating());
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
index 596d2c8..60b1556 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,6 +108,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return fImportNames.toArray();
}
@@ -115,12 +116,14 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
}
@@ -142,9 +145,11 @@
SnippetMessages.getString("SelectImportsDialog.Choose_a_Type_to_Add_as_an_Import_2"), //$NON-NLS-1$
null);
fAddTypeButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent se) {
addType();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent se) {
}
});
@@ -155,9 +160,11 @@
SnippetMessages.getString("SelectImportsDialog.Choose_a_Package_to_Add_as_an_Import_4"), //$NON-NLS-1$
null);
fAddPackageButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent se) {
addPackage();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent se) {
}
});
@@ -168,9 +175,11 @@
SnippetMessages.getString("SelectImportsDialog.Remove_All_Selected_Imports_6"), //$NON-NLS-1$
null);
fRemoveImportsButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent se) {
removeImports();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent se) {
}
});
@@ -272,6 +281,7 @@
// input just needs to be non-null
fImportsViewer.setInput(this);
fImportsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (selection.isEmpty()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetDocumentSetupParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetDocumentSetupParticipant.java
index 77f99e9..2334c91 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetDocumentSetupParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetDocumentSetupParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/*
* @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
*/
+ @Override
public void setup(IDocument document) {
if (document != null) {
JavaTextTools tools= JDIDebugUIPlugin.getDefault().getJavaTextTools();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
index 32032d4..a881aef 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#generateName(java.lang.String)
*/
+ @Override
public String generateName(String name) {
return null;
}
@@ -61,6 +62,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getMode()
*/
+ @Override
public String getMode() {
return ILaunchManager.DEBUG_MODE;
}
@@ -68,6 +70,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getTabs()
*/
+ @Override
public ILaunchConfigurationTab[] getTabs() {
return new ILaunchConfigurationTab[] {fWorkingDirBlock};
}
@@ -75,6 +78,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getActiveTab()
*/
+ @Override
public ILaunchConfigurationTab getActiveTab() {
return fWorkingDirBlock;
}
@@ -82,12 +86,14 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setName(java.lang.String)
*/
+ @Override
public void setName(String name) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#updateButtons()
*/
+ @Override
public void updateButtons() {
}
@@ -95,6 +101,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#updateMessage()
*/
+ @Override
public void updateMessage() {
setValid(isValid());
setMessage(getMessage());
@@ -104,18 +111,21 @@
/* (non-Javadoc)
* @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
*/
+ @Override
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setActiveTab(org.eclipse.debug.ui.ILaunchConfigurationTab)
*/
+ @Override
public void setActiveTab(ILaunchConfigurationTab tab) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setActiveTab(int)
*/
+ @Override
public void setActiveTab(int index) {
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
index 3843972..3832501 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@
/**
* @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)
*/
+ @Override
public void snippetStateChanged(JavaSnippetEditor editor) {
setEnabled(editor != null && editor.isVMLaunched());
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaDebugShowInAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaDebugShowInAdapterFactory.java
index 08d6a75..a7ccf91 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaDebugShowInAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaDebugShowInAdapterFactory.java
@@ -24,6 +24,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType == IShowInSource.class) {
@@ -43,6 +44,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IShowInSource.class, IShowInTargetList.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
index f387e8c..ac96631 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@
/**
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return fProjects.toArray();
}
@@ -66,12 +67,14 @@
/**
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/**
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java
index 89f0824..e090149 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInSourceAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -73,6 +73,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.part.IShowInSource#getShowInContext()
*/
+ @Override
public ShowInContext getShowInContext() {
if (fLazyContext == null) {
fLazyContext = new LazyShowInContext();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInTargetListAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInTargetListAdapter.java
index 64c7d43..2f2cdf0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInTargetListAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/StackFrameShowInTargetListAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds()
*/
+ @Override
public String[] getShowInTargetIds() {
return new String[]{JavaUI.ID_PACKAGES};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapter.java
index 3450cdb..eca73d8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapter.java
@@ -37,12 +37,14 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object o) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
if (object instanceof PackageFragmentRootSourceContainer) {
PackageFragmentRootSourceContainer container = (PackageFragmentRootSourceContainer) object;
@@ -82,6 +84,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
*/
+ @Override
public String getLabel(Object o) {
if (o instanceof PackageFragmentRootSourceContainer) {
PackageFragmentRootSourceContainer container = (PackageFragmentRootSourceContainer) o;
@@ -109,6 +112,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object o) {
return null;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapterFactory.java
index 44a5f40..87873d8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/WorkbenchAdapterFactory.java
@@ -21,6 +21,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType.equals(IWorkbenchAdapter.class)) {
@@ -31,6 +32,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{IWorkbenchAdapter.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
index 7f3625a..c6ad4ef 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.IModelProxyFactory#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.IPresentationContext)
*/
+ @Override
public IModelProxy createModelProxy(Object element, IPresentationContext context) {
if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
if (element instanceof IJavaDebugTarget) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadEventHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadEventHandler.java
index 69f30a7..b487ca2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadEventHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadEventHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,6 +72,7 @@
if (control instanceof Tree) {
fTree = (Tree) control;
fTree.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
fTree.addTreeListener(JavaThreadEventHandler.this);
}
@@ -133,6 +134,7 @@
return super.addPathToThread(delta, thread);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(IJavaDebugUIConstants.PREF_SHOW_MONITOR_THREAD_INFO)) {
fDisplayMonitors= JDIDebugUIPreferenceInitializer.getBoolean(event);
@@ -245,6 +247,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.TreeListener#treeCollapsed(org.eclipse.swt.events.TreeEvent)
*/
+ @Override
public void treeCollapsed(TreeEvent e) {
// when the user collapses a thread, remove it from the 'next thread to select queue'
Widget widget = e.item;
@@ -260,6 +263,7 @@
/* (non-Javadoc)
* @see org.eclipse.swt.events.TreeListener#treeExpanded(org.eclipse.swt.events.TreeEvent)
*/
+ @Override
public void treeExpanded(TreeEvent e) {
// when the expands a thread, add it back to the 'next thread to select queue'
Widget widget = e.item;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/TargetAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/TargetAdapterFactory.java
index b2c9903..15a0564 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/TargetAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/TargetAdapterFactory.java
@@ -28,6 +28,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType.equals(IModelProxyFactory.class)) {
@@ -46,6 +47,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{
IModelProxyFactory.class,
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/ThreadGroupAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/ThreadGroupAdapterFactory.java
index b17e45e..b847729 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/ThreadGroupAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/ThreadGroupAdapterFactory.java
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
@@ -46,6 +47,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{
IElementContentProvider.class,
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/ColumnPresentationAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/ColumnPresentationAdapterFactory.java
index ac9d7ef..c63166f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/ColumnPresentationAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/ColumnPresentationAdapterFactory.java
@@ -29,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adaptableObject instanceof IJavaVariable) {
@@ -47,6 +48,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[]{
IColumnPresentationFactory.class,
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java
index 6d8311e..2b88a4c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java
@@ -47,6 +47,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (IElementLabelProvider.class.equals(adapterType)) {
@@ -90,6 +91,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/
+ @Override
public Class<?>[] getAdapterList() {
return new Class[] {IElementLabelProvider.class, IElementContentProvider.class, IWatchExpressionFactoryAdapter.class, IElementMementoProvider.class};
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java
index c5a0c53..c77a81f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java
@@ -26,6 +26,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentationFactoryAdapter#createColumnPresentation(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, java.lang.Object)
*/
+ @Override
public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) {
if (isApplicable(context, element)) {
return new JavaVariableColumnPresentation();
@@ -36,6 +37,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentationFactoryAdapter#getColumnPresentationId(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, java.lang.Object)
*/
+ @Override
public String getColumnPresentationId(IPresentationContext context, Object element) {
if (isApplicable(context, element)) {
return JavaVariableColumnPresentation.JAVA_VARIABLE_COLUMN_PRESENTATION;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java
index 5a34a11..4216025 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2012 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -251,6 +251,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().endsWith(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES)) {
fQualifiedNameSettings.clear();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/VariableOptionsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/VariableOptionsAction.java
index b403383..bb722ec 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/VariableOptionsAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/VariableOptionsAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,13 +24,15 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/
- public void init(IViewPart view) {
+ @Override
+ public void init(IViewPart view) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
- public void run(IAction action) {
+ @Override
+ public void run(IAction action) {
SWTFactory.showPreferencePage("org.eclipse.jdt.debug.ui.JavaDetailFormattersPreferencePage", //$NON-NLS-1$
new String[] {"org.eclipse.jdt.debug.ui.JavaDetailFormattersPreferencePage", //$NON-NLS-1$
"org.eclipse.jdt.debug.ui.JavaLogicalStructuresPreferencePage", //$NON-NLS-1$
@@ -41,6 +43,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
- public void selectionChanged(IAction action, ISelection selection) {
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
}
}
diff --git a/org.eclipse.jdt.debug/.classpath b/org.eclipse.jdt.debug/.classpath
index 784f8bd..cf37984 100644
--- a/org.eclipse.jdt.debug/.classpath
+++ b/org.eclipse.jdt.debug/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="model"/>
<classpathentry kind="src" path="jdi"/>
<classpathentry kind="src" path="eval"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jdt.debug/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug/.settings/org.eclipse.jdt.core.prefs
index 53a0c9c..1796890 100644
--- a/org.eclipse.jdt.debug/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.debug/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -125,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
index 504dc72..0cd0624 100644
--- a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug; singleton:=true
-Bundle-Version: 3.8.200.qualifier
+Bundle-Version: 3.9.0.qualifier
Bundle-ClassPath: jdi.jar,
jdimodel.jar,
tools.jar
@@ -39,5 +39,5 @@
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Import-Package: com.ibm.icu.text
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Eclipse-BundleShape: dir
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java
index 30e5b25..42c06e2 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/EvaluationResult.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,6 +78,7 @@
/**
* @see IEvaluationResult#getValue()
*/
+ @Override
public IJavaValue getValue() {
return fValue;
}
@@ -95,6 +96,7 @@
/**
* @see IEvaluationResult#hasProblems()
*/
+ @Override
public boolean hasErrors() {
return getErrors().length > 0 || getException() != null;
}
@@ -103,6 +105,7 @@
* @see IEvaluationResult#getProblems()
* @deprecated
*/
+ @Override
@Deprecated
public Message[] getErrors() {
Message[] messages = new Message[fErrors.size()];
@@ -116,6 +119,7 @@
/**
* @see org.eclipse.jdt.debug.eval.IEvaluationResult#getErrorMessages()
*/
+ @Override
public String[] getErrorMessages() {
return fErrors.toArray(new String[fErrors.size()]);
}
@@ -123,6 +127,7 @@
/**
* @see IEvaluationResult#getSnippet()
*/
+ @Override
public String getSnippet() {
return fSnippet;
}
@@ -140,6 +145,7 @@
/**
* @see IEvaluationResult#getException()
*/
+ @Override
public DebugException getException() {
return fException;
}
@@ -158,6 +164,7 @@
/**
* @see IEvaluationResult#getThread()
*/
+ @Override
public IJavaThread getThread() {
return fThread;
}
@@ -175,6 +182,7 @@
/**
* @see IEvaluationResult#getEvaluationEngine()
*/
+ @Override
public IEvaluationEngine getEvaluationEngine() {
return fEngine;
}
@@ -201,6 +209,7 @@
*
* @see org.eclipse.jdt.debug.eval.IEvaluationResult#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return fTerminated;
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
index d6970b4..1aaee46 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -198,6 +198,7 @@
/**
* @see ICodeSnippetRequestor#acceptClassFiles(byte[][], String[][], String)
*/
+ @Override
public boolean acceptClassFiles(byte[][] classFileBytes,
String[][] classFileCompoundNames, String codeSnippetClassName) {
try {
@@ -218,6 +219,7 @@
return true;
}
+ @Override
public void run(IJavaThread thread, IProgressMonitor monitor) {
IJavaObject codeSnippetInstance = null;
try {
@@ -353,6 +355,7 @@
/**
* @see ICodeSnippetRequestor#acceptProblem(IMarker, String, int)
*/
+ @Override
public void acceptProblem(IMarker problemMarker, String fragmentSource,
int fragmentKind) {
if (problemMarker.getAttribute(IMarker.SEVERITY, -1) != IMarker.SEVERITY_ERROR) {
@@ -364,6 +367,7 @@
/**
* @see IEvaluationEngine#getDebugTarget()
*/
+ @Override
public IJavaDebugTarget getDebugTarget() {
return fDebugTarget;
}
@@ -381,6 +385,7 @@
/**
* @see IEvaluationEngine#getJavaProject()
*/
+ @Override
public IJavaProject getJavaProject() {
return fJavaProject;
}
@@ -418,6 +423,7 @@
* @see IClassFileEvaluationEngine#evaluate(String, IJavaThread,
* IEvaluationListener)
*/
+ @Override
public void evaluate(String snippet, IJavaThread thread,
IEvaluationListener listener, boolean hitBreakpoints)
throws DebugException {
@@ -437,6 +443,7 @@
// do the evaluation in a different thread
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
LocalEvaluationEngine.this
@@ -467,6 +474,7 @@
* @see IEvaluationEngine#evaluate(String, IJavaStackFrame,
* IEvaluationListener, int)
*/
+ @Override
public void evaluate(String snippet, IJavaStackFrame frame,
IEvaluationListener listener, int evaluationDetail,
boolean hitBreakpoints) throws DebugException {
@@ -514,6 +522,7 @@
// do the evaluation in a different thread
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
LocalEvaluationEngine.this
@@ -582,6 +591,7 @@
* @see IEvaluationEngine#evaluate(String, IJavaObject, IJavaThread,
* IEvaluationListener, int)
*/
+ @Override
public void evaluate(String snippet, IJavaObject thisContext,
IJavaThread thread, IEvaluationListener listener,
int evaluationDetail, boolean hitBreakpoints) throws DebugException {
@@ -609,6 +619,7 @@
// do the evaluation in a different thread
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
LocalEvaluationEngine.this
@@ -703,6 +714,7 @@
*
* @see IEvaluationEngine#dispose()
*/
+ @Override
public void dispose() {
fDisposed = true;
ENGINE_COUNT--;
@@ -874,9 +886,9 @@
if (!classFile.exists()) {
classFile.createNewFile();
}
- FileOutputStream stream = new FileOutputStream(classFile);
- stream.write(classFiles[i]);
- stream.close();
+ try (FileOutputStream stream = new FileOutputStream(classFile)) {
+ stream.write(classFiles[i]);
+ }
LocalEvaluationEngine.this.addSnippetFile(classFile);
} catch (IOException e) {
throw new DebugException(
@@ -1302,6 +1314,7 @@
/**
* @see IClassFileEvaluationEngine#getImports()
*/
+ @Override
public String[] getImports() {
return getEvaluationContext().getImports();
}
@@ -1309,6 +1322,7 @@
/**
* @see IClassFileEvaluationEngine#setImports(String[])
*/
+ @Override
public void setImports(String[] imports) {
getEvaluationContext().setImports(imports);
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java
index 879510d..db03e1a 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java
@@ -88,6 +88,7 @@
* org.eclipse.debug.core.IDebugEventFilter#filterDebugEvents(org.eclipse
* .debug.core.DebugEvent[])
*/
+ @Override
public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
if (events.length == 1) {
DebugEvent event = events[0];
@@ -126,6 +127,7 @@
* org.eclipse.jdt.debug.core.IJavaStackFrame,
* org.eclipse.jdt.debug.eval.IEvaluationListener, int, boolean)
*/
+ @Override
public void evaluate(String snippet, IJavaStackFrame frame,
IEvaluationListener listener, int evaluationDetail,
boolean hitBreakpoints) throws DebugException {
@@ -144,6 +146,7 @@
* org.eclipse.jdt.debug.core.IJavaThread,
* org.eclipse.jdt.debug.eval.IEvaluationListener, int, boolean)
*/
+ @Override
public void evaluate(String snippet, IJavaObject thisContext,
IJavaThread thread, IEvaluationListener listener,
int evaluationDetail, boolean hitBreakpoints) throws DebugException {
@@ -190,6 +193,7 @@
* org.eclipse.jdt.debug.core.IJavaStackFrame,
* org.eclipse.jdt.debug.eval.IEvaluationListener, int, boolean)
*/
+ @Override
public void evaluateExpression(ICompiledExpression expression,
IJavaStackFrame frame, IEvaluationListener listener,
int evaluationDetail, boolean hitBreakpoints) throws DebugException {
@@ -209,6 +213,7 @@
* org.eclipse.jdt.debug.core.IJavaThread,
* org.eclipse.jdt.debug.eval.IEvaluationListener, int, boolean)
*/
+ @Override
public void evaluateExpression(ICompiledExpression expression,
IJavaObject thisContext, IJavaThread thread,
IEvaluationListener listener, int evaluationDetail,
@@ -267,6 +272,7 @@
* org.eclipse.jdt.debug.eval.IAstEvaluationEngine#getCompiledExpression
* (java.lang.String, org.eclipse.jdt.debug.core.IJavaStackFrame)
*/
+ @Override
public ICompiledExpression getCompiledExpression(String snippet,
IJavaStackFrame frame) {
IJavaProject javaProject = getJavaProject();
@@ -460,6 +466,7 @@
* org.eclipse.jdt.debug.eval.IAstEvaluationEngine#getCompiledExpression
* (java.lang.String, org.eclipse.jdt.debug.core.IJavaObject)
*/
+ @Override
public ICompiledExpression getCompiledExpression(String snippet,
IJavaObject thisContext) {
try {
@@ -484,6 +491,7 @@
* org.eclipse.jdt.debug.eval.IAstEvaluationEngine#getCompiledExpression
* (java.lang.String, org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public ICompiledExpression getCompiledExpression(String snippet,
IJavaReferenceType type) {
if (type instanceof IJavaArrayType) {
@@ -578,6 +586,7 @@
*
* @see org.eclipse.jdt.debug.eval.IEvaluationEngine#getJavaProject()
*/
+ @Override
public IJavaProject getJavaProject() {
return fProject;
}
@@ -587,6 +596,7 @@
*
* @see org.eclipse.jdt.debug.eval.IEvaluationEngine#getDebugTarget()
*/
+ @Override
public IJavaDebugTarget getDebugTarget() {
return fDebugTarget;
}
@@ -596,6 +606,7 @@
*
* @see org.eclipse.jdt.debug.eval.IEvaluationEngine#dispose()
*/
+ @Override
public void dispose() {
}
@@ -624,6 +635,7 @@
fHitBreakpoints = hitBreakpoints;
}
+ @Override
public void run() {
if (JDIDebugOptions.DEBUG_AST_EVAL) {
StringBuffer buf = new StringBuffer();
@@ -682,6 +694,7 @@
CoreException fException;
boolean fTerminated = false;
+ @Override
public void run(IJavaThread jt, IProgressMonitor pm) {
EventFilter filter = new EventFilter();
try {
@@ -714,15 +727,18 @@
}
}
+ @Override
public void terminate() {
fTerminated = true;
interpreter.stop();
}
+ @Override
public boolean canTerminate() {
return true;
}
+ @Override
public boolean isTerminated() {
return false;
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/AbstractRuntimeContext.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/AbstractRuntimeContext.java
index fcec4ec..eb35df1 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/AbstractRuntimeContext.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/AbstractRuntimeContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -167,6 +167,7 @@
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#classForName
* (java.lang.String)
*/
+ @Override
public IJavaClassObject classForName(String name) throws CoreException {
return classForName(name, getClassLoaderObject());
}
@@ -178,6 +179,7 @@
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#getProject
* ()
*/
+ @Override
public IJavaProject getProject() {
return fProject;
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ArrayRuntimeContext.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ArrayRuntimeContext.java
index ca764e7..c593886 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ArrayRuntimeContext.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ArrayRuntimeContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -55,6 +55,7 @@
* @see
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#getVM()
*/
+ @Override
public IJavaDebugTarget getVM() {
return (IJavaDebugTarget) fArray.getDebugTarget();
}
@@ -65,6 +66,7 @@
* @see
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#getThis()
*/
+ @Override
public IJavaObject getThis() throws CoreException {
return null;
}
@@ -75,6 +77,7 @@
* @see org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#
* getReceivingType()
*/
+ @Override
public IJavaReferenceType getReceivingType() throws CoreException {
if (fReceivingType == null) {
IJavaType[] javaTypes = getVM().getJavaTypes("java.lang.Object"); //$NON-NLS-1$
@@ -98,6 +101,7 @@
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#getLocals
* ()
*/
+ @Override
public IJavaVariable[] getLocals() throws CoreException {
return new IJavaVariable[] { fLocalArray };
}
@@ -109,6 +113,7 @@
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#getThread
* ()
*/
+ @Override
public IJavaThread getThread() {
return fThread;
}
@@ -120,6 +125,7 @@
* org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext#isConstructor
* ()
*/
+ @Override
public boolean isConstructor() throws CoreException {
return false;
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java
index 789ea0d..e306c23 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/InterpreterVariable.java
@@ -49,6 +49,7 @@
/**
* @see org.eclipse.debug.core.model.IVariable#getValue()
*/
+ @Override
public IValue getValue() {
return fValue;
}
@@ -56,6 +57,7 @@
/**
* @see org.eclipse.debug.core.model.IVariable#getName()
*/
+ @Override
public String getName() {
return fName;
}
@@ -63,6 +65,7 @@
/**
* @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
return fReferenceType.getName();
}
@@ -70,6 +73,7 @@
/**
* @see org.eclipse.debug.core.model.IVariable#hasValueChanged()
*/
+ @Override
public boolean hasValueChanged() {
return false;
}
@@ -77,6 +81,7 @@
/**
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -84,6 +89,7 @@
/**
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fDebugTarget;
}
@@ -91,6 +97,7 @@
/**
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fDebugTarget.getLaunch();
}
@@ -98,6 +105,7 @@
/**
* @see org.eclipse.debug.core.model.IValueModification#setValue(String)
*/
+ @Override
public void setValue(String expression) throws DebugException {
throw new DebugException(
new Status(
@@ -111,6 +119,7 @@
/**
* @see org.eclipse.debug.core.model.IValueModification#setValue(IValue)
*/
+ @Override
public void setValue(IValue value) {
fValue = value;
}
@@ -118,6 +127,7 @@
/**
* @see org.eclipse.debug.core.model.IValueModification#supportsValueModification()
*/
+ @Override
public boolean supportsValueModification() {
return false;
}
@@ -125,6 +135,7 @@
/**
* @see org.eclipse.debug.core.model.IValueModification#verifyValue(IValue)
*/
+ @Override
public boolean verifyValue(IValue value) throws DebugException {
throw new DebugException(
new Status(
@@ -138,6 +149,7 @@
/**
* @see org.eclipse.debug.core.model.IValueModification#verifyValue(String)
*/
+ @Override
public boolean verifyValue(String expression) throws DebugException {
throw new DebugException(
new Status(
@@ -151,6 +163,7 @@
/**
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return null;
}
@@ -158,6 +171,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaVariable#getJavaType()
*/
+ @Override
public IJavaType getJavaType() {
return fReferenceType;
}
@@ -165,6 +179,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return fReferenceType.getSignature();
}
@@ -172,6 +187,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isFinal()
*/
+ @Override
public boolean isFinal() {
return false;
}
@@ -179,6 +195,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPackagePrivate()
*/
+ @Override
public boolean isPackagePrivate() {
return false;
}
@@ -186,6 +203,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPrivate()
*/
+ @Override
public boolean isPrivate() {
return false;
}
@@ -193,6 +211,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isProtected()
*/
+ @Override
public boolean isProtected() {
return false;
}
@@ -200,6 +219,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPublic()
*/
+ @Override
public boolean isPublic() {
return true;
}
@@ -207,6 +227,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isStatic()
*/
+ @Override
public boolean isStatic() {
return false;
}
@@ -214,6 +235,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isSynthetic()
*/
+ @Override
public boolean isSynthetic() {
return true;
}
@@ -221,6 +243,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaVariable#isLocal()
*/
+ @Override
public boolean isLocal() {
return false;
}
@@ -230,6 +253,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return getSignature();
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java
index 00534c0..7a58bfc 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/JavaObjectRuntimeContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
/**
* @see IRuntimeContext#getVM()
*/
+ @Override
public IJavaDebugTarget getVM() {
return (IJavaDebugTarget) fThisObject.getDebugTarget();
}
@@ -57,6 +58,7 @@
/**
* @see IRuntimeContext#getThis()
*/
+ @Override
public IJavaObject getThis() {
return fThisObject;
}
@@ -64,6 +66,7 @@
/**
* @see IRuntimeContext#getReceivingType()
*/
+ @Override
public IJavaReferenceType getReceivingType() throws CoreException {
return (IJavaReferenceType) getThis().getJavaType();
}
@@ -71,6 +74,7 @@
/**
* @see IRuntimeContext#getLocals()
*/
+ @Override
public IJavaVariable[] getLocals() {
return new IJavaVariable[0];
}
@@ -78,6 +82,7 @@
/**
* @see IRuntimeContext#getThread()
*/
+ @Override
public IJavaThread getThread() {
return fThread;
}
@@ -85,6 +90,7 @@
/**
* @see IRuntimeContext#isConstructor()
*/
+ @Override
public boolean isConstructor() {
return false;
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/RuntimeContext.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/RuntimeContext.java
index 807a9aa..cfacf37 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/RuntimeContext.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/RuntimeContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@
/**
* @see IRuntimeContext#getVM()
*/
+ @Override
public IJavaDebugTarget getVM() {
return (IJavaDebugTarget) getFrame().getDebugTarget();
}
@@ -50,6 +51,7 @@
/**
* @see IRuntimeContext#getThis()
*/
+ @Override
public IJavaObject getThis() throws CoreException {
return getFrame().getThis();
}
@@ -57,6 +59,7 @@
/**
* @see IRuntimeContext#getReceivingType()
*/
+ @Override
public IJavaReferenceType getReceivingType() throws CoreException {
IJavaObject rec = getThis();
if (rec != null) {
@@ -68,6 +71,7 @@
/**
* @see IRuntimeContext#getLocals()
*/
+ @Override
public IJavaVariable[] getLocals() throws CoreException {
return getFrame().getLocalVariables();
}
@@ -95,6 +99,7 @@
/**
* @see IRuntimeContext#getThread()
*/
+ @Override
public IJavaThread getThread() {
return (IJavaThread) getFrame().getThread();
}
@@ -102,6 +107,7 @@
/**
* @see IRuntimeContext#isConstructor()
*/
+ @Override
public boolean isConstructor() throws CoreException {
return getFrame().isConstructor();
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
index b86f289..ac64031 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1055,6 +1055,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.core.dom.ASTVisitor#endVisit(org.eclipse.jdt.core.dom.MethodDeclaration)
*/
+ @Override
public void endVisit(MethodDeclaration node) {
fTypeParameterStack.pop();
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java
index 21847d9..c4fd3c0 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@
/**
* @see ICompiledExpression#getSnippet()
*/
+ @Override
public String getSnippet() {
return fSnippet;
}
@@ -61,6 +62,7 @@
/**
* @see ICompiledExpression#hasErrors()
*/
+ @Override
public boolean hasErrors() {
return !fErrors.isEmpty();
}
@@ -69,6 +71,7 @@
* @see ICompiledExpression#getErrors()
* @deprecated
*/
+ @Override
@Deprecated
public Message[] getErrors() {
Message[] messages = new Message[fErrors.size()];
@@ -82,6 +85,7 @@
/**
* @see org.eclipse.jdt.debug.eval.ICompiledExpression#getErrorMessages()
*/
+ @Override
public String[] getErrorMessages() {
return fErrors.toArray(new String[fErrors.size()]);
}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ThrowInstruction.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ThrowInstruction.java
index c6d7505..f45e2ae 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ThrowInstruction.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ThrowInstruction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@
final IJavaThread javaThread = getContext().getThread();
javaThread.stop(exception);
javaThread.queueRunnable(new Runnable() {
+ @Override
public void run() {
try {
javaThread.resume();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/BooleanValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/BooleanValue.java
index 1f93c11..a0224a8 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/BooleanValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/BooleanValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/BooleanValue.html
*/
public interface BooleanValue extends PrimitiveValue {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public boolean value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ByteValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ByteValue.java
index 07008be..2bc615a 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ByteValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ByteValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/ByteValue.html
*/
public interface ByteValue extends PrimitiveValue, Comparable<ByteValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public byte value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/CharValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/CharValue.java
index 942ae8b..347756d 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/CharValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/CharValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/CharValue.html
*/
public interface CharValue extends PrimitiveValue, Comparable<CharValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public char value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/DoubleValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/DoubleValue.java
index 83da83e..245974b 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/DoubleValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/DoubleValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/DoubleValue.html
*/
public interface DoubleValue extends PrimitiveValue, Comparable<DoubleValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public double value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Field.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Field.java
index b5c1e61..e0c0a82 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Field.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Field.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/Field.html
*/
public interface Field extends TypeComponent, Comparable<Field> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public boolean isEnumConstant();
public boolean isTransient();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/FloatValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/FloatValue.java
index 1b9aec4..e57a786 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/FloatValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/FloatValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/FloatValue.html
*/
public interface FloatValue extends PrimitiveValue, Comparable<FloatValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public float value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/IntegerValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/IntegerValue.java
index 81103fa..3785fc5 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/IntegerValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/IntegerValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/IntegerValue.html
*/
public interface IntegerValue extends PrimitiveValue, Comparable<IntegerValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public int value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LocalVariable.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LocalVariable.java
index a79bd61..f4d062e 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LocalVariable.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LocalVariable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,10 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/LocalVariable.html
*/
public interface LocalVariable extends Mirror, Comparable<LocalVariable> {
+ @Override
public boolean equals(Object arg1);
public String genericSignature();
+ @Override
public int hashCode();
public boolean isArgument();
public boolean isVisible(StackFrame arg1);
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Location.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Location.java
index 532ea94..4bc3aba 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Location.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Location.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,7 +15,9 @@
public interface Location extends Mirror, Comparable<Locatable> {
public long codeIndex();
public ReferenceType declaringType();
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public int lineNumber();
public int lineNumber(String stratum);
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LongValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LongValue.java
index 690e4ff..8e2a93f 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LongValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/LongValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/LongValue.html
*/
public interface LongValue extends PrimitiveValue, Comparable<LongValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public long value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Method.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Method.java
index ffecaf1..a880703 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Method.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Method.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,9 @@
public List<String> argumentTypeNames();
public List<Type> argumentTypes() throws ClassNotLoadedException;
public byte[] bytecodes();
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public boolean isAbstract();
public boolean isBridge();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Mirror.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Mirror.java
index f5f85f3..2ea3f6a 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Mirror.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/Mirror.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/Mirror.html
*/
public interface Mirror {
+ @Override
public String toString();
public VirtualMachine virtualMachine();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ObjectReference.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ObjectReference.java
index a13010a..ba6d656 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ObjectReference.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ObjectReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,9 +21,11 @@
public void disableCollection();
public void enableCollection();
public int entryCount() throws IncompatibleThreadStateException;
+ @Override
public boolean equals(Object arg1);
public Value getValue(Field arg1);
public Map<Field, Value> getValues(List<? extends Field> arg1);
+ @Override
public int hashCode();
public Value invokeMethod(ThreadReference arg1, Method arg2, List<? extends Value> arg3, int arg4) throws InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException, InvocationException;
public boolean isCollected();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ReferenceType.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ReferenceType.java
index e9a1a5d..12c7de4 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ReferenceType.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ReferenceType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
public ClassLoaderReference classLoader();
public ClassObjectReference classObject();
public String defaultStratum();
+ @Override
public boolean equals(Object arg1);
public boolean failedToInitialize();
public Field fieldByName(String arg1);
@@ -31,6 +32,7 @@
public String genericSignature();
public Value getValue(Field arg1);
public Map<Field, Value> getValues(List<? extends Field> arg1);
+ @Override
public int hashCode();
public boolean isAbstract();
public boolean isFinal();
@@ -43,6 +45,7 @@
public List<Method> methods();
public List<Method> methodsByName(String arg1);
public List<Method> methodsByName(String arg1, String arg2);
+ @Override
public String name();
public List<ReferenceType> nestedTypes();
public String sourceDebugExtension() throws AbsentInformationException;
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ShortValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ShortValue.java
index 0ae6ddd..002c71e 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ShortValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/ShortValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,9 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/ShortValue.html
*/
public interface ShortValue extends PrimitiveValue, Comparable<ShortValue> {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
public short value();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/StackFrame.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/StackFrame.java
index c81ce94..43bb212 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/StackFrame.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/StackFrame.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
public interface StackFrame extends Mirror, Locatable {
public Value getValue(LocalVariable arg1);
public Map<LocalVariable, Value> getValues(List<? extends LocalVariable> arg1);
+ @Override
public Location location();
public void setValue(LocalVariable arg1, Value arg2) throws InvalidTypeException, ClassNotLoadedException;
public ObjectReference thisObject();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/VoidValue.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/VoidValue.java
index aca2964..00a9740 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/VoidValue.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/VoidValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,8 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/VoidValue.html
*/
public interface VoidValue extends Value {
+ @Override
public boolean equals(Object arg1);
+ @Override
public int hashCode();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/connect/Connector.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/connect/Connector.java
index 690369d..414353e 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/connect/Connector.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/connect/Connector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/connect/Connector.StringArgument.html
*/
public interface StringArgument extends Connector.Argument {
+ @Override
public boolean isValid(String arg1);
}
/**
@@ -45,6 +46,7 @@
public interface IntegerArgument extends Connector.Argument {
public int intValue();
public boolean isValid(int arg1);
+ @Override
public boolean isValid(String arg1);
public int max();
public int min();
@@ -56,6 +58,7 @@
*/
public interface BooleanArgument extends Connector.Argument {
public boolean booleanValue();
+ @Override
public boolean isValid(String arg1);
public void setValue(boolean arg1);
public String stringValueOf(boolean arg1);
@@ -65,6 +68,7 @@
*/
public interface SelectedArgument extends Connector.Argument {
public List<String> choices();
+ @Override
public boolean isValid(String arg1);
}
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnterEvent.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnterEvent.java
index 39a57d3..b40453a 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnterEvent.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnterEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/event/MonitorContendedEnterEvent.html
*/
public interface MonitorContendedEnterEvent extends LocatableEvent {
+ @Override
public ThreadReference thread();
public ObjectReference monitor();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnteredEvent.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnteredEvent.java
index e8f3ae5..6d08541 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnteredEvent.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorContendedEnteredEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/event/MonitorContendedEnteredEvent.html
*/
public interface MonitorContendedEnteredEvent extends LocatableEvent {
+ @Override
public ThreadReference thread();
public ObjectReference monitor();
}
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitEvent.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitEvent.java
index 6541e79..abbac25 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitEvent.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/event/MonitorWaitEvent.html
*/
public interface MonitorWaitEvent extends LocatableEvent {
+ @Override
public ThreadReference thread();
public ObjectReference monitor();
public long timeout();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitedEvent.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitedEvent.java
index 73573cf..d19decf 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitedEvent.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/event/MonitorWaitedEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
* See http://docs.oracle.com/javase/6/docs/jdk/api/jpda/jdi/com/sun/jdi/event/MonitorWaitedEvent.html
*/
public interface MonitorWaitedEvent extends LocatableEvent {
+ @Override
public ThreadReference thread();
public ObjectReference monitor();
public boolean timedout();
diff --git a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/request/BreakpointRequest.java b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/request/BreakpointRequest.java
index 59807e6..80261d7 100644
--- a/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/request/BreakpointRequest.java
+++ b/org.eclipse.jdt.debug/jdi interfaces/com/sun/jdi/request/BreakpointRequest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,5 +20,6 @@
public interface BreakpointRequest extends EventRequest, Locatable {
public void addThreadFilter(ThreadReference arg1);
public void addInstanceFilter(ObjectReference instance);
+ @Override
public Location location();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/hcr/ReenterStepRequest.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/hcr/ReenterStepRequest.java
index d865f77..c17b7c4 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/hcr/ReenterStepRequest.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/hcr/ReenterStepRequest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@
* @param classPattern
* the pattern String to filter against.
*/
+ @Override
public void addClassExclusionFilter(String classPattern);
/**
@@ -56,6 +57,7 @@
* @param clazz
* the class to filter on.
*/
+ @Override
public void addClassFilter(ReferenceType clazz);
/**
@@ -66,10 +68,12 @@
* @param classPattern
* the pattern String to filter for.
*/
+ @Override
public void addClassFilter(String classPattern);
/**
* @return the thread on which the step event is being requested.
*/
+ @Override
public ThreadReference thread();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/AccessibleImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/AccessibleImpl.java
index 0213457..c4e3464 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/AccessibleImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/AccessibleImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -85,6 +85,7 @@
/**
* @return Returns true if object is package private.
*/
+ @Override
public boolean isPackagePrivate() {
return !(isPrivate() || isPublic() || isProtected());
}
@@ -92,6 +93,7 @@
/**
* @return Returns true if object is private.
*/
+ @Override
public boolean isPrivate() {
return (modifiers() & MODIFIER_ACC_PRIVATE) != 0;
}
@@ -99,6 +101,7 @@
/**
* @return Returns true if object is public.
*/
+ @Override
public boolean isPublic() {
return (modifiers() & MODIFIER_ACC_PUBLIC) != 0;
}
@@ -106,6 +109,7 @@
/**
* @return Returns true if object is protected.
*/
+ @Override
public boolean isProtected() {
return (modifiers() & MODIFIER_ACC_PROTECTED) != 0;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java
index 69666b8..81782f4 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,6 +68,7 @@
* @throws IndexOutOfBoundsException if the index is outside the bounds of the array
* @returns Returns an array component value.
*/
+ @Override
public Value getValue(int index) throws IndexOutOfBoundsException {
return getValues(index, 1).get(0);
}
@@ -75,6 +76,7 @@
/**
* @return all of the components in this array.
*/
+ @Override
public List<Value> getValues() {
return getValues(0, -1);
}
@@ -88,6 +90,7 @@
* @throws IndexOutOfBoundsException if the index is outside the bounds of the array
* @returns Returns a range of array components.
*/
+ @Override
public List<Value> getValues(int firstIndex, int length)
throws IndexOutOfBoundsException {
@@ -219,6 +222,7 @@
/**
* @return Returns the number of components in this array.
*/
+ @Override
public int length() {
if (fLength == -1) {
initJdwpRequest();
@@ -253,6 +257,7 @@
* not loaded or has been GC'd
* @see #setValues(int, List, int, int)
*/
+ @Override
public void setValue(int index, Value value) throws InvalidTypeException,
ClassNotLoadedException {
ArrayList<Value> list = new ArrayList<Value>(1);
@@ -273,6 +278,7 @@
* not loaded or has been GC'd
* @see #setValues(int, List, int, int)
*/
+ @Override
public void setValues(List<? extends Value> values) throws InvalidTypeException,
ClassNotLoadedException {
setValues(0, values, 0, -1);
@@ -297,6 +303,7 @@
* thrown if the class type for the {@link ArrayReference} is
* not loaded or has been GC'd
*/
+ @Override
public void setValues(int index, List<? extends Value> values, int srcIndex, int length)
throws InvalidTypeException, ClassNotLoadedException {
if (values == null || values.size() == 0) {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayTypeImpl.java
index 92a183d..fb1f33f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayTypeImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -90,6 +90,7 @@
/**
* @return Returns the JNI signature of the components of this array class.
*/
+ @Override
public String componentSignature() {
return signature().substring(1);
}
@@ -98,6 +99,7 @@
* @return Returns the type of the array components.
* @throws ClassNotLoadedException if the class has not been loaded
*/
+ @Override
public Type componentType() throws ClassNotLoadedException {
if (fComponentType == null) {
fComponentType = TypeImpl.create(virtualMachineImpl(),
@@ -109,6 +111,7 @@
/**
* @return Returns a text representation of the component type.
*/
+ @Override
public String componentTypeName() {
if (fComponentTypeName == null) {
fComponentTypeName = signatureToName(componentSignature());
@@ -121,6 +124,7 @@
* @return Creates and returns a new instance of this array class in the
* target VM.
*/
+ @Override
public ArrayReference newInstance(int length) {
// Note that this information should not be cached.
initJdwpRequest();
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/BooleanValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/BooleanValueImpl.java
index 9febc4c..c858dee 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/BooleanValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/BooleanValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -57,6 +57,7 @@
/**
* @return the underlying value
*/
+ @Override
public boolean value() {
return booleanValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
index f0dc86e..bc37193 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,6 +48,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(ByteValue o) {
return ((Byte)byteValue()).compareTo(o.byteValue());
}
@@ -63,6 +64,7 @@
/**
* @return the underlying byte value
*/
+ @Override
public byte value() {
return byteValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
index 34ae11c..06c4668 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(CharValue o) {
return ((Character)charValue()).compareTo(o.charValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public char value() {
return charValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassLoaderReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassLoaderReferenceImpl.java
index 6ca9334..460844f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassLoaderReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassLoaderReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
* @returns Returns a list of all loaded classes that were defined by this
* class loader.
*/
+ @Override
public List<ReferenceType> definedClasses() {
// Note that this information should not be cached.
List<ReferenceType> visibleClasses = visibleClasses();
@@ -76,6 +77,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ClassLoaderReference#visibleClasses()
*/
+ @Override
public List<ReferenceType> visibleClasses() {
// Note that this information should not be cached.
initJdwpRequest();
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassObjectReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassObjectReferenceImpl.java
index e3056fc..e235236 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassObjectReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassObjectReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
/**
* @returns Returns the ReferenceType corresponding to this class object.
*/
+ @Override
public ReferenceType reflectedType() {
initJdwpRequest();
try {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
index 7266bd3..0406a59 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -119,6 +119,7 @@
* @return Returns a the single non-abstract Method visible from this class
* that has the given name and signature.
*/
+ @Override
public Method concreteMethodByName(String name, String signature) {
/*
* Recursion is used to find the method: The methods of its own (own
@@ -147,6 +148,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ClassType#invokeMethod(com.sun.jdi.ThreadReference, com.sun.jdi.Method, java.util.List, int)
*/
+ @Override
public Value invokeMethod(ThreadReference thread, Method method, List<? extends Value> arguments, int options) throws InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
InvocationException {
@@ -225,6 +227,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ClassType#newInstance(com.sun.jdi.ThreadReference, com.sun.jdi.Method, java.util.List, int)
*/
+ @Override
public ObjectReference newInstance(ThreadReference thread, Method method, List<? extends Value> arguments, int options) throws InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
InvocationException {
@@ -303,6 +306,7 @@
/**
* Assigns a value to a static field. .
*/
+ @Override
public void setValue(Field field, Value value) throws InvalidTypeException,
ClassNotLoadedException {
// Note that this information should not be cached.
@@ -345,6 +349,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ClassType#subclasses()
*/
+ @Override
public List<ClassType> subclasses() {
// Note that this information should not be cached.
List<ClassType> subclasses = new ArrayList<ClassType>();
@@ -369,6 +374,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ClassType#superclass()
*/
+ @Override
public ClassType superclass() {
if (fSuperclass != null)
return fSuperclass;
@@ -443,6 +449,7 @@
return mirror;
}
+ @Override
public boolean isEnum() {
if (virtualMachineImpl().isJdwpVersionGreaterOrEqual(1, 5)) {
// there is no modifier for this ... :(
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
index 9709739..c0ac822 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(DoubleValue o) {
return ((Double)doubleValue()).compareTo(o.doubleValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public double value() {
return doubleValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java
index ba77820..a8d4ebd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FieldImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -73,6 +73,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(Field object) {
if (object == null || !object.getClass().equals(this.getClass()))
throw new ClassCastException(JDIMessages.FieldImpl_Can__t_compare_field_to_given_object_1);
@@ -105,6 +106,7 @@
/**
* @return Returns a text representation of the declared type.
*/
+ @Override
public String typeName() {
if (fTypeName == null) {
fTypeName = TypeImpl.signatureToName(signature());
@@ -115,6 +117,7 @@
/**
* @return Returns the type of the this Field.
*/
+ @Override
public Type type() throws ClassNotLoadedException {
if (fType == null) {
fType = TypeImpl.create(virtualMachineImpl(), signature(),
@@ -126,6 +129,7 @@
/**
* @return Returns true if object is transient.
*/
+ @Override
public boolean isTransient() {
return (fModifierBits & MODIFIER_ACC_TRANSIENT) != 0;
}
@@ -133,6 +137,7 @@
/**
* @return Returns true if object is volatile.
*/
+ @Override
public boolean isVolatile() {
return (fModifierBits & MODIFIER_ACC_VOLITILE) != 0;
}
@@ -216,6 +221,7 @@
return mirror;
}
+ @Override
public boolean isEnumConstant() {
return (fModifierBits & MODIFIER_ACC_ENUM) != 0;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
index 7ef716c..cef4ed5 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(FloatValue o) {
return ((Float)floatValue()).compareTo(o.floatValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public float value() {
return floatValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
index cfcc548..6fd8234 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(IntegerValue o) {
return ((Integer)intValue()).compareTo(o.intValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public int value() {
return intValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/InterfaceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/InterfaceTypeImpl.java
index 912f04e..3758287 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/InterfaceTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/InterfaceTypeImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -93,6 +93,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.InterfaceType#implementors()
*/
+ @Override
public List<ClassType> implementors() {
// Note that this information should not be cached.
List<ClassType> implementors = new ArrayList<ClassType>();
@@ -117,6 +118,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.InterfaceType#subinterfaces()
*/
+ @Override
public List<InterfaceType> subinterfaces() {
// Note that this information should not be cached.
List<InterfaceType> implementors = new ArrayList<InterfaceType>();
@@ -141,6 +143,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.InterfaceType#superinterfaces()
*/
+ @Override
public List<InterfaceType> superinterfaces() {
return interfaces();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java
index 281f996..5af76a4 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocalVariableImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -99,6 +99,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(LocalVariable variable) {
if (variable == null || !variable.getClass().equals(this.getClass()))
throw new ClassCastException(
@@ -130,10 +131,12 @@
/**
* @return Returns true if this variable is an argument to its method.
*/
+ @Override
public boolean isArgument() {
return fIsArgument;
}
+ @Override
public boolean isVisible(StackFrame frame) throws IllegalArgumentException,
VMMismatchException {
checkVM(frame);
@@ -161,6 +164,7 @@
/**
* @return Returns the name of the local variable.
*/
+ @Override
public String name() {
return fName;
}
@@ -168,6 +172,7 @@
/**
* @return Returns the signature of the local variable.
*/
+ @Override
public String signature() {
return fSignature;
}
@@ -175,6 +180,7 @@
/**
* @return Returns the type of the this LocalVariable.
*/
+ @Override
public Type type() throws ClassNotLoadedException {
if (fType == null) {
fType = TypeImpl.create(virtualMachineImpl(), fSignature, method()
@@ -187,6 +193,7 @@
* @return Returns a text representation of the declared type of this
* variable.
*/
+ @Override
public String typeName() {
if (fTypeName == null) {
fTypeName = TypeImpl.signatureToName(fSignature);
@@ -223,6 +230,7 @@
return fName;
}
+ @Override
public String genericSignature() {
return fGenericSignature;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocationImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocationImpl.java
index 843156d..3994014 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocationImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LocationImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,6 +51,7 @@
/**
* @return Returns the code position within this location's method.
*/
+ @Override
public long codeIndex() {
return fIndex;
}
@@ -58,6 +59,7 @@
/**
* @return Returns the type to which this Location belongs.
*/
+ @Override
public ReferenceType declaringType() {
return fMethod.declaringType();
}
@@ -87,6 +89,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(Locatable locatable) {
if (locatable == null || !locatable.getClass().equals(this.getClass()))
throw new ClassCastException(
@@ -117,6 +120,7 @@
* @return Returns an int specifying the line in the source, return -1 if
* the information is not available.
*/
+ @Override
public int lineNumber() {
return lineNumber(virtualMachine().getDefaultStratum());
}
@@ -124,6 +128,7 @@
/**
* @return Returns the Method if this location is in a method.
*/
+ @Override
public Method method() {
return fMethod;
}
@@ -131,6 +136,7 @@
/**
* @return a string specifying the source.
*/
+ @Override
public String sourceName() throws AbsentInformationException {
return sourceName(virtualMachine().getDefaultStratum());
}
@@ -177,6 +183,7 @@
/**
* @see Location#lineNumber(String)
*/
+ @Override
public int lineNumber(String stratum) {
return fMethod.referenceTypeImpl().lineNumber(fIndex, fMethod, stratum);
}
@@ -184,6 +191,7 @@
/**
* @see Location#sourceName(String)
*/
+ @Override
public String sourceName(String stratum) throws AbsentInformationException {
return fMethod.referenceTypeImpl().sourceName(fIndex, fMethod, stratum);
}
@@ -191,6 +199,7 @@
/**
* @see Location#sourcePath(String)
*/
+ @Override
public String sourcePath(String stratum) throws AbsentInformationException {
return fMethod.referenceTypeImpl().sourcePath(fIndex, fMethod, stratum);
}
@@ -198,6 +207,7 @@
/**
* @see Location#sourcePath()
*/
+ @Override
public String sourcePath() throws AbsentInformationException {
return sourcePath(virtualMachine().getDefaultStratum());
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
index 7f24c11..18f8f6d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(LongValue o) {
return ((Long)longValue()).compareTo(o.longValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public long value() {
return longValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
index 1089483..7e8696c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -250,6 +250,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#allLineLocations()
*/
+ @Override
public List<Location> allLineLocations() throws AbsentInformationException {
return allLineLocations(virtualMachine().getDefaultStratum(), null);
}
@@ -257,6 +258,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#arguments()
*/
+ @Override
public List<LocalVariable> arguments() throws AbsentInformationException {
if (isNative() || isAbstract()) {
throw new AbsentInformationException(JDIMessages.MethodImpl_No_local_variable_information_available_9);
@@ -280,6 +282,7 @@
* @return Returns a text representation of all declared argument types of
* this method.
*/
+ @Override
public List<String> argumentTypeNames() {
if (fArgumentTypeNames != null) {
return fArgumentTypeNames;
@@ -310,6 +313,7 @@
/**
* @return Returns the list containing the type of each argument.
*/
+ @Override
public List<Type> argumentTypes() throws ClassNotLoadedException {
if (fArgumentTypes != null) {
return fArgumentTypes;
@@ -329,6 +333,7 @@
/**
* @return Returns an array containing the bytecodes for this method.
*/
+ @Override
public byte[] bytecodes() {
if (fByteCodes != null) {
return fByteCodes;
@@ -384,6 +389,7 @@
* {@link Method} is less than, equal to, or greater than the specified
* {@link Method}.
*/
+ @Override
public int compareTo(Method method) {
if (method == null || !method.getClass().equals(this.getClass()))
throw new ClassCastException(
@@ -410,6 +416,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isAbstract()
*/
+ @Override
public boolean isAbstract() {
return (fModifierBits & MODIFIER_ACC_ABSTRACT) != 0;
}
@@ -417,6 +424,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isConstructor()
*/
+ @Override
public boolean isConstructor() {
return name().equals("<init>"); //$NON-NLS-1$
}
@@ -424,6 +432,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isNative()
*/
+ @Override
public boolean isNative() {
return (fModifierBits & MODIFIER_ACC_NATIVE) != 0;
}
@@ -431,6 +440,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isStaticInitializer()
*/
+ @Override
public boolean isStaticInitializer() {
return name().equals("<clinit>"); //$NON-NLS-1$
}
@@ -438,6 +448,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isSynchronized()
*/
+ @Override
public boolean isSynchronized() {
return (fModifierBits & MODIFIER_ACC_SYNCHRONIZED) != 0;
}
@@ -445,6 +456,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#locationOfCodeIndex(long)
*/
+ @Override
public Location locationOfCodeIndex(long index) {
if (isAbstract() || isNative()) {
return null;
@@ -462,6 +474,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#locationsOfLine(int)
*/
+ @Override
public List<Location> locationsOfLine(int line) throws AbsentInformationException {
return locationsOfLine(virtualMachine().getDefaultStratum(), null, line);
}
@@ -469,6 +482,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#returnType()
*/
+ @Override
public Type returnType() throws ClassNotLoadedException {
int startIndex = signature().lastIndexOf(')') + 1; // Signature position
// is just after
@@ -481,6 +495,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#returnTypeName()
*/
+ @Override
public String returnTypeName() {
if (fReturnTypeName != null) {
return fReturnTypeName;
@@ -496,6 +511,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#variables()
*/
+ @Override
public List<LocalVariable> variables() throws AbsentInformationException {
if (isNative() || isAbstract()) {
throw new AbsentInformationException(JDIMessages.MethodImpl_No_local_variable_information_available_9);
@@ -606,6 +622,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#variablesByName(java.lang.String)
*/
+ @Override
public List<LocalVariable> variablesByName(String name) throws AbsentInformationException {
Iterator<LocalVariable> iter = variables().iterator();
List<LocalVariable> result = new ArrayList<LocalVariable>();
@@ -621,6 +638,7 @@
/**
* @see com.sun.jdi.Locatable#location()
*/
+ @Override
public Location location() {
if (isAbstract()) {
return null;
@@ -791,6 +809,7 @@
* isObsolete on JDK 1.4 will never return true for a non-zero method
* ID. The query is therefore not needed
*/
+ @Override
public boolean isObsolete() {
if (virtualMachineImpl().isJdwpVersionGreaterOrEqual(1, 4)) {
return fMethodID.value() == 0;
@@ -801,6 +820,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#allLineLocations(java.lang.String, java.lang.String)
*/
+ @Override
public List<Location> allLineLocations(String stratum, String sourceName) throws AbsentInformationException {
if (isAbstract() || isNative()) {
return Collections.EMPTY_LIST;
@@ -837,6 +857,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#locationsOfLine(java.lang.String, java.lang.String, int)
*/
+ @Override
public List<Location> locationsOfLine(String stratum, String sourceName,
int lineNumber) throws AbsentInformationException {
if (isAbstract() || isNative()) {
@@ -881,6 +902,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isBridge()
*/
+ @Override
public boolean isBridge() {
return (fModifierBits & MODIFIER_ACC_BRIDGE) != 0;
}
@@ -888,6 +910,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.Method#isVarArgs()
*/
+ @Override
public boolean isVarArgs() {
// TODO: remove this test when j9 solve its problem
// it returns invalid 1.5 flags for 1.4 classes.
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java
index 2e1a641..c48176c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MirrorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@
/**
* @return Returns Virtual Machine of Mirror object.
*/
+ @Override
public VirtualMachine virtualMachine() {
return fVirtualMachineImpl;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java
index df4df1c..09a3e07 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MonitorInfoImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @see com.sun.jdi.MonitorInfo#monitor()
*/
+ @Override
public ObjectReference monitor() throws InvalidStackFrameException {
return fMonitor;
}
@@ -46,6 +47,7 @@
/**
* @see com.sun.jdi.MonitorInfo#stackDepth()
*/
+ @Override
public int stackDepth() throws InvalidStackFrameException {
return fDepth;
}
@@ -53,6 +55,7 @@
/**
* @see com.sun.jdi.MonitorInfo#thread()
*/
+ @Override
public ThreadReference thread() throws InvalidStackFrameException {
return fThread;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java
index 61714ec..9314a7f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ObjectReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,6 +92,7 @@
/**
* Prevents garbage collection for this object.
*/
+ @Override
public void disableCollection() {
initJdwpRequest();
try {
@@ -106,6 +107,7 @@
/**
* Permits garbage collection for this object.
*/
+ @Override
public void enableCollection() {
initJdwpRequest();
try {
@@ -168,6 +170,7 @@
* @return Returns an ThreadReference for the thread, if any, which
* currently owns this object's monitor.
*/
+ @Override
public ThreadReference owningThread()
throws IncompatibleThreadStateException {
return monitorInfo().owner;
@@ -177,6 +180,7 @@
* @return Returns the number times this object's monitor has been entered
* by the current owning thread.
*/
+ @Override
public int entryCount() throws IncompatibleThreadStateException {
return monitorInfo().entryCount;
}
@@ -185,6 +189,7 @@
* @return Returns a List containing a ThreadReference for each thread
* currently waiting for this object's monitor.
*/
+ @Override
public List<ThreadReference> waitingThreads() throws IncompatibleThreadStateException {
return monitorInfo().waiters;
}
@@ -193,6 +198,7 @@
* @return Returns the value of a given instance or static field in this
* object.
*/
+ @Override
public Value getValue(Field field) {
ArrayList<Field> list = new ArrayList<Field>(1);
list.add(field);
@@ -209,6 +215,7 @@
*
* @since 3.3
*/
+ @Override
public List<ObjectReference> referringObjects(long maxReferrers)
throws UnsupportedOperationException, IllegalArgumentException {
try {
@@ -260,6 +267,7 @@
* @return Returns the value of multiple instance and/or static fields in
* this object.
*/
+ @Override
public Map<Field, Value> getValues(List<? extends Field> allFields) {
// if the field list is empty, nothing to do.
if (allFields.isEmpty()) {
@@ -376,6 +384,7 @@
*
* @return Returns a Value mirror of the invoked method's return value.
*/
+ @Override
public Value invokeMethod(ThreadReference thread, Method method, List<? extends Value> arguments, int options) throws InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
InvocationException {
@@ -470,6 +479,7 @@
* @return Returns if this object has been garbage collected in the target
* VM.
*/
+ @Override
public boolean isCollected() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -506,6 +516,7 @@
/**
* @return Returns the ReferenceType that mirrors the type of this object.
*/
+ @Override
public ReferenceType referenceType() {
if (fReferenceType != null) {
return fReferenceType;
@@ -537,6 +548,7 @@
/**
* Sets the value of a given instance or static field in this object.
*/
+ @Override
public void setValue(Field field, Value value) throws InvalidTypeException,
ClassNotLoadedException {
// Note that this information should not be cached.
@@ -579,6 +591,7 @@
/**
* @return Returns a unique identifier for this ObjectReference.
*/
+ @Override
public long uniqueID() {
return fObjectID.value();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/PrimitiveValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/PrimitiveValueImpl.java
index 16510f1..69a915d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/PrimitiveValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/PrimitiveValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public boolean booleanValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue();
@@ -51,6 +52,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public char charValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (char) 1 : (char) 0;
@@ -63,6 +65,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public byte byteValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (byte) 1 : (byte) 0;
@@ -75,6 +78,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public double doubleValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (double) 1 : (double) 0;
@@ -87,6 +91,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public float floatValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (float) 1 : (float) 0;
@@ -99,6 +104,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public int intValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (int) 1 : (int) 0;
@@ -111,6 +117,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public long longValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (long) 1 : (long) 0;
@@ -123,6 +130,7 @@
/**
* @return Returns Primitive Value converted to required type.
*/
+ @Override
public short shortValue() {
if (fValue instanceof Boolean)
return ((Boolean) fValue).booleanValue() ? (short) 1 : (short) 0;
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
index 9db27f3..d94b2eb 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -557,6 +557,7 @@
* @return Returns a list containing each visible and unambiguous Method in
* this type.
*/
+ @Override
public List<Method> visibleMethods() {
if (fVisibleMethods != null)
return fVisibleMethods;
@@ -604,6 +605,7 @@
* its super-classes, implemented interfaces, and/or
* super-interfaces.
*/
+ @Override
public List<Method> allMethods() {
if (fAllMethods != null)
return fAllMethods;
@@ -701,6 +703,7 @@
* @return Returns a list containing each visible and unambiguous Field in
* this type.
*/
+ @Override
public List<Field> visibleFields() {
if (fVisibleFields != null)
return fVisibleFields;
@@ -743,6 +746,7 @@
* its super-classes, implemented interfaces, and/or
* super-interfaces.
*/
+ @Override
public List<Field> allFields() {
if (fAllFields != null)
return fAllFields;
@@ -782,6 +786,7 @@
* @return Returns the class loader object which loaded the class
* corresponding to this type.
*/
+ @Override
public ClassLoaderReference classLoader() {
if (fClassLoader != null)
return fClassLoader;
@@ -806,6 +811,7 @@
* @return Returns the class object that corresponds to this type in the
* target VM.
*/
+ @Override
public ClassObjectReference classObject() {
if (fClassObject != null)
return fClassObject;
@@ -850,6 +856,7 @@
/**
* @return Returns true if initialization failed for this class.
*/
+ @Override
public boolean failedToInitialize() {
return (status() & JDWP_CLASS_STATUS_ERROR) != 0;
}
@@ -857,6 +864,7 @@
/**
* @return Returns true if this type has been initialized.
*/
+ @Override
public boolean isInitialized() {
return (status() & JDWP_CLASS_STATUS_INITIALIZED) != 0;
}
@@ -864,6 +872,7 @@
/**
* @return Returns true if this type has been prepared.
*/
+ @Override
public boolean isPrepared() {
return (status() & JDWP_CLASS_STATUS_PREPARED) != 0;
}
@@ -871,6 +880,7 @@
/**
* @return Returns true if this type has been verified.
*/
+ @Override
public boolean isVerified() {
return (status() & JDWP_CLASS_STATUS_VERIFIED) != 0;
}
@@ -878,6 +888,7 @@
/**
* @return Returns the visible Field with the given non-ambiguous name.
*/
+ @Override
public Field fieldByName(String name) {
Iterator<Field> iter = visibleFields().iterator();
while (iter.hasNext()) {
@@ -891,6 +902,7 @@
/**
* @return Returns a list containing each Field declared in this type.
*/
+ @Override
public List<Field> fields() {
if (fFields != null) {
return fFields;
@@ -966,6 +978,7 @@
/**
* @return Returns the Value of a given static Field in this type.
*/
+ @Override
public Value getValue(Field field) {
ArrayList<Field> list = new ArrayList<Field>(1);
list.add(field);
@@ -975,6 +988,7 @@
/**
* @return a Map of the requested static Field objects with their Value.
*/
+ @Override
public Map<Field, Value> getValues(List<? extends Field> fields) {
// if the field list is empty, nothing to do
if (fields.isEmpty()) {
@@ -1045,6 +1059,7 @@
* {@link ReferenceType} is less than, equal to, or greater than the specified
* {@link ReferenceType}.
*/
+ @Override
public int compareTo(ReferenceType type) {
if (type == null || !type.getClass().equals(this.getClass()))
throw new ClassCastException(JDIMessages.ReferenceTypeImpl_Can__t_compare_reference_type_to_given_object_4);
@@ -1054,6 +1069,7 @@
/**
* @return Returns true if the type was declared abstract.
*/
+ @Override
public boolean isAbstract() {
return (modifiers() & MODIFIER_ACC_ABSTRACT) != 0;
}
@@ -1061,6 +1077,7 @@
/**
* @return Returns true if the type was declared final.
*/
+ @Override
public boolean isFinal() {
return (modifiers() & MODIFIER_ACC_FINAL) != 0;
}
@@ -1068,6 +1085,7 @@
/**
* @return Returns true if the type was declared static.
*/
+ @Override
public boolean isStatic() {
return (modifiers() & MODIFIER_ACC_STATIC) != 0;
}
@@ -1075,6 +1093,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#locationsOfLine(int)
*/
+ @Override
public List<Location> locationsOfLine(int line) throws AbsentInformationException {
return locationsOfLine(virtualMachine().getDefaultStratum(), null, line);
}
@@ -1083,6 +1102,7 @@
* @return Returns a list containing each Method declared directly in this
* type.
*/
+ @Override
public List<Method> methods() {
// Note that ArrayReference overwrites this method by returning an empty
// list.
@@ -1125,6 +1145,7 @@
* @return Returns a List containing each visible Method that has the given
* name.
*/
+ @Override
public List<Method> methodsByName(String name) {
List<Method> elements = new ArrayList<Method>();
Iterator<Method> iter = visibleMethods().iterator();
@@ -1141,6 +1162,7 @@
* @return Returns a List containing each visible Method that has the given
* name and signature.
*/
+ @Override
public List<Method> methodsByName(String name, String signature) {
List<Method> elements = new ArrayList<Method>();
Iterator<Method> iter = visibleMethods().iterator();
@@ -1193,6 +1215,7 @@
* @return Returns a List containing each ReferenceType declared within this
* type.
*/
+ @Override
public List<ReferenceType> nestedTypes() {
// Note that the VM gives an empty reply on RT_NESTED_TYPES, therefore
// we search for the
@@ -1219,6 +1242,7 @@
* @return Returns an identifying name for the source corresponding to the
* declaration of this type.
*/
+ @Override
public String sourceName() throws AbsentInformationException {
// sourceNames list in never empty, an AbsentInformationException is
// thrown
@@ -1231,6 +1255,7 @@
* @return Returns the CRC-32 of the given reference type, undefined if
* unknown.
*/
+ @Override
public int getClassFileVersion() {
virtualMachineImpl().checkHCRSupported();
if (fGotClassFileVersion)
@@ -1258,6 +1283,7 @@
/**
* @return Returns whether the CRC-32 of the given reference type is known.
*/
+ @Override
public boolean isVersionKnown() {
getClassFileVersion();
return fIsVersionKnown;
@@ -1266,6 +1292,7 @@
/**
* @return Returns whether the reference type is HCR-eligible.
*/
+ @Override
public boolean isHCREligible() {
getClassFileVersion();
return fIsHCREligible;
@@ -1328,6 +1355,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#allLineLocations()
*/
+ @Override
public List<Location> allLineLocations() throws AbsentInformationException {
return allLineLocations(virtualMachine().getDefaultStratum(), null);
}
@@ -1472,6 +1500,7 @@
/**
* @see ReferenceType#sourceNames(String)
*/
+ @Override
public List<String> sourceNames(String stratumId) throws AbsentInformationException {
List<String> list = new ArrayList<String>();
Stratum stratum = getStratum(stratumId);
@@ -1498,6 +1527,7 @@
/**
* @see ReferenceType#sourcePaths(String)
*/
+ @Override
public List<String> sourcePaths(String stratumId) throws AbsentInformationException {
List<String> list = new ArrayList<String>();
Stratum stratum = getStratum(stratumId);
@@ -1524,6 +1554,7 @@
/**
* @see ReferenceType#sourceDebugExtension()
*/
+ @Override
public String sourceDebugExtension() throws AbsentInformationException {
if (isSourceDebugExtensionAvailable()) {
return fSmap;
@@ -1537,6 +1568,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#allLineLocations(java.lang.String, java.lang.String)
*/
+ @Override
public List<Location> allLineLocations(String stratum, String sourceName) throws AbsentInformationException {
Iterator<Method> allMethods = methods().iterator();
if (stratum == null) { // if stratum not defined use the default stratum
@@ -1577,6 +1609,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#locationsOfLine(java.lang.String, java.lang.String, int)
*/
+ @Override
public List<Location> locationsOfLine(String stratum, String sourceName, int lineNumber) throws AbsentInformationException {
Iterator<Method> allMethods = methods().iterator();
List<Location> locations = new ArrayList<Location>();
@@ -1606,6 +1639,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#availableStrata()
*/
+ @Override
public List<String> availableStrata() {
List<String> list = new ArrayList<String>();
// The strata defined in the SMAP.
@@ -1620,6 +1654,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#defaultStratum()
*/
+ @Override
public String defaultStratum() {
if (isSourceDebugExtensionAvailable()) {
return fDefaultStratumId;
@@ -2049,6 +2084,7 @@
*
* @since java 1.5
*/
+ @Override
public String genericSignature() {
if (fGenericSignatureKnown) {
return fGenericSignature;
@@ -2105,6 +2141,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ReferenceType#instances(long)
*/
+ @Override
public List<ObjectReference> instances(long maxInstances) {
try {
int max = (int) maxInstances;
@@ -2156,6 +2193,7 @@
* @see com.sun.jdi.ReferenceType#majorVersion()
* @since 3.3
*/
+ @Override
public int majorVersion() {
try {
ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
@@ -2193,6 +2231,7 @@
* @see com.sun.jdi.ReferenceType#minorVersion()
* @since 3.3
*/
+ @Override
public int minorVersion() {
try {
ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
@@ -2231,6 +2270,7 @@
* @see com.sun.jdi.ReferenceType#constantPoolCount()
* @since 3.3
*/
+ @Override
public int constantPoolCount() {
try {
ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
@@ -2268,6 +2308,7 @@
* @see com.sun.jdi.ReferenceType#constantPool()
* @since 3.3
*/
+ @Override
public byte[] constantPool() {
try {
ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
index 338b274..4303333 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(ShortValue o) {
return ((Short)shortValue()).compareTo(o.shortValue());
}
@@ -61,6 +62,7 @@
/**
* @returns Value.
*/
+ @Override
public short value() {
return shortValue();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java
index 280649b..97dc649 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StackFrameImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#getValue(com.sun.jdi.LocalVariable)
*/
+ @Override
public Value getValue(LocalVariable variable)
throws IllegalArgumentException, InvalidStackFrameException,
VMMismatchException {
@@ -77,6 +78,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#getValues(java.util.List)
*/
+ @Override
public Map<LocalVariable, Value> getValues(List<? extends LocalVariable> variables) throws IllegalArgumentException,
InvalidStackFrameException, VMMismatchException {
// Note that this information should not be cached.
@@ -159,6 +161,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#getArgumentValues()
*/
+ @Override
public List<Value> getArgumentValues() throws InvalidStackFrameException {
if (!thread().isSuspended()) {
throw new InvalidStackFrameException(
@@ -184,6 +187,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#location()
*/
+ @Override
public Location location() {
return fLocation;
}
@@ -191,6 +195,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#setValue(com.sun.jdi.LocalVariable, com.sun.jdi.Value)
*/
+ @Override
public void setValue(LocalVariable var, Value value)
throws InvalidTypeException, ClassNotLoadedException {
// Note that this information should not be cached.
@@ -232,6 +237,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#thisObject()
*/
+ @Override
public ObjectReference thisObject() throws InvalidStackFrameException {
// Note that this information should not be cached.
initJdwpRequest();
@@ -259,6 +265,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#thread()
*/
+ @Override
public ThreadReference thread() {
return fThread;
}
@@ -266,6 +273,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#visibleVariableByName(java.lang.String)
*/
+ @Override
public LocalVariable visibleVariableByName(String name)
throws AbsentInformationException {
Iterator<LocalVariable> iter = visibleVariables().iterator();
@@ -282,6 +290,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.StackFrame#visibleVariables()
*/
+ @Override
public List<LocalVariable> visibleVariables() throws AbsentInformationException {
List<LocalVariable> variables = fLocation.method().variables();
Iterator<LocalVariable> iter = variables.iterator();
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StringReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StringReferenceImpl.java
index 0c6c610..db6bd98 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StringReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/StringReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
/**
* @returns Returns the StringReference as a String.
*/
+ @Override
public String value() {
// Note that this information should not be cached.
initJdwpRequest();
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadGroupReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadGroupReferenceImpl.java
index 86fc4ab..3551908 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadGroupReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadGroupReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,6 +65,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#name()
*/
+ @Override
public String name() {
if (fName != null) {
return fName;
@@ -88,6 +89,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#parent()
*/
+ @Override
public ThreadGroupReference parent() {
if (fParent != fgUnsetParent) {
return fParent;
@@ -111,6 +113,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#resume()
*/
+ @Override
public void resume() {
Iterator<ThreadReference> iter = allThreads().iterator();
while (iter.hasNext()) {
@@ -122,6 +125,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#suspend()
*/
+ @Override
public void suspend() {
Iterator<ThreadReference> iter = allThreads().iterator();
while (iter.hasNext()) {
@@ -173,6 +177,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#threadGroups()
*/
+ @Override
public List<ThreadGroupReference> threadGroups() {
return childrenInfo().childThreadGroups;
}
@@ -180,6 +185,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadGroupReference#threads()
*/
+ @Override
public List<ThreadReference> threads() {
return childrenInfo().childThreads;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
index d991ade..40651a8 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,6 +108,7 @@
* @returns Returns an ObjectReference for the monitor, if any, for which
* this thread is currently waiting.
*/
+ @Override
public ObjectReference currentContendedMonitor()
throws IncompatibleThreadStateException {
if (!virtualMachine().canGetCurrentContendedMonitor()) {
@@ -143,6 +144,7 @@
* @see com.sun.jdi.ThreadReference#forceEarlyReturn(com.sun.jdi.Value)
* @since 3.3
*/
+ @Override
public void forceEarlyReturn(Value value) throws InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException {
if (!virtualMachineImpl().canBeModified()) {
@@ -200,6 +202,7 @@
* @returns Returns the StackFrame at the given index in the thread's
* current call stack.
*/
+ @Override
public StackFrame frame(int index) throws IncompatibleThreadStateException {
return frames(index, 1).get(0);
}
@@ -207,6 +210,7 @@
/**
* @see com.sun.jdi.ThreadReference#frameCount()
*/
+ @Override
public int frameCount() throws IncompatibleThreadStateException {
// Note that this information should not be cached.
initJdwpRequest();
@@ -236,6 +240,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#frames()
*/
+ @Override
public List<StackFrame> frames() throws IncompatibleThreadStateException {
return frames(0, -1);
}
@@ -243,6 +248,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#frames(int, int)
*/
+ @Override
public List<StackFrame> frames(int start, int length) throws IndexOutOfBoundsException,
IncompatibleThreadStateException {
// Note that this information should not be cached.
@@ -291,6 +297,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#interrupt()
*/
+ @Override
public void interrupt() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -304,6 +311,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#isAtBreakpoint()
*/
+ @Override
public boolean isAtBreakpoint() {
return isSuspended() && fIsAtBreakpoint;
}
@@ -311,6 +319,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#isSuspended()
*/
+ @Override
public boolean isSuspended() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -340,6 +349,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#name()
*/
+ @Override
public String name() {
initJdwpRequest();
try {
@@ -363,6 +373,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#ownedMonitors()
*/
+ @Override
public List<ObjectReference> ownedMonitors() throws IncompatibleThreadStateException {
if (!virtualMachine().canGetOwnedMonitorInfo()) {
throw new UnsupportedOperationException();
@@ -400,6 +411,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.ThreadReference#ownedMonitorsAndFrames()
*/
+ @Override
public List<com.sun.jdi.MonitorInfo> ownedMonitorsAndFrames()
throws IncompatibleThreadStateException {
initJdwpRequest();
@@ -447,6 +459,7 @@
*
* @see com.sun.jdi.ThreadReference#resume()
*/
+ @Override
public void resume() {
initJdwpRequest();
try {
@@ -466,6 +479,7 @@
/**
* @return Returns the thread's status.
*/
+ @Override
public int status() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -513,6 +527,7 @@
*
* @see com.sun.jdi.ThreadReference#stop(com.sun.jdi.ObjectReference)
*/
+ @Override
public void stop(ObjectReference throwable) throws InvalidTypeException {
checkVM(throwable);
ObjectReferenceImpl throwableImpl = (ObjectReferenceImpl) throwable;
@@ -546,6 +561,7 @@
*
* @see com.sun.jdi.ThreadReference#suspend()
*/
+ @Override
public void suspend() {
initJdwpRequest();
try {
@@ -564,6 +580,7 @@
/**
* @return Returns the number of pending suspends for this thread.
*/
+ @Override
public int suspendCount() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -585,6 +602,7 @@
/**
* @return Returns this thread's thread group.
*/
+ @Override
public ThreadGroupReference threadGroup() {
if (fThreadGroup != null) {
return fThreadGroup;
@@ -616,6 +634,7 @@
* @return Returns whether any finally or synchronized blocks are enclosing
* the current instruction.
*/
+ @Override
public boolean doReturn(Value returnValue,
boolean triggerFinallyAndSynchronized)
throws org.eclipse.jdi.hcr.OperationRefusedException {
@@ -771,6 +790,7 @@
/**
* @see ThreadReference#popFrames(StackFrame)
*/
+ @Override
public void popFrames(StackFrame frameToPop)
throws IncompatibleThreadStateException {
if (!isSuspended()) {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java
index 0e3f601..fecfed8 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeComponentImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,6 +48,7 @@
/**
* @return Returns modifier bits.
*/
+ @Override
public int modifiers() {
return fModifierBits;
}
@@ -63,6 +64,7 @@
/**
* @return Returns the type in which this component was declared.
*/
+ @Override
public ReferenceType declaringType() {
return fDeclaringType;
}
@@ -70,6 +72,7 @@
/**
* @return Returns true if type component is final.
*/
+ @Override
public boolean isFinal() {
return (fModifierBits & MODIFIER_ACC_FINAL) != 0;
}
@@ -77,6 +80,7 @@
/**
* @return Returns true if type component is static.
*/
+ @Override
public boolean isStatic() {
return (fModifierBits & MODIFIER_ACC_STATIC) != 0;
}
@@ -84,6 +88,7 @@
/**
* @return Returns true if type component is synthetic.
*/
+ @Override
public boolean isSynthetic() {
return (fModifierBits & (MODIFIER_SYNTHETIC | MODIFIER_ACC_SYNTHETIC)) != 0;
}
@@ -91,6 +96,7 @@
/**
* @return Returns text representation of this type.
*/
+ @Override
public String name() {
return fName;
}
@@ -98,6 +104,7 @@
/**
* @return JNI-style signature for this type.
*/
+ @Override
public String signature() {
return fSignature;
}
@@ -110,6 +117,7 @@
return fName;
}
+ @Override
public String genericSignature() {
return fGenericSignature;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeImpl.java
index 72aa830..3dca1cd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/TypeImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -104,6 +104,7 @@
/**
* @return Returns text representation of this type.
*/
+ @Override
public String name() {
return fName;
}
@@ -111,6 +112,7 @@
/**
* @return JNI-style signature for this type.
*/
+ @Override
public String signature() {
return fSignature;
}
@@ -118,6 +120,7 @@
/**
* @return Returns modifier bits.
*/
+ @Override
public abstract int modifiers();
/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
index 0bf7cb0..2585b9a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
/**
* @returns type of value.
*/
+ @Override
public abstract Type type();
/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
index 533eda1..60f4748 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -361,6 +361,7 @@
* loaded type in the target VM a ReferenceType will be placed in the
* returned list.
*/
+ @Override
public List<ReferenceType> allClasses() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -413,6 +414,7 @@
* in the target VM, a ThreadReference that mirrors it is placed in the
* list.
*/
+ @Override
public List<ThreadReference> allThreads() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -521,6 +523,7 @@
* @see com.sun.jdi.VirtualMachine#canForceEarlyReturn()
* @since 3.3
*/
+ @Override
public boolean canForceEarlyReturn() {
getCapabilities();
return fCanForceEarlyReturn;
@@ -530,6 +533,7 @@
* @return Returns true if this implementation supports the retrieval of a
* method's bytecodes.
*/
+ @Override
public boolean canGetBytecodes() {
getCapabilities();
return fCanGetBytecodes;
@@ -539,6 +543,7 @@
* @return Returns true if this implementation supports the retrieval of the
* monitor for which a thread is currently waiting.
*/
+ @Override
public boolean canGetCurrentContendedMonitor() {
getCapabilities();
return fCanGetCurrentContendedMonitor;
@@ -548,6 +553,7 @@
* @see com.sun.jdi.VirtualMachine#canGetInstanceInfo()
* @since 3.3
*/
+ @Override
public boolean canGetInstanceInfo() {
getCapabilities();
return fCanGetInstanceInfo;
@@ -557,6 +563,7 @@
* @see com.sun.jdi.VirtualMachine#canGetMethodReturnValues()
* @since 3.3
*/
+ @Override
public boolean canGetMethodReturnValues() {
return isJdwpVersionGreaterOrEqual(1, 6);
}
@@ -565,6 +572,7 @@
* @return Returns true if this implementation supports the retrieval of the
* monitor information for an object.
*/
+ @Override
public boolean canGetMonitorInfo() {
getCapabilities();
return fCanGetMonitorInfo;
@@ -574,6 +582,7 @@
* @see com.sun.jdi.VirtualMachine#canGetMonitorFrameInfo()
* @since 3.3
*/
+ @Override
public boolean canGetMonitorFrameInfo() {
getCapabilities();
return fCanGetMonitorFrameInfo;
@@ -583,6 +592,7 @@
* @return Returns true if this implementation supports the retrieval of the
* monitors owned by a thread.
*/
+ @Override
public boolean canGetOwnedMonitorInfo() {
getCapabilities();
return fCanGetOwnedMonitorInfo;
@@ -592,6 +602,7 @@
* @return Returns true if this implementation supports the query of the
* synthetic attribute of a method or field.
*/
+ @Override
public boolean canGetSyntheticAttribute() {
getCapabilities();
return fCanGetSyntheticAttribute;
@@ -601,6 +612,7 @@
* @see com.sun.jdi.VirtualMachine#canRequestMonitorEvents()
* @since 3.3
*/
+ @Override
public boolean canRequestMonitorEvents() {
getCapabilities();
return fCanRequestMonitorEvents;
@@ -610,6 +622,7 @@
* @return Returns true if this implementation supports watchpoints for
* field access.
*/
+ @Override
public boolean canWatchFieldAccess() {
getCapabilities();
return fCanWatchFieldAccess;
@@ -619,6 +632,7 @@
* @return Returns true if this implementation supports watchpoints for
* field modification.
*/
+ @Override
public boolean canWatchFieldModification() {
getCapabilities();
return fCanWatchFieldModification;
@@ -662,6 +676,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#classesByName(java.lang.String)
*/
+ @Override
public List<ReferenceType> classesByName(String name) {
String signature = TypeImpl.classNameToSignature(name);
return classesBySignature(signature);
@@ -670,6 +685,7 @@
/**
* Invalidates this virtual machine mirror.
*/
+ @Override
public void dispose() {
initJdwpRequest();
try {
@@ -685,6 +701,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#eventQueue()
*/
+ @Override
public EventQueue eventQueue() {
return fEventQueue;
}
@@ -692,6 +709,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#eventRequestManager()
*/
+ @Override
public EventRequestManager eventRequestManager() {
return fEventReqMgr;
}
@@ -707,6 +725,7 @@
/**
* Causes the mirrored VM to terminate with the given error code.
*/
+ @Override
public void exit(int exitCode) {
initJdwpRequest();
try {
@@ -727,6 +746,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(byte)
*/
+ @Override
public ByteValue mirrorOf(byte value) {
return new ByteValueImpl(virtualMachineImpl(), new Byte(value));
}
@@ -734,6 +754,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(char)
*/
+ @Override
public CharValue mirrorOf(char value) {
return new CharValueImpl(virtualMachineImpl(), new Character(value));
}
@@ -741,6 +762,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(double)
*/
+ @Override
public DoubleValue mirrorOf(double value) {
return new DoubleValueImpl(virtualMachineImpl(), new Double(value));
}
@@ -748,6 +770,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(float)
*/
+ @Override
public FloatValue mirrorOf(float value) {
return new FloatValueImpl(virtualMachineImpl(), new Float(value));
}
@@ -755,6 +778,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(int)
*/
+ @Override
public IntegerValue mirrorOf(int value) {
return new IntegerValueImpl(virtualMachineImpl(), new Integer(value));
}
@@ -762,6 +786,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(long)
*/
+ @Override
public LongValue mirrorOf(long value) {
return new LongValueImpl(virtualMachineImpl(), new Long(value));
}
@@ -769,6 +794,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(short)
*/
+ @Override
public ShortValue mirrorOf(short value) {
return new ShortValueImpl(virtualMachineImpl(), new Short(value));
}
@@ -776,6 +802,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(boolean)
*/
+ @Override
public BooleanValue mirrorOf(boolean value) {
return new BooleanValueImpl(virtualMachineImpl(),
Boolean.valueOf(value));
@@ -784,6 +811,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOf(java.lang.String)
*/
+ @Override
public StringReference mirrorOf(String value) {
initJdwpRequest();
try {
@@ -809,6 +837,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#mirrorOfVoid()
*/
+ @Override
public VoidValue mirrorOfVoid() {
return new VoidValueImpl(this);
}
@@ -816,6 +845,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#process()
*/
+ @Override
public Process process() {
return fLaunchedProcess;
}
@@ -831,6 +861,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#resume()
*/
+ @Override
public void resume() {
initJdwpRequest();
try {
@@ -845,6 +876,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#setDebugTraceMode(int)
*/
+ @Override
public void setDebugTraceMode(int traceFlags) {
// We don't have trace info.
}
@@ -852,6 +884,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#suspend()
*/
+ @Override
public void suspend() {
initJdwpRequest();
try {
@@ -865,6 +898,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#topLevelThreadGroups()
*/
+ @Override
public List<ThreadGroupReference> topLevelThreadGroups() {
// Note that this information should not be cached.
initJdwpRequest();
@@ -891,6 +925,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#name()
*/
+ @Override
public String name() {
getVersionInfo();
return fVMName;
@@ -899,6 +934,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#version()
*/
+ @Override
public String version() {
getVersionInfo();
return fVMVersion;
@@ -907,6 +943,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#description()
*/
+ @Override
public String description() {
getVersionInfo();
return fVersionDescription;
@@ -1033,6 +1070,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.hcr.VirtualMachine#canReloadClasses()
*/
+ @Override
public boolean canReloadClasses() {
getHCRCapabilities();
return fHcrCapabilities[HCR_CAN_RELOAD_CLASSES];
@@ -1049,6 +1087,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#canGetClassFileVersion()
*/
+ @Override
public boolean canGetClassFileVersion() {
return isJdwpVersionGreaterOrEqual(1, 6);
}
@@ -1056,6 +1095,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#canGetConstantPool()
*/
+ @Override
public boolean canGetConstantPool() {
getCapabilities();
return fCanGetConstantPool;
@@ -1064,6 +1104,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.hcr.VirtualMachine#canDoReturn()
*/
+ @Override
public boolean canDoReturn() {
getHCRCapabilities();
return fHcrCapabilities[HCR_CAN_DO_RETURN];
@@ -1072,6 +1113,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.hcr.VirtualMachine#canReenterOnExit()
*/
+ @Override
public boolean canReenterOnExit() {
getHCRCapabilities();
return fHcrCapabilities[HCR_CAN_REENTER_ON_EXIT];
@@ -1080,6 +1122,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.hcr.VirtualMachine#classesHaveChanged(java.lang.String[])
*/
+ @Override
public int classesHaveChanged(String[] names) {
checkHCRSupported();
// We convert the class/interface names to signatures.
@@ -1177,6 +1220,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.VirtualMachine#setRequestTimeout(int)
*/
+ @Override
public void setRequestTimeout(int timeout) {
fRequestTimeout = timeout;
}
@@ -1184,6 +1228,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.VirtualMachine#getRequestTimeout()
*/
+ @Override
public int getRequestTimeout() {
return fRequestTimeout;
}
@@ -1201,6 +1246,7 @@
|| (fJdwpMajorVersion == major && fJdwpMinorVersion >= minor);
}
+ @Override
public void redefineClasses(Map<? extends ReferenceType, byte[]> typesToBytes) {
if (!canRedefineClasses()) {
throw new UnsupportedOperationException();
@@ -1273,6 +1319,7 @@
/*
* @see VirtualMachine#canRedefineClasses()
*/
+ @Override
public boolean canRedefineClasses() {
getCapabilities();
return fCanRedefineClasses;
@@ -1281,6 +1328,7 @@
/*
* @see VirtualMachine#canUseInstanceFilters()
*/
+ @Override
public boolean canUseInstanceFilters() {
getCapabilities();
return fCanUseInstanceFilters;
@@ -1289,6 +1337,7 @@
/*
* @see VirtualMachine#canAddMethod()
*/
+ @Override
public boolean canAddMethod() {
getCapabilities();
return fCanAddMethod;
@@ -1297,6 +1346,7 @@
/*
* @see VirtualMachine#canUnrestrictedlyRedefineClasses()
*/
+ @Override
public boolean canUnrestrictedlyRedefineClasses() {
getCapabilities();
return fCanUnrestrictedlyRedefineClasses;
@@ -1305,6 +1355,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#canUseSourceNameFilters()
*/
+ @Override
public boolean canUseSourceNameFilters() {
getCapabilities();
return fCanUseSourceNameFilters;
@@ -1313,6 +1364,7 @@
/*
* @see VirtualMachine#canPopFrames()
*/
+ @Override
public boolean canPopFrames() {
getCapabilities();
return fCanPopFrames;
@@ -1321,6 +1373,7 @@
/*
* @see VirtualMachine#canGetSourceDebugExtension()
*/
+ @Override
public boolean canGetSourceDebugExtension() {
getCapabilities();
return fCanGetSourceDebugExtension;
@@ -1329,6 +1382,7 @@
/*
* @see VirtualMachine#canRequestVMDeathEvent()
*/
+ @Override
public boolean canRequestVMDeathEvent() {
getCapabilities();
return fCanRequestVMDeathEvent;
@@ -1342,6 +1396,7 @@
/*
* @see VirtualMachine#setDefaultStratum(String)
*/
+ @Override
public void setDefaultStratum(String stratum) {
fDefaultStratum = stratum;
@@ -1373,6 +1428,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#getDefaultStratum()
*/
+ @Override
public String getDefaultStratum() {
return fDefaultStratum;
}
@@ -1380,6 +1436,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachine#instanceCounts(java.util.List)
*/
+ @Override
public long[] instanceCounts(List<? extends ReferenceType> refTypes) {
if (refTypes == null) {
throw new NullPointerException(JDIMessages.VirtualMachineImpl_2);
@@ -1539,6 +1596,7 @@
*
* @see com.sun.jdi.VirtualMachine#canBeModified()
*/
+ @Override
public boolean canBeModified() {
return true;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
index 0d13fe3..f75fcdc 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -89,6 +89,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#majorInterfaceVersion()
*/
+ @Override
public int majorInterfaceVersion() {
return MAJOR_INTERFACE_VERSION;
}
@@ -96,6 +97,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#minorInterfaceVersion()
*/
+ @Override
public int minorInterfaceVersion() {
return MINOR_INTERFACE_VERSION;
}
@@ -170,6 +172,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#connectedVirtualMachines()
*/
+ @Override
public List<VirtualMachine> connectedVirtualMachines() {
return fConnectedVMs;
}
@@ -177,6 +180,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#allConnectors()
*/
+ @Override
public List<Connector> allConnectors() {
List<Connector> result = new ArrayList<Connector>(attachingConnectors());
result.addAll(launchingConnectors());
@@ -187,6 +191,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#attachingConnectors()
*/
+ @Override
public List<AttachingConnector> attachingConnectors() {
ArrayList<AttachingConnector> list = new ArrayList<AttachingConnector>(1);
list.add(new SocketAttachingConnectorImpl(this));
@@ -196,6 +201,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#launchingConnectors()
*/
+ @Override
public List<LaunchingConnector> launchingConnectors() {
ArrayList<LaunchingConnector> list = new ArrayList<LaunchingConnector>(2);
list.add(new SocketLaunchingConnectorImpl(this));
@@ -206,6 +212,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#listeningConnectors()
*/
+ @Override
public List<ListeningConnector> listeningConnectors() {
ArrayList<ListeningConnector> list = new ArrayList<ListeningConnector>(1);
list.add(new SocketListeningConnectorImpl(this));
@@ -215,6 +222,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#defaultConnector()
*/
+ @Override
public LaunchingConnector defaultConnector() {
return new SocketLaunchingConnectorImpl(this);
}
@@ -230,6 +238,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#createVirtualMachine(com.sun.jdi.connect.spi.Connection)
*/
+ @Override
public VirtualMachine createVirtualMachine(Connection connection) throws IOException {
VirtualMachineImpl vmImpl = new VirtualMachineImpl(connection);
return vmImpl;
@@ -238,6 +247,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.VirtualMachineManager#createVirtualMachine(com.sun.jdi.connect.spi.Connection, java.lang.Process)
*/
+ @Override
public VirtualMachine createVirtualMachine(Connection connection, Process process) throws IOException {
VirtualMachineImpl vmImpl = new VirtualMachineImpl(connection);
vmImpl.setLaunchedProcess(process);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
index 247755f..69e5f0e 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -63,11 +63,13 @@
* @return Returns a human-readable description of this connector and its
* purpose.
*/
+ @Override
public abstract String description();
/**
* @return Returns a short identifier for the connector.
*/
+ @Override
public abstract String name();
/**
@@ -81,6 +83,7 @@
* @return Returns the transport mechanism used by this connector to
* establish connections with a target VM.
*/
+ @Override
public Transport transport() {
return fTransport;
}
@@ -128,6 +131,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#name()
*/
+ @Override
public String name() {
return fName;
}
@@ -135,6 +139,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#description()
*/
+ @Override
public String description() {
return fDescription;
}
@@ -142,6 +147,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#label()
*/
+ @Override
public String label() {
return fLabel;
}
@@ -149,6 +155,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#mustSpecify()
*/
+ @Override
public boolean mustSpecify() {
return fMustSpecify;
}
@@ -156,16 +163,19 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#value()
*/
+ @Override
public abstract String value();
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#setValue(java.lang.String)
*/
+ @Override
public abstract void setValue(String value);
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.Argument#isValid(java.lang.String)
*/
+ @Override
public abstract boolean isValid(String value);
@Override
@@ -246,6 +256,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#intValue()
*/
+ @Override
public int intValue() {
return fValue.intValue();
}
@@ -253,6 +264,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#setValue(int)
*/
+ @Override
public void setValue(int value) {
fValue = new Integer(value);
}
@@ -260,6 +272,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#min()
*/
+ @Override
public int min() {
return fMin;
}
@@ -267,6 +280,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#max()
*/
+ @Override
public int max() {
return fMax;
}
@@ -274,6 +288,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#isValid(int)
*/
+ @Override
public boolean isValid(int value) {
return fMin <= value && value <= fMax;
}
@@ -281,6 +296,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.IntegerArgument#stringValueOf(int)
*/
+ @Override
public String stringValueOf(int value) {
return new Integer(value).toString();
}
@@ -318,6 +334,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.BooleanArgument#booleanValue()
*/
+ @Override
public boolean booleanValue() {
return fValue.booleanValue();
}
@@ -325,6 +342,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.BooleanArgument#setValue(boolean)
*/
+ @Override
public void setValue(boolean value) {
fValue = Boolean.valueOf(value);
}
@@ -332,6 +350,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.BooleanArgument#stringValueOf(boolean)
*/
+ @Override
public String stringValueOf(boolean value) {
return Boolean.valueOf(value).toString();
}
@@ -350,6 +369,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector.SelectedArgument#choices()
*/
+ @Override
public List<String> choices() {
return fChoices;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
index 01c18e9..81346c9 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,6 +78,7 @@
/**
* Thread's run method.
*/
+ @Override
public void run() {
try {
while (!VMIsDisconnected()) {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java
index 603682f..62b755a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,6 +48,7 @@
/**
* Thread's run method.
*/
+ @Override
public void run() {
while (!VMIsDisconnected()) {
try {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
index 4f04438..bc63e3d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketAttachingConnectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.Connector#defaultArguments()
*/
+ @Override
public Map<String, Connector.Argument> defaultArguments() {
HashMap<String, Connector.Argument> arguments = new HashMap<String, Connector.Argument>(2);
@@ -126,6 +127,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.AttachingConnector#attach(java.util.Map)
*/
+ @Override
public VirtualMachine attach(Map<String,? extends Connector.Argument> connectionArgs) throws IOException,
IllegalConnectorArgumentsException {
getConnectionArguments(connectionArgs);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java
index 2aec11c..439af3c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@
/**
* @return Returns the default arguments.
*/
+ @Override
public Map<String, Connector.Argument> defaultArguments() {
HashMap<String, Connector.Argument> arguments = new HashMap<String, Connector.Argument>(6);
@@ -165,6 +166,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.LaunchingConnector#launch(java.util.Map)
*/
+ @Override
public VirtualMachine launch(Map<String,? extends Connector.Argument> connectionArgs) throws IOException,
IllegalConnectorArgumentsException, VMStartException {
getConnectionArguments(connectionArgs);
@@ -222,18 +224,9 @@
* @since 3.2
*/
public static int findFreePort() {
- ServerSocket socket = null;
- try {
- socket = new ServerSocket(0);
+ try (ServerSocket socket = new ServerSocket(0)) {
return socket.getLocalPort();
} catch (IOException e) {
- } finally {
- if (socket != null) {
- try {
- socket.close();
- } catch (IOException e) {
- }
- }
}
return -1;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
index c999224..92c141c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@
/**
* @return Returns the default arguments.
*/
+ @Override
public Map<String, Connector.Argument> defaultArguments() {
HashMap<String, Connector.Argument> arguments = new HashMap<String, Connector.Argument>(1);
@@ -122,6 +123,7 @@
* @return Returns the address at which the connector is listening for a
* connection.
*/
+ @Override
public String startListening(Map<String, ? extends Connector.Argument> connectionArgs) throws IOException, IllegalConnectorArgumentsException {
getConnectionArguments(connectionArgs);
String result = null;
@@ -138,6 +140,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.ListeningConnector#stopListening(java.util.Map)
*/
+ @Override
public void stopListening(Map<String, ? extends Connector.Argument> connectionArgs) throws IOException {
((SocketTransportImpl) fTransport).stopListening();
}
@@ -147,6 +150,7 @@
*
* @return Returns a connected Virtual Machine.
*/
+ @Override
public VirtualMachine accept(Map<String, ? extends Connector.Argument> connectionArgs) throws IOException, IllegalConnectorArgumentsException {
getConnectionArguments(connectionArgs);
SocketConnection connection = (SocketConnection) ((SocketTransportImpl) fTransport)
@@ -158,6 +162,7 @@
* @return Returns whether this listening connector supports multiple
* connections for a single argument map.
*/
+ @Override
public boolean supportsMultipleConnections() {
return true;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java
index ef66202..2634bb1 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/**
* @return Returns the default arguments.
*/
+ @Override
public Map<String, Connector.Argument> defaultArguments() {
HashMap<String, Connector.Argument> arguments = new HashMap<String, Connector.Argument>(3);
@@ -126,6 +127,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.connect.LaunchingConnector#launch(java.util.Map)
*/
+ @Override
public VirtualMachine launch(Map<String,? extends Connector.Argument> connectionArgs) throws IOException,
IllegalConnectorArgumentsException, VMStartException {
getConnectionArguments(connectionArgs);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
index 4307d98..dcb12d3 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@
*
* @see com.sun.jdi.connect.Transport#name()
*/
+ @Override
public String name() {
return TRANSPORT_NAME;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java
index 6702e64..b0c62a8 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -142,6 +142,7 @@
final IOException[] ex = new IOException[1];
Thread attachThread = new Thread(new Runnable() {
+ @Override
public void run() {
try {
fSocket = new Socket(host, port);
@@ -177,6 +178,7 @@
final boolean[] handshakeCompleted = new boolean[1];
Thread t = new Thread(new Runnable() {
+ @Override
public void run() {
try {
writeHandshake(out);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java
index 381d3e1..686a446 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/TransportImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
/**
* @return Returns a short identifier for the transport.
*/
+ @Override
public String name() {
return fName;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassPrepareEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassPrepareEventImpl.java
index 742a805..0fdd93f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassPrepareEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassPrepareEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -63,6 +63,7 @@
/**
* @return Returns the reference type for which this event was generated.
*/
+ @Override
public ReferenceType referenceType() {
return fReferenceType;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassUnloadEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassUnloadEventImpl.java
index 7b69f98..a570b06 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassUnloadEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ClassUnloadEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -58,6 +58,7 @@
/**
* @return Returns the name of the class that has been unloaded.
*/
+ @Override
public String className() {
return TypeImpl.signatureToName(fSignature);
}
@@ -66,6 +67,7 @@
* @return Returns the JNI-style signature of the class that has been
* unloaded.
*/
+ @Override
public String classSignature() {
return fSignature;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
index 30dfd97..bac2fe1 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
@@ -198,6 +198,7 @@
* @return Returns EventRequest that caused this event to be generated by
* the Virtual Machine.
*/
+ @Override
public EventRequest request() {
return fRequest;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java
index 9c01beb..36ab027 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventIteratorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@
/**
* @return Returns next Event from EventSet.
*/
+ @Override
public Event nextEvent() {
return fIterator.next();
}
@@ -41,6 +42,7 @@
/**
* @see java.util.Iterator#hasNext()
*/
+ @Override
public boolean hasNext() {
return fIterator.hasNext();
}
@@ -48,6 +50,7 @@
/**
* @see java.util.Iterator#next()
*/
+ @Override
public Event next() {
return fIterator.next();
}
@@ -57,6 +60,7 @@
* @exception UnsupportedOperationException
* always thrown since EventSets are unmodifiable.
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException(
EventMessages.EventIteratorImpl_EventSets_are_unmodifiable_1);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
index 4d2b782..3f11ff8 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,6 +42,7 @@
/*
* @return Returns next EventSet from Virtual Machine.
*/
+ @Override
public EventSet remove() throws InterruptedException {
return remove(PacketReceiveManager.TIMEOUT_INFINITE);
}
@@ -50,6 +51,7 @@
* @return Returns next EventSet from Virtual Machine, returns null if times
* out.
*/
+ @Override
public EventSet remove(long timeout) throws InterruptedException {
// Return a received EventSet or null if no EventSet is received in
// time.
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventSetImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventSetImpl.java
index c763d23..4129b40 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventSetImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventSetImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,6 +68,7 @@
/**
* @return Returns iterator over events.
*/
+ @Override
public EventIterator eventIterator() {
return new EventIteratorImpl(fEvents.listIterator());
}
@@ -75,6 +76,7 @@
/**
* @return Returns which threads were suspended by this composite event.
*/
+ @Override
public int suspendPolicy() {
switch (fSuspendPolicy) {
case EventRequestImpl.SUSPENDPOL_NONE_JDWP:
@@ -93,6 +95,7 @@
/**
* Resumes threads that were suspended by this event set.
*/
+ @Override
public void resume() {
switch (fSuspendPolicy) {
case EventRequestImpl.SUSPENDPOL_NONE_JDWP:
@@ -183,6 +186,7 @@
/**
* @see java.util.Collection
*/
+ @Override
public boolean contains(Object event) {
return fEvents.contains(event);
}
@@ -190,6 +194,7 @@
/* (non-Javadoc)
* @see java.util.Collection#containsAll(java.util.Collection)
*/
+ @Override
public boolean containsAll(Collection<?> events) {
return fEvents.containsAll(events);
}
@@ -214,6 +219,7 @@
/**
* @see java.util.Collection
*/
+ @Override
public boolean isEmpty() {
return fEvents.isEmpty();
}
@@ -221,6 +227,7 @@
/**
* @see java.util.Collection#iterator()
*/
+ @Override
public Iterator<Event> iterator() {
return fEvents.iterator();
}
@@ -228,6 +235,7 @@
/**
* @see java.util.Collection#size()
*/
+ @Override
public int size() {
return fEvents.size();
}
@@ -235,6 +243,7 @@
/**
* @see java.util.Collection#toArray()
*/
+ @Override
public Object[] toArray() {
return fEvents.toArray();
}
@@ -244,6 +253,7 @@
* @exception UnsupportedOperationException
* always thrown since EventSets are unmodifiable.
*/
+ @Override
public void clear() {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
@@ -254,6 +264,7 @@
* @exception UnsupportedOperationException
* always thrown since EventSets are unmodifiable.
*/
+ @Override
public boolean remove(Object arg1) {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
@@ -264,6 +275,7 @@
* @exception UnsupportedOperationException
* always thrown since EventSets are unmodifiable.
*/
+ @Override
public boolean removeAll(Collection<?> arg1) {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
@@ -274,6 +286,7 @@
* @exception UnsupportedOperationException
* always thrown since EventSets are unmodifiable.
*/
+ @Override
public boolean retainAll(Collection<?> arg1) {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
@@ -282,6 +295,7 @@
/* (non-Javadoc)
* @see java.util.Collection#toArray(T[])
*/
+ @Override
public <T> T[] toArray(T[] a) {
return fEvents.toArray(a);
}
@@ -289,6 +303,7 @@
/* (non-Javadoc)
* @see java.util.Collection#add(java.lang.Object)
*/
+ @Override
public boolean add(Event o) {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
@@ -297,6 +312,7 @@
/* (non-Javadoc)
* @see java.util.Collection#addAll(java.util.Collection)
*/
+ @Override
public boolean addAll(Collection<? extends Event> c) {
throw new UnsupportedOperationException(
EventMessages.EventSetImpl_EventSets_are_unmodifiable_3);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ExceptionEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ExceptionEventImpl.java
index 896e392..2a38360 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ExceptionEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ExceptionEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,6 +64,7 @@
/**
* @return Returns the location where the exception will be caught.
*/
+ @Override
public Location catchLocation() {
return fCatchLocation;
}
@@ -71,6 +72,7 @@
/**
* @return Returns the thrown exception object.
*/
+ @Override
public ObjectReference exception() {
return fException;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/LocatableEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/LocatableEventImpl.java
index f5cd802..f3d30a4 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/LocatableEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/LocatableEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,6 +51,7 @@
/**
* @return Returns Location where event occurred.
*/
+ @Override
public Location location() {
return fLocation;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodEntryEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodEntryEventImpl.java
index b1551ad..e2b2110 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodEntryEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodEntryEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -53,6 +53,7 @@
/**
* @return Returns the method that was entered.
*/
+ @Override
public Method method() {
return fLocation.method();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodExitEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodExitEventImpl.java
index 13fe6e4..eb8a862 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodExitEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MethodExitEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,6 +72,7 @@
/**
* @return Returns the method that was entered.
*/
+ @Override
public Method method() {
return fLocation.method();
}
@@ -80,6 +81,7 @@
* @see com.sun.jdi.event.MethodExitEvent#returnValue()
* @since 3.3
*/
+ @Override
public Value returnValue() {
return fReturnValue;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ModificationWatchpointEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ModificationWatchpointEventImpl.java
index 1d14d85..7ce9dd3 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ModificationWatchpointEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/ModificationWatchpointEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -61,6 +61,7 @@
* @return Returns value that will be assigned to the field when the
* instruction completes.
*/
+ @Override
public Value valueToBe() {
return fValueToBe;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnterEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnterEventImpl.java
index 0e5c3ae..f0587a7 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnterEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnterEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@
*
* @see com.sun.jdi.event.MonitorContendedEnterEvent#monitor()
*/
+ @Override
public ObjectReference monitor() {
return fMonitor;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnteredEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnteredEventImpl.java
index d78528f..8ec51c6 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnteredEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorContendedEnteredEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@
*
* @see com.sun.jdi.event.MonitorContendedEnteredEvent#monitor()
*/
+ @Override
public ObjectReference monitor() {
return fMonitor;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitEventImpl.java
index b9bc3f1..23ffbad 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,6 +65,7 @@
*
* @see com.sun.jdi.event.MonitorWaitedEvent#monitor()
*/
+ @Override
public ObjectReference monitor() {
return fMonitor;
}
@@ -74,6 +75,7 @@
*
* @see com.sun.jdi.event.MonitorWaitEvent#timeout()
*/
+ @Override
public long timeout() {
return fTimeOut;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitedEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitedEventImpl.java
index a6f5753..dcebca7 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitedEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/MonitorWaitedEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -73,6 +73,7 @@
*
* @see com.sun.jdi.event.MonitorWaitedEvent#monitor()
*/
+ @Override
public ObjectReference monitor() {
return fMonitor;
}
@@ -82,6 +83,7 @@
*
* @see com.sun.jdi.event.MonitorWaitedEvent#timedout()
*/
+ @Override
public boolean timedout() {
return fTimedOut;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/WatchpointEventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/WatchpointEventImpl.java
index 3680e6b..2ef1db1 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/WatchpointEventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/WatchpointEventImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@
/**
* Returns the field that is about to be accessed/modified.
*/
+ @Override
public Field field() {
return fField;
}
@@ -66,6 +67,7 @@
/**
* Returns the object whose field is about to be accessed/modified.
*/
+ @Override
public ObjectReference object() {
return fObjectReference;
}
@@ -73,6 +75,7 @@
/**
* Current value of the field.
*/
+ @Override
public Value valueCurrent() {
// Note: if field is static, fObjectReference will be null.
if (fObjectReference == null)
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/BreakpointRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/BreakpointRequestImpl.java
index 20e8197..dca970b 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/BreakpointRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/BreakpointRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
/**
* @return Returns location of Breakpoint Request.
*/
+ @Override
public Location location() {
return fLocationFilters.get(0);
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
index c7ea4c5..21f43c6 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -162,6 +162,7 @@
/**
* @return Returns the value of the property with the specified key.
*/
+ @Override
public Object getProperty(Object key) {
if (fPropertyMap == null) {
return null;
@@ -173,6 +174,7 @@
/**
* Add an arbitrary key/value "property" to this request.
*/
+ @Override
public void putProperty(Object key, Object value) {
if (fPropertyMap == null)
fPropertyMap = new HashMap<Object, Object>();
@@ -202,6 +204,7 @@
/**
* Disables event request.
*/
+ @Override
public synchronized void disable() {
if (!isEnabled())
return;
@@ -235,6 +238,7 @@
/**
* Enables event request.
*/
+ @Override
public synchronized void enable() {
if (isEnabled())
return;
@@ -281,6 +285,7 @@
/**
* @return Returns whether event request is enabled.
*/
+ @Override
public synchronized final boolean isEnabled() {
return fRequestID != null;
}
@@ -288,6 +293,7 @@
/**
* Disables or enables event request.
*/
+ @Override
public void setEnabled(boolean enable) {
if (enable)
enable();
@@ -307,6 +313,7 @@
/**
* Sets suspend policy.
*/
+ @Override
public void setSuspendPolicy(int suspendPolicy) {
fSuspendPolicy = (byte) suspendPolicy;
if (isEnabled()) {
@@ -318,6 +325,7 @@
/**
* @return Returns suspend policy.
*/
+ @Override
public int suspendPolicy() {
return fSuspendPolicy;
}
@@ -332,6 +340,7 @@
/**
* Sets countfilter.
*/
+ @Override
public void addCountFilter(int count) throws InvalidRequestStateException {
checkDisabled();
if (fCountFilters == null)
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
index 4d92183..1fb53fd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -124,6 +124,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createAccessWatchpointRequest(com.sun.jdi.Field)
*/
+ @Override
public AccessWatchpointRequest createAccessWatchpointRequest(Field field) {
FieldImpl fieldImpl = (FieldImpl)field;
AccessWatchpointRequestImpl req = new AccessWatchpointRequestImpl(virtualMachineImpl());
@@ -135,6 +136,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createBreakpointRequest(com.sun.jdi.Location)
*/
+ @Override
public BreakpointRequest createBreakpointRequest(Location location) throws VMMismatchException {
LocationImpl locImpl = (LocationImpl)location;
BreakpointRequestImpl req = new BreakpointRequestImpl(virtualMachineImpl());
@@ -146,6 +148,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createClassPrepareRequest()
*/
+ @Override
public ClassPrepareRequest createClassPrepareRequest() {
ClassPrepareRequestImpl req = new ClassPrepareRequestImpl(virtualMachineImpl());
CLASS_PREPARE_TYPE.requests.add(req);
@@ -155,6 +158,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createClassUnloadRequest()
*/
+ @Override
public ClassUnloadRequest createClassUnloadRequest() {
ClassUnloadRequestImpl req = new ClassUnloadRequestImpl(virtualMachineImpl());
CLASS_UNLOAD_TYPE.requests.add(req);
@@ -164,6 +168,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createExceptionRequest(com.sun.jdi.ReferenceType, boolean, boolean)
*/
+ @Override
public ExceptionRequest createExceptionRequest(ReferenceType refType, boolean notifyCaught, boolean notifyUncaught) {
ReferenceTypeImpl refTypeImpl = (ReferenceTypeImpl)refType;
ExceptionRequestImpl req = new ExceptionRequestImpl(virtualMachineImpl());
@@ -175,6 +180,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMethodEntryRequest()
*/
+ @Override
public MethodEntryRequest createMethodEntryRequest() {
MethodEntryRequestImpl req = new MethodEntryRequestImpl(virtualMachineImpl());
METHOD_ENTRY_TYPE.requests.add(req);
@@ -184,6 +190,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMethodExitRequest()
*/
+ @Override
public MethodExitRequest createMethodExitRequest() {
MethodExitRequestImpl req = new MethodExitRequestImpl(virtualMachineImpl());
METHOD_EXIT_TYPE.requests.add(req);
@@ -193,6 +200,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMonitorContendedEnteredRequest()
*/
+ @Override
public MonitorContendedEnteredRequest createMonitorContendedEnteredRequest() {
MonitorContendedEnteredRequestImpl req = new MonitorContendedEnteredRequestImpl(virtualMachineImpl());
MONITOR_CONTENDED_ENTERED_TYPE.requests.add(req);
@@ -202,6 +210,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMonitorContendedEnterRequest()
*/
+ @Override
public MonitorContendedEnterRequest createMonitorContendedEnterRequest() {
MonitorContendedEnterRequestImpl req = new MonitorContendedEnterRequestImpl(virtualMachineImpl());
MONITOR_CONTENDED_ENTER_TYPE.requests.add(req);
@@ -211,6 +220,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMonitorWaitedRequest()
*/
+ @Override
public MonitorWaitedRequest createMonitorWaitedRequest() {
MonitorWaitedRequestImpl req = new MonitorWaitedRequestImpl(virtualMachineImpl());
MONITOR_WAITED_TYPE.requests.add(req);
@@ -220,6 +230,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createMonitorWaitRequest()
*/
+ @Override
public MonitorWaitRequest createMonitorWaitRequest() {
MonitorWaitRequestImpl req = new MonitorWaitRequestImpl(virtualMachineImpl());
MONITOR_WAIT_TYPE.requests.add(req);
@@ -229,6 +240,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createModificationWatchpointRequest(com.sun.jdi.Field)
*/
+ @Override
public ModificationWatchpointRequest createModificationWatchpointRequest(Field field) {
FieldImpl fieldImpl = (FieldImpl)field;
ModificationWatchpointRequestImpl req = new ModificationWatchpointRequestImpl(virtualMachineImpl());
@@ -240,6 +252,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createStepRequest(com.sun.jdi.ThreadReference, int, int)
*/
+ @Override
public StepRequest createStepRequest(ThreadReference thread, int size, int depth) throws DuplicateRequestException, ObjectCollectedException {
ThreadReferenceImpl threadImpl = (ThreadReferenceImpl)thread;
StepRequestImpl req = new StepRequestImpl(virtualMachineImpl());
@@ -251,6 +264,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createThreadDeathRequest()
*/
+ @Override
public ThreadDeathRequest createThreadDeathRequest() {
ThreadDeathRequestImpl req = new ThreadDeathRequestImpl(virtualMachineImpl());
THREAD_DEATH_TYPE.requests.add(req);
@@ -260,6 +274,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#createThreadStartRequest()
*/
+ @Override
public ThreadStartRequest createThreadStartRequest() {
ThreadStartRequestImpl req = new ThreadStartRequestImpl(virtualMachineImpl());
THREAD_START_TYPE.requests.add(req);
@@ -269,6 +284,7 @@
/*
* @see EventRequestManager#createVMDeathRequest()
*/
+ @Override
public VMDeathRequest createVMDeathRequest() {
VMDeathRequestImpl req = new VMDeathRequestImpl(virtualMachineImpl());
VM_DEATH_TYPE.requests.add(req);
@@ -278,6 +294,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdi.hcr.EventRequestManager#createReenterStepRequest(com.sun.jdi.ThreadReference)
*/
+ @Override
public org.eclipse.jdi.hcr.ReenterStepRequest createReenterStepRequest(ThreadReference thread) {
virtualMachineImpl().checkHCRSupported();
ThreadReferenceImpl threadImpl = (ThreadReferenceImpl)thread;
@@ -340,6 +357,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#deleteAllBreakpoints()
*/
+ @Override
public void deleteAllBreakpoints() {
EventRequestImpl.clearAllBreakpoints(this);
BREAKPOINT_TYPE.clear();
@@ -361,6 +379,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#deleteEventRequest(com.sun.jdi.request.EventRequest)
*/
+ @Override
public void deleteEventRequest(EventRequest req) {
// Disable request, note that this also causes the event request to be removed from fEnabledRequests.
try {
@@ -406,6 +425,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#deleteEventRequests(java.util.List)
*/
+ @Override
public void deleteEventRequests(List<? extends EventRequest> requests) throws VMMismatchException {
Iterator<? extends EventRequest> iter = requests.iterator();
while(iter.hasNext()) {
@@ -417,6 +437,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#accessWatchpointRequests()
*/
+ @Override
public List<AccessWatchpointRequest> accessWatchpointRequests() {
return ACCESS_WATCHPOINT_TYPE.getUnmodifiableList();
}
@@ -424,6 +445,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#breakpointRequests()
*/
+ @Override
public List<BreakpointRequest> breakpointRequests() {
return BREAKPOINT_TYPE.getUnmodifiableList();
}
@@ -431,6 +453,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#classPrepareRequests()
*/
+ @Override
public List<ClassPrepareRequest> classPrepareRequests() {
return CLASS_PREPARE_TYPE.getUnmodifiableList();
}
@@ -438,6 +461,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#classUnloadRequests()
*/
+ @Override
public List<ClassUnloadRequest> classUnloadRequests() {
return CLASS_UNLOAD_TYPE.getUnmodifiableList();
}
@@ -445,6 +469,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#exceptionRequests()
*/
+ @Override
public List<ExceptionRequest> exceptionRequests() {
return EXCEPTION_TYPE.getUnmodifiableList();
}
@@ -452,6 +477,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#methodEntryRequests()
*/
+ @Override
public List<MethodEntryRequest> methodEntryRequests() {
return METHOD_ENTRY_TYPE.getUnmodifiableList();
}
@@ -459,6 +485,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#methodExitRequests()
*/
+ @Override
public List<MethodExitRequest> methodExitRequests() {
return METHOD_EXIT_TYPE.getUnmodifiableList();
}
@@ -466,6 +493,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#modificationWatchpointRequests()
*/
+ @Override
public List<ModificationWatchpointRequest> modificationWatchpointRequests() {
return MODIFICATION_WATCHPOINT_TYPE.getUnmodifiableList();
}
@@ -473,6 +501,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#stepRequests()
*/
+ @Override
public List<StepRequest> stepRequests() {
return STEP_TYPE.getUnmodifiableList();
}
@@ -480,6 +509,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#threadDeathRequests()
*/
+ @Override
public List<ThreadDeathRequest> threadDeathRequests() {
return THREAD_DEATH_TYPE.getUnmodifiableList();
}
@@ -487,6 +517,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#threadStartRequests()
*/
+ @Override
public List<ThreadStartRequest> threadStartRequests() {
return THREAD_START_TYPE.getUnmodifiableList();
}
@@ -494,6 +525,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#vmDeathRequests()
*/
+ @Override
public List<VMDeathRequest> vmDeathRequests() {
return VM_DEATH_TYPE.getUnmodifiableList();
}
@@ -501,6 +533,7 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#monitorContendedEnterRequests()
*/
+ @Override
public List<MonitorContendedEnterRequest> monitorContendedEnterRequests() {
return MONITOR_CONTENDED_ENTER_TYPE.getUnmodifiableList();
}
@@ -508,21 +541,24 @@
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#monitorContendedEnteredRequests()
*/
- public List<MonitorContendedEnteredRequest> monitorContendedEnteredRequests() {
+ @Override
+ public List<MonitorContendedEnteredRequest> monitorContendedEnteredRequests() {
return MONITOR_CONTENDED_ENTERED_TYPE.getUnmodifiableList();
}
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#monitorWaitRequests()
*/
- public List<MonitorWaitRequest> monitorWaitRequests() {
+ @Override
+ public List<MonitorWaitRequest> monitorWaitRequests() {
return MONITOR_WAIT_TYPE.getUnmodifiableList();
}
/* (non-Javadoc)
* @see com.sun.jdi.request.EventRequestManager#monitorWaitedRequests()
*/
- public List<MonitorWaitedRequest> monitorWaitedRequests() {
+ @Override
+ public List<MonitorWaitedRequest> monitorWaitedRequests() {
return MONITOR_WAITED_TYPE.getUnmodifiableList();
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/ExceptionRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/ExceptionRequestImpl.java
index 9f363da..8e45c61 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/ExceptionRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/ExceptionRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/**
* Returns exception type for which exception events are requested.
*/
+ @Override
public ReferenceType exception() {
return fExceptionFilters.get(0).fException;
}
@@ -40,6 +41,7 @@
/**
* @return Returns true if caught exceptions will be reported.
*/
+ @Override
public boolean notifyCaught() {
return fExceptionFilters.get(0).fNotifyCaught;
}
@@ -47,6 +49,7 @@
/**
* @return Returns true if uncaught exceptions will be reported.
*/
+ @Override
public boolean notifyUncaught() {
return fExceptionFilters.get(0).fNotifyUncaught;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/StepRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/StepRequestImpl.java
index ad0604d..d83a50b 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/StepRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/StepRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@
/**
* @return Returns the relative call stack limit.
*/
+ @Override
public int depth() {
return fThreadStepFilters.get(0).fThreadStepDepth;
}
@@ -46,6 +47,7 @@
/**
* @return Returns the size of each step.
*/
+ @Override
public int size() {
return fThreadStepFilters.get(0).fThreadStepSize;
}
@@ -53,6 +55,7 @@
/**
* @return Returns ThreadReference of thread in which to step.
*/
+ @Override
public ThreadReference thread() {
return fThreadStepFilters.get(0).fThread;
}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/WatchpointRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/WatchpointRequestImpl.java
index a9fc54f..3e7017a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/WatchpointRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/WatchpointRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@
/**
* @return Returns field for which Watchpoint requests is issued.
*/
+ @Override
public Field field() {
return fFieldFilters.get(0);
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaMethodBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaMethodBreakpoint.java
index 3131c5a..2abd144 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaMethodBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaMethodBreakpoint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,6 +62,7 @@
* underlying marker
* @see IJavaBreakpoint#getTypeName()
*/
+ @Override
public String getTypeName() throws CoreException;
/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/JDIDebugModel.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/JDIDebugModel.java
index 8043922..cf31430 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/JDIDebugModel.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/JDIDebugModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -179,6 +179,7 @@
final boolean resume) {
final IJavaDebugTarget[] target = new IJavaDebugTarget[1];
IWorkspaceRunnable r = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor m) {
target[0] = new JDIDebugTarget(launch, vm, name,
allowTerminate, allowDisconnect, process, resume);
@@ -319,9 +320,8 @@
String typeName, int lineNumber, int charStart, int charEnd,
int hitCount, boolean register, Map<String, Object> attributes)
throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaLineBreakpoint(resource, typeName, lineNumber,
charStart, charEnd, hitCount, register, attributes);
}
@@ -381,9 +381,8 @@
IResource resource, String sourceName, String pattern,
int lineNumber, int charStart, int charEnd, int hitCount,
boolean register, Map<String, Object> attributes) throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaPatternBreakpoint(resource, sourceName, pattern,
lineNumber, charStart, charEnd, hitCount, register, attributes);
}
@@ -466,9 +465,8 @@
String sourcePath, String classNamePattern, int lineNumber,
int charStart, int charEnd, int hitCount, boolean register,
Map<String, Object> attributes) throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaStratumLineBreakpoint(resource, stratum, sourceName,
sourcePath, classNamePattern, lineNumber, charStart, charEnd,
hitCount, register, attributes);
@@ -523,9 +521,8 @@
IResource resource, String sourceName, int lineNumber,
int charStart, int charEnd, int hitCount, boolean register,
Map<String, Object> attributes) throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaTargetPatternBreakpoint(resource, sourceName,
lineNumber, charStart, charEnd, hitCount, register, attributes);
}
@@ -571,9 +568,8 @@
IResource resource, String exceptionName, boolean caught,
boolean uncaught, boolean checked, boolean register, Map<String, Object> attributes)
throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaExceptionBreakpoint(resource, exceptionName, caught,
uncaught, checked, register, attributes);
}
@@ -634,9 +630,8 @@
String typeName, String fieldName, int lineNumber, int charStart,
int charEnd, int hitCount, boolean register, Map<String, Object> attributes)
throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaWatchpoint(resource, typeName, fieldName, lineNumber,
charStart, charEnd, hitCount, register, attributes);
}
@@ -705,9 +700,8 @@
boolean nativeOnly, int lineNumber, int charStart, int charEnd,
int hitCount, boolean register, Map<String, Object> attributes)
throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaMethodBreakpoint(resource, typePattern, methodName,
methodSignature, entry, exit, nativeOnly, lineNumber,
charStart, charEnd, hitCount, register, attributes);
@@ -765,9 +759,8 @@
String methodSignature, int lineNumber, int charStart, int charEnd,
int hitCount, boolean register, Map<String, Object> attributes)
throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaMethodEntryBreakpoint(resource, typeName, methodName,
methodSignature, lineNumber, charStart, charEnd, hitCount,
register, attributes);
@@ -798,19 +791,16 @@
.getBreakpointManager();
IBreakpoint[] breakpoints = manager.getBreakpoints(modelId);
for (int i = 0; i < breakpoints.length; i++) {
- if (!(breakpoints[i] instanceof IJavaLineBreakpoint)) {
+ if (!(breakpoints[i] instanceof IJavaLineBreakpoint))
continue;
- }
IJavaLineBreakpoint breakpoint = (IJavaLineBreakpoint) breakpoints[i];
IMarker marker = breakpoint.getMarker();
if (marker != null && marker.exists()
&& marker.getType().equals(markerType)) {
String breakpointTypeName = breakpoint.getTypeName();
- if (JavaDebugUtils.typeNamesEqual(breakpointTypeName, typeName) || (breakpointTypeName != null && breakpointTypeName.startsWith(typeName + '$'))) {
- if (breakpoint.getLineNumber() == lineNumber) {
+ if (JavaDebugUtils.typeNamesEqual(breakpointTypeName, typeName) || (breakpointTypeName != null && breakpointTypeName.startsWith(typeName + '$')))
+ if (breakpoint.getLineNumber() == lineNumber)
return breakpoint;
- }
- }
}
}
return null;
@@ -844,9 +834,8 @@
.getBreakpointManager();
IBreakpoint[] breakpoints = manager.getBreakpoints(modelId);
for (int i = 0; i < breakpoints.length; i++) {
- if (!(breakpoints[i] instanceof IJavaLineBreakpoint)) {
+ if (!(breakpoints[i] instanceof IJavaLineBreakpoint))
continue;
- }
IJavaLineBreakpoint breakpoint = (IJavaLineBreakpoint) breakpoints[i];
IMarker marker = breakpoint.getMarker();
if (marker != null && marker.exists()
@@ -854,9 +843,8 @@
String breakpointTypeName = breakpoint.getTypeName();
if ((JavaDebugUtils.typeNamesEqual(breakpointTypeName, typeName) || (breakpointTypeName != null && breakpointTypeName.startsWith(typeName + '$')))
&& breakpoint.getLineNumber() == lineNumber
- && resource.equals(marker.getResource())) {
+ && resource.equals(marker.getResource()))
return breakpoint;
- }
}
}
return null;
@@ -884,9 +872,8 @@
@Deprecated
public static Preferences getPreferences() {
JDIDebugPlugin deflt = JDIDebugPlugin.getDefault();
- if (deflt != null) {
+ if (deflt != null)
return deflt.getPluginPreferences();
- }
return null;
}
@@ -913,13 +900,12 @@
@Deprecated
public static void savePreferences() {
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(JDIDebugPlugin.getUniqueIdentifier());
- if(node != null) {
+ if(node != null)
try {
node.flush();
} catch (BackingStoreException bse) {
JDIDebugPlugin.log(bse);
}
- }
}
/**
@@ -962,9 +948,8 @@
public static IJavaClassPrepareBreakpoint createClassPrepareBreakpoint(
IResource resource, String typeName, int memberType, int charStart,
int charEnd, boolean register, Map<String, Object> attributes) throws CoreException {
- if (attributes == null) {
+ if (attributes == null)
attributes = new HashMap<String, Object>(10);
- }
return new JavaClassPrepareBreakpoint(resource, typeName, memberType,
charStart, charEnd, register, attributes);
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java
index 8fb3c07..c5af456 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/EventDispatcher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -227,6 +227,7 @@
*
* @see #shutdown()
*/
+ @Override
public void run() {
VirtualMachine vm = fTarget.getVM();
if (vm != null) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugOptions.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugOptions.java
index 35ccbb6..88549d2 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugOptions.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugOptions.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -60,6 +60,7 @@
/* (non-Javadoc)
* @see org.eclipse.osgi.service.debug.DebugOptionsListener#optionsChanged(org.eclipse.osgi.service.debug.DebugOptions)
*/
+ @Override
public void optionsChanged(DebugOptions options) {
fgDebugTrace = options.newDebugTrace(JDIDebugPlugin.getUniqueIdentifier());
DEBUG = options.getBooleanOption(DEBUG_FLAG, false);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java
index 0c86a1d..f3b8474 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JDIDebugPlugin.java
@@ -274,16 +274,20 @@
new JDIDebugOptions(context);
ResourcesPlugin.getWorkspace().addSaveParticipant(getUniqueIdentifier(),
new ISaveParticipant() {
+ @Override
public void doneSaving(ISaveContext c) {
}
+ @Override
public void prepareToSave(ISaveContext c)
throws CoreException {
}
+ @Override
public void rollback(ISaveContext c) {
}
+ @Override
public void saving(ISaveContext c) throws CoreException {
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(getUniqueIdentifier());
if(node != null) {
@@ -356,6 +360,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(JDIDebugModel.PREF_REQUEST_TIMEOUT)) {
int value = Platform.getPreferencesService().getInt(
@@ -592,12 +597,14 @@
/**
* @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
*/
+ @Override
public void handleException(Throwable exception) {
}
/**
* @see org.eclipse.core.runtime.ISafeRunnable#run()
*/
+ @Override
public void run() throws Exception {
switch (fKind) {
case ADDING:
@@ -660,12 +667,14 @@
/**
* @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
*/
+ @Override
public void handleException(Throwable exception) {
}
/**
* @see org.eclipse.core.runtime.ISafeRunnable#run()
*/
+ @Override
public void run() throws Exception {
fInstall = fInstall
| getListener().installingBreakpoint(fTarget,
@@ -716,12 +725,14 @@
/**
* @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
*/
+ @Override
public void handleException(Throwable exception) {
}
/**
* @see org.eclipse.core.runtime.ISafeRunnable#run()
*/
+ @Override
public void run() throws Exception {
if (fThread instanceof JDIThread) {
if (((JDIThread) fThread).hasClientRequestedSuspend()) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugPropertyTester.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugPropertyTester.java
index d1f2582..db2d768 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugPropertyTester.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugPropertyTester.java
@@ -26,6 +26,7 @@
* @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object,
* java.lang.String, java.lang.Object[], java.lang.Object)
*/
+ @Override
public boolean test(Object receiver, String property, Object[] args,
Object expectedValue) {
if (property.equals("isMultiStrata")) { //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java
index 155b2b0..c15e4bf 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/BreakpointListenerManager.java
@@ -93,6 +93,7 @@
* (org.eclipse.jdt.debug.core.IJavaDebugTarget,
* org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void addingBreakpoint(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
IJavaBreakpointListener delegate = getDelegate();
@@ -122,6 +123,7 @@
* (org.eclipse.jdt.debug.core.IJavaLineBreakpoint,
* org.eclipse.jdt.core.dom.Message[])
*/
+ @Override
public void breakpointHasCompilationErrors(
IJavaLineBreakpoint breakpoint, Message[] errors) {
IJavaBreakpointListener delegate = getDelegate();
@@ -138,6 +140,7 @@
* (org.eclipse.jdt.debug.core.IJavaLineBreakpoint,
* org.eclipse.debug.core.DebugException)
*/
+ @Override
public void breakpointHasRuntimeException(
IJavaLineBreakpoint breakpoint, DebugException exception) {
IJavaBreakpointListener delegate = getDelegate();
@@ -154,6 +157,7 @@
* org.eclipse.jdt.debug.core.IJavaThread,
* org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
IJavaBreakpointListener delegate = getDelegate();
if (delegate != null) {
@@ -170,6 +174,7 @@
* (org.eclipse.jdt.debug.core.IJavaDebugTarget,
* org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointInstalled(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
IJavaBreakpointListener delegate = getDelegate();
@@ -186,6 +191,7 @@
* (org.eclipse.jdt.debug.core.IJavaDebugTarget,
* org.eclipse.jdt.debug.core.IJavaBreakpoint)
*/
+ @Override
public void breakpointRemoved(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
IJavaBreakpointListener delegate = getDelegate();
@@ -203,6 +209,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint,
* org.eclipse.jdt.debug.core.IJavaType)
*/
+ @Override
public int installingBreakpoint(IJavaDebugTarget target,
IJavaBreakpoint breakpoint, IJavaType type) {
IJavaBreakpointListener delegate = getDelegate();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
index 23ee625..703f298 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
@@ -77,6 +77,7 @@
fBreakpoint = breakpoint;
}
+ @Override
public void evaluationComplete(IEvaluationResult result) {
fVote = determineVote(result);
synchronized (fLock) {
@@ -164,18 +165,22 @@
}
}
+ @Override
public void addingBreakpoint(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint,
Message[] errors) {
}
+ @Override
public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint,
DebugException exception) {
}
+ @Override
public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
if (breakpoint instanceof IJavaLineBreakpoint) {
JavaLineBreakpoint lineBreakpoint = (JavaLineBreakpoint) breakpoint;
@@ -250,14 +255,17 @@
return SUSPEND;
}
+ @Override
public void breakpointInstalled(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
}
+ @Override
public void breakpointRemoved(IJavaDebugTarget target,
IJavaBreakpoint breakpoint) {
}
+ @Override
public int installingBreakpoint(IJavaDebugTarget target,
IJavaBreakpoint breakpoint, IJavaType type) {
return 0;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
index e5aa214..899c0c4 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
@@ -178,6 +178,7 @@
*
* @see org.eclipse.debug.core.model.IBreakpoint#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -287,6 +288,7 @@
* .sun.jdi.event.Event,
* org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget)
*/
+ @Override
public boolean handleEvent(Event event, JDIDebugTarget target,
boolean suspendVote, EventSet eventSet) {
if (event instanceof ClassPrepareEvent) {
@@ -319,6 +321,7 @@
* (com.sun.jdi.event.Event,
* org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget, boolean)
*/
+ @Override
public void eventSetComplete(Event event, JDIDebugTarget target,
boolean suspend, EventSet eventSet) {
ThreadReference threadRef = null;
@@ -835,6 +838,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#isInstalled()
*/
+ @Override
public boolean isInstalled() throws CoreException {
return ensureMarker().getAttribute(INSTALL_COUNT, 0) > 0;
}
@@ -884,6 +888,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getTypeName()
*/
+ @Override
public String getTypeName() throws CoreException {
if (fInstalledTypeName == null) {
return ensureMarker().getAttribute(TYPE_NAME, null);
@@ -934,6 +939,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getHitCount()
*/
+ @Override
public int getHitCount() throws CoreException {
return ensureMarker().getAttribute(HIT_COUNT, -1);
}
@@ -943,6 +949,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#setHitCount(int)
*/
+ @Override
public void setHitCount(int count) throws CoreException {
if (getHitCount() != count) {
if (!isEnabled() && count > -1) {
@@ -988,6 +995,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getSuspendPolicy()
*/
+ @Override
public int getSuspendPolicy() throws CoreException {
return ensureMarker().getAttribute(SUSPEND_POLICY,
IJavaBreakpoint.SUSPEND_THREAD);
@@ -998,6 +1006,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#setSuspendPolicy(int)
*/
+ @Override
public void setSuspendPolicy(int suspendPolicy) throws CoreException {
if (getSuspendPolicy() != suspendPolicy) {
setAttribute(SUSPEND_POLICY, suspendPolicy);
@@ -1085,6 +1094,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#setThreadFilter(org.eclipse
* .jdt.debug.core.IJavaThread)
*/
+ @Override
public void setThreadFilter(IJavaThread thread) throws CoreException {
if (!(thread.getDebugTarget() instanceof JDIDebugTarget)
|| !(thread instanceof JDIThread)) {
@@ -1113,6 +1123,7 @@
* org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse
* .debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (DebugEvent event : events) {
if (event.getKind() == DebugEvent.TERMINATE) {
@@ -1166,6 +1177,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#getThreadFilter(org.eclipse
* .jdt.debug.core.IJavaDebugTarget)
*/
+ @Override
public IJavaThread getThreadFilter(IJavaDebugTarget target) {
return fFilteredThreadsByTarget.get(target);
}
@@ -1175,6 +1187,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getThreadFilters()
*/
+ @Override
public IJavaThread[] getThreadFilters() {
IJavaThread[] threads = null;
Collection<IJavaThread> values = fFilteredThreadsByTarget.values();
@@ -1190,6 +1203,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#removeThreadFilter(org.eclipse
* .jdt.debug.core.IJavaDebugTarget)
*/
+ @Override
public void removeThreadFilter(IJavaDebugTarget javaTarget)
throws CoreException {
if (!(javaTarget instanceof JDIDebugTarget)) {
@@ -1233,6 +1247,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#addInstanceFilter(org.eclipse
* .jdt.debug.core.IJavaObject)
*/
+ @Override
public void addInstanceFilter(IJavaObject object) throws CoreException {
if (fInstanceFilters == null) {
fInstanceFilters = new ArrayList<IJavaObject>();
@@ -1261,6 +1276,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getInstanceFilters()
*/
+ @Override
public IJavaObject[] getInstanceFilters() {
if (fInstanceFilters == null || fInstanceFilters.isEmpty()) {
return fgEmptyInstanceFilters;
@@ -1276,6 +1292,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#removeInstanceFilter(org.eclipse
* .jdt.debug.core.IJavaObject)
*/
+ @Override
public void removeInstanceFilter(IJavaObject object) throws CoreException {
if (fInstanceFilters == null) {
return;
@@ -1347,6 +1364,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#supportsInstanceFilters()
*/
+ @Override
public boolean supportsInstanceFilters() {
return true;
}
@@ -1356,6 +1374,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#supportsThreadFilters()
*/
+ @Override
public boolean supportsThreadFilters() {
return true;
}
@@ -1367,6 +1386,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#addBreakpointListener(java
* .lang.String)
*/
+ @Override
public synchronized void addBreakpointListener(String identifier)
throws CoreException {
if (fBreakpointListenerIds == null) {
@@ -1403,6 +1423,7 @@
* org.eclipse.jdt.debug.core.IJavaBreakpoint#removeBreakpointListener(java
* .lang.String)
*/
+ @Override
public synchronized boolean removeBreakpointListener(String identifier)
throws CoreException {
if (fBreakpointListenerIds != null) {
@@ -1419,6 +1440,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaBreakpoint#getBreakpointListeners()
*/
+ @Override
public synchronized String[] getBreakpointListeners() throws CoreException {
// use the cache in case the underlying marker has been deleted
if (fBreakpointListenerIds == null) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java
index aaea7f7..881b4cf 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java
@@ -471,6 +471,7 @@
* org.eclipse.debug.core.model.IBreakpointImportParticipant#matches(java
* .util.Map, org.eclipse.debug.core.model.IBreakpoint)
*/
+ @Override
public boolean matches(Map<String, Object> attributes, IBreakpoint breakpoint)
throws CoreException {
if (attributes == null || breakpoint == null) {
@@ -528,6 +529,7 @@
* org.eclipse.debug.core.model.IBreakpointImportParticipant#verify(org.
* eclipse.debug.core.model.IBreakpoint)
*/
+ @Override
public void verify(IBreakpoint breakpoint) throws CoreException {
IResource resource = breakpoint.getMarker().getResource();
CompilationUnit unit = null;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
index 0e78a21..67d2cfb 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
@@ -87,6 +87,7 @@
throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
setMarker(resource.createMarker(JAVA_CLASS_PREPARE_BREAKPOINT));
@@ -242,6 +243,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaClassPrepareBreakpoint#getMemberType()
*/
+ @Override
public int getMemberType() throws CoreException {
return ensureMarker().getAttribute(MEMBER_TYPE,
IJavaClassPrepareBreakpoint.TYPE_CLASS);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
index f289057..7cebf50 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
@@ -151,6 +151,7 @@
final Map<String, Object> attributes) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
setMarker(resource.createMarker(JAVA_EXCEPTION_BREAKPOINT));
@@ -243,6 +244,7 @@
/**
* @see IJavaExceptionBreakpoint#isCaught()
*/
+ @Override
public boolean isCaught() throws CoreException {
return ensureMarker().getAttribute(CAUGHT, false);
}
@@ -250,6 +252,7 @@
/**
* @see IJavaExceptionBreakpoint#setCaught(boolean)
*/
+ @Override
public void setCaught(boolean caught) throws CoreException {
if (caught == isCaught()) {
return;
@@ -291,6 +294,7 @@
/**
* @see IJavaExceptionBreakpoint#isUncaught()
*/
+ @Override
public boolean isUncaught() throws CoreException {
return ensureMarker().getAttribute(UNCAUGHT, false);
}
@@ -298,6 +302,7 @@
/**
* @see IJavaExceptionBreakpoint#setUncaught(boolean)
*/
+ @Override
public void setUncaught(boolean uncaught) throws CoreException {
if (uncaught == isUncaught()) {
return;
@@ -314,6 +319,7 @@
/**
* @see IJavaExceptionBreakpoint#isChecked()
*/
+ @Override
public boolean isChecked() throws CoreException {
return ensureMarker().getAttribute(CHECKED, false);
}
@@ -488,6 +494,7 @@
* org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint#getExceptionTypeName
* ()
*/
+ @Override
public String getExceptionTypeName() {
return fExceptionName;
}
@@ -496,6 +503,7 @@
* @see IJavaExceptionBreakpoint#getFilters()
* @deprecated
*/
+ @Override
@Deprecated
public String[] getFilters() {
String[] iFilters = getInclusionFilters();
@@ -510,6 +518,7 @@
* @see IJavaExceptionBreakpoint#setFilters(String[], boolean)
* @deprecated
*/
+ @Override
@Deprecated
public void setFilters(String[] filters, boolean inclusive)
throws CoreException {
@@ -598,6 +607,7 @@
* @see IJavaExceptionBreakpoint#isInclusiveFiltered()
* @deprecated
*/
+ @Override
@Deprecated
public boolean isInclusiveFiltered() throws CoreException {
return ensureMarker().getAttribute(INCLUSION_FILTERS, "").length() > 0; //$NON-NLS-1$
@@ -657,6 +667,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint#getExclusionFilters()
*/
+ @Override
public String[] getExclusionFilters() {
return getExclusionClassFilters();
}
@@ -664,6 +675,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint#getInclusionFilters()
*/
+ @Override
public String[] getInclusionFilters() {
return getInclusionClassFilters();
}
@@ -671,6 +683,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint#setExclusionFilters(String[])
*/
+ @Override
public void setExclusionFilters(String[] filters) throws CoreException {
String serializedFilters = serializeList(filters);
@@ -689,6 +702,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint#setInclusionFilters(String[])
*/
+ @Override
public void setInclusionFilters(String[] filters) throws CoreException {
String serializedFilters = serializeList(filters);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
index b12bb70..7366f16 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
@@ -141,6 +141,7 @@
final Map<String, Object> attributes, final String markerType)
throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
@@ -247,6 +248,7 @@
*
* @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber()
*/
+ @Override
public int getLineNumber() throws CoreException {
return ensureMarker().getAttribute(IMarker.LINE_NUMBER, -1);
}
@@ -256,6 +258,7 @@
*
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart()
*/
+ @Override
public int getCharStart() throws CoreException {
return ensureMarker().getAttribute(IMarker.CHAR_START, -1);
}
@@ -265,6 +268,7 @@
*
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd()
*/
+ @Override
public int getCharEnd() throws CoreException {
return ensureMarker().getAttribute(IMarker.CHAR_END, -1);
}
@@ -466,6 +470,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaLineBreakpoint#supportsCondition()
*/
+ @Override
public boolean supportsCondition() {
return true;
}
@@ -475,6 +480,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaLineBreakpoint#getCondition()
*/
+ @Override
public String getCondition() throws CoreException {
return ensureMarker().getAttribute(CONDITION, null);
}
@@ -486,6 +492,7 @@
* org.eclipse.jdt.debug.core.IJavaLineBreakpoint#setCondition(java.lang
* .String)
*/
+ @Override
public void setCondition(String condition) throws CoreException {
// Clear the cached compiled expressions
fCompiledExpressions.clear();
@@ -521,6 +528,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaLineBreakpoint#isConditionEnabled()
*/
+ @Override
public boolean isConditionEnabled() throws CoreException {
return ensureMarker().getAttribute(CONDITION_ENABLED, false);
}
@@ -532,6 +540,7 @@
* org.eclipse.jdt.debug.core.IJavaLineBreakpoint#setConditionEnabled(boolean
* )
*/
+ @Override
public void setConditionEnabled(boolean conditionEnabled)
throws CoreException {
setAttributes(new String[] { CONDITION_ENABLED },
@@ -574,6 +583,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaLineBreakpoint#isConditionSuspendOnTrue()
*/
+ @Override
public boolean isConditionSuspendOnTrue() throws DebugException {
return ensureMarker().getAttribute(CONDITION_SUSPEND_ON_TRUE, true);
}
@@ -585,6 +595,7 @@
* org.eclipse.jdt.debug.core.IJavaLineBreakpoint#setConditionSuspendOnTrue
* (boolean)
*/
+ @Override
public void setConditionSuspendOnTrue(boolean suspendOnTrue)
throws CoreException {
if (isConditionSuspendOnTrue() != suspendOnTrue) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
index be25ab6..73215fc 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
@@ -143,6 +143,7 @@
final int charStart, final int charEnd, final int hitCount,
final boolean register, final Map<String, Object> attributes) throws CoreException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
setMarker(resource.createMarker(JAVA_METHOD_BREAKPOINT));
@@ -411,6 +412,7 @@
/**
* @see IJavaMethodBreakpoint#isEntrySuspend(IDebugTarget)
*/
+ @Override
public boolean isEntrySuspend(IDebugTarget target) {
Integer lastEventType = fLastEventTypes.get(target);
if (lastEventType == null) {
@@ -533,6 +535,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaMethodEntryBreakpoint#getMethodName()
*/
+ @Override
public String getMethodName() {
return fMethodName;
}
@@ -544,6 +547,7 @@
* org.eclipse.jdt.debug.core.IJavaMethodEntryBreakpoint#getMethodSignature
* ()
*/
+ @Override
public String getMethodSignature() {
return fMethodSignature;
}
@@ -551,6 +555,7 @@
/**
* @see IJavaMethodBreakpoint#isEntry()
*/
+ @Override
public boolean isEntry() throws CoreException {
return ensureMarker().getAttribute(ENTRY, false);
}
@@ -558,6 +563,7 @@
/**
* @see IJavaMethodBreakpoint#isExit()
*/
+ @Override
public boolean isExit() throws CoreException {
return ensureMarker().getAttribute(EXIT, false);
}
@@ -565,6 +571,7 @@
/**
* @see IJavaMethodBreakpoint#isNative()
*/
+ @Override
public boolean isNativeOnly() throws CoreException {
return ensureMarker().getAttribute(NATIVE, false);
}
@@ -572,6 +579,7 @@
/**
* @see IJavaMethodBreakpoint#setEntry(boolean)
*/
+ @Override
public void setEntry(boolean entry) throws CoreException {
if (isEntry() != entry) {
setAttribute(ENTRY, entry);
@@ -587,6 +595,7 @@
/**
* @see IJavaMethodBreakpoint#setExit(boolean)
*/
+ @Override
public void setExit(boolean exit) throws CoreException {
if (isExit() != exit) {
setAttribute(EXIT, exit);
@@ -602,6 +611,7 @@
/**
* @see IJavaMethodBreakpoint#setNativeOnly(boolean)
*/
+ @Override
public void setNativeOnly(boolean nativeOnly) throws CoreException {
if (isNativeOnly() != nativeOnly) {
setAttribute(NATIVE, nativeOnly);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
index 05f87b6..4d05a03 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
@@ -75,6 +75,7 @@
final int charStart, final int charEnd, final int hitCount,
final boolean register, final Map<String, Object> attributes) throws CoreException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
setMarker(resource.createMarker(JAVA_METHOD_ENTRY_BREAKPOINT));
@@ -116,6 +117,7 @@
/**
* @see IJavaMethodEntryBreakpoint#getMethodName()
*/
+ @Override
public String getMethodName() {
return fMethodName;
}
@@ -123,6 +125,7 @@
/**
* @see IJavaMethodEntryBreakpoint#getMethodSignature()
*/
+ @Override
public String getMethodSignature() {
return fMethodSignature;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
index b644f55..105323c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
@@ -64,6 +64,7 @@
final int hitCount, final boolean add, final Map<String, Object> attributes,
final String markerType) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
@@ -169,6 +170,7 @@
/**
* @see IJavaPatternBreakpoint#getPattern()
*/
+ @Override
public String getPattern() throws CoreException {
return (String) ensureMarker().getAttribute(PATTERN);
}
@@ -176,6 +178,7 @@
/**
* @see IJavaPatternBreakpoint#getSourceName()
*/
+ @Override
public String getSourceName() throws CoreException {
return (String) ensureMarker().getAttribute(SOURCE_NAME);
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
index e5e8e90..9b45923 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
@@ -139,6 +139,7 @@
final int hitCount, final boolean register, final Map<String, Object> attributes,
final String markerType) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
@@ -352,6 +353,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint#getPattern()
*/
+ @Override
public String getPattern() throws CoreException {
return ensureMarker().getAttribute(PATTERN, "*"); //$NON-NLS-1$
}
@@ -362,6 +364,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint#getSourceName()
*/
+ @Override
public String getSourceName() throws CoreException {
return (String) ensureMarker().getAttribute(SOURCE_NAME);
}
@@ -371,6 +374,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint#getStratum()
*/
+ @Override
public String getStratum() throws CoreException {
return (String) ensureMarker().getAttribute(STRATUM);
}
@@ -381,6 +385,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint#getSourcePath()
*/
+ @Override
public String getSourcePath() throws CoreException {
return (String) ensureMarker().getAttribute(SOURCE_PATH);
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
index 9c855de..b9c002e 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
@@ -61,6 +61,7 @@
final Map<String, Object> attributes, final String markerType)
throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
// create the marker
@@ -219,6 +220,7 @@
/**
* @see IJavaTargetPatternBreakpoint#getPattern(IJavaDebugTarget)
*/
+ @Override
public String getPattern(IJavaDebugTarget target) {
if (fPatterns != null) {
return fPatterns.get(target);
@@ -229,6 +231,7 @@
/**
* @see IJavaTargetPatternBreakpoint#setPattern(IJavaDebugTarget, String)
*/
+ @Override
public void setPattern(IJavaDebugTarget target, String pattern)
throws CoreException {
if (fPatterns == null) {
@@ -246,6 +249,7 @@
/**
* @see IJavaTargetPatternBreakpoint#getSourceName()
*/
+ @Override
public String getSourceName() throws CoreException {
return (String) ensureMarker().getAttribute(SOURCE_NAME);
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
index ec2ab67..f30dc80 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
@@ -109,6 +109,7 @@
final int charEnd, final int hitCount, final boolean add,
final Map<String, Object> attributes) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
setMarker(resource.createMarker(JAVA_WATCHPOINT));
@@ -304,6 +305,7 @@
/**
* @see org.eclipse.debug.core.model.IWatchpoint#isAccess()
*/
+ @Override
public boolean isAccess() throws CoreException {
return ensureMarker().getAttribute(ACCESS, false);
}
@@ -321,6 +323,7 @@
* underlying marker
* @see org.eclipse.debug.core.model.IWatchpoint#setAccess(boolean)
*/
+ @Override
public void setAccess(boolean access) throws CoreException {
if (access == isAccess()) {
return;
@@ -337,6 +340,7 @@
/**
* @see org.eclipse.debug.core.model.IWatchpoint#isModification()
*/
+ @Override
public boolean isModification() throws CoreException {
return ensureMarker().getAttribute(MODIFICATION, false);
}
@@ -354,6 +358,7 @@
* underlying marker
* @see org.eclipse.debug.core.model.IWatchpoint#setModification(boolean)
*/
+ @Override
public void setModification(boolean modification) throws CoreException {
if (modification == isModification()) {
return;
@@ -452,6 +457,7 @@
/**
* @see IJavaWatchpoint#getFieldName()
*/
+ @Override
public String getFieldName() throws CoreException {
return ensureMarker().getAttribute(FIELD_NAME, null);
}
@@ -509,6 +515,7 @@
/**
* @see IJavaWatchpoint#isAccessSuspend(IDebugTarget)
*/
+ @Override
public boolean isAccessSuspend(IDebugTarget target) {
Integer lastEventType = fLastEventTypes.get(target);
if (lastEventType == null) {
@@ -551,6 +558,7 @@
*
* @see org.eclipse.debug.core.model.IWatchpoint#supportsAccess()
*/
+ @Override
public boolean supportsAccess() {
return true;
}
@@ -560,6 +568,7 @@
*
* @see org.eclipse.debug.core.model.IWatchpoint#supportsModification()
*/
+ @Override
public boolean supportsModification() {
return true;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
index ea86242..ed95485 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
@@ -219,6 +219,7 @@
/**
* @see IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
*/
+ @Override
public void resourceChanged(IResourceChangeEvent event) {
List<IProject> projects = getBuiltProjects(event);
if (!projects.isEmpty()) {
@@ -310,6 +311,7 @@
final List<JDIDebugTarget> noHotSwapTargets = getNoHotSwapTargets();
if (!hotSwapTargets.isEmpty()) {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
doHotCodeReplace(hotSwapTargets, resources, qualifiedNames);
}
@@ -318,6 +320,7 @@
}
if (!noHotSwapTargets.isEmpty()) {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
notifyUnsupportedHCR(noHotSwapTargets, resources,
qualifiedNames);
@@ -1157,6 +1160,7 @@
* If the associated resource is a class file which has been changed,
* record it.
*/
+ @Override
public boolean visit(IResourceDelta delta) {
if (delta == null
|| 0 == (delta.getKind() & IResourceDelta.CHANGED)) {
@@ -1328,6 +1332,7 @@
/**
* @see ILaunchListener#launchRemoved(ILaunch)
*/
+ @Override
public void launchRemoved(ILaunch launch) {
IDebugTarget[] debugTargets = launch.getDebugTargets();
for (IDebugTarget debugTarget : debugTargets) {
@@ -1345,6 +1350,7 @@
*
* @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
*/
+ @Override
public void launchAdded(ILaunch launch) {
IDebugTarget[] debugTargets = launch.getDebugTargets();
for (IDebugTarget debugTarget : debugTargets) {
@@ -1373,6 +1379,7 @@
*
* @see ILaunchListener#launchChanged(ILaunch)
*/
+ @Override
public void launchChanged(ILaunch launch) {
launchAdded(launch);
}
@@ -1384,6 +1391,7 @@
* org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse
* .debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (DebugEvent event : events) {
if (event.getKind() == DebugEvent.TERMINATE) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java
index 7f61b65..6f10c53 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JDIPlaceholderVariable.java
@@ -70,6 +70,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return ((IJavaValue) getValue()).getSignature();
}
@@ -79,6 +80,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return ((IJavaValue) getValue()).getGenericSignature();
}
@@ -88,6 +90,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return ((IJavaValue) getValue()).getJavaType();
}
@@ -97,6 +100,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#isLocal()
*/
+ @Override
public boolean isLocal() {
return false;
}
@@ -106,6 +110,7 @@
*
* @see org.eclipse.debug.core.model.IVariable#getValue()
*/
+ @Override
public IValue getValue() {
return fValue;
}
@@ -115,6 +120,7 @@
*
* @see org.eclipse.debug.core.model.IVariable#getName()
*/
+ @Override
public String getName() {
return fName;
}
@@ -124,6 +130,7 @@
*
* @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
return ((IJavaValue) getValue()).getReferenceTypeName();
}
@@ -133,6 +140,7 @@
*
* @see org.eclipse.debug.core.model.IVariable#hasValueChanged()
*/
+ @Override
public boolean hasValueChanged() {
return false;
}
@@ -142,6 +150,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPublic()
*/
+ @Override
public boolean isPublic() {
return false;
}
@@ -151,6 +160,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPrivate()
*/
+ @Override
public boolean isPrivate() {
return false;
}
@@ -160,6 +170,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isProtected()
*/
+ @Override
public boolean isProtected() {
return false;
}
@@ -169,6 +180,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isPackagePrivate()
*/
+ @Override
public boolean isPackagePrivate() {
return false;
}
@@ -178,6 +190,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isFinal()
*/
+ @Override
public boolean isFinal() {
return false;
}
@@ -187,6 +200,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isStatic()
*/
+ @Override
public boolean isStatic() {
return false;
}
@@ -196,6 +210,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaModifiers#isSynthetic()
*/
+ @Override
public boolean isSynthetic() {
return false;
}
@@ -205,6 +220,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return getValue().getModelIdentifier();
}
@@ -214,6 +230,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return ((IJavaValue) getValue()).getDebugTarget();
}
@@ -223,6 +240,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return getValue().getLaunch();
}
@@ -234,6 +252,7 @@
* org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String
* )
*/
+ @Override
public void setValue(String expression) {
}
@@ -244,6 +263,7 @@
* org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.
* debug.core.model.IValue)
*/
+ @Override
public void setValue(IValue value) {
}
@@ -254,6 +274,7 @@
* org.eclipse.debug.core.model.IValueModification#supportsValueModification
* ()
*/
+ @Override
public boolean supportsValueModification() {
return false;
}
@@ -265,6 +286,7 @@
* org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang
* .String)
*/
+ @Override
public boolean verifyValue(String expression) {
return false;
}
@@ -276,6 +298,7 @@
* org.eclipse.debug.core.model.IValueModification#verifyValue(org.eclipse
* .debug.core.model.IValue)
*/
+ @Override
public boolean verifyValue(IValue value) {
return false;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java
index e70de3b..f641004 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructure.java
@@ -109,6 +109,7 @@
* org.eclipse.jdt.debug.eval.IEvaluationListener#evaluationComplete
* (org.eclipse.jdt.debug.eval.IEvaluationResult)
*/
+ @Override
public void evaluationComplete(IEvaluationResult result) {
synchronized (this) {
fResult = result;
@@ -259,6 +260,7 @@
/**
* @see org.eclipse.debug.core.model.ILogicalStructureTypeDelegate#providesLogicalStructure(IValue)
*/
+ @Override
public boolean providesLogicalStructure(IValue value) {
if (!(value instanceof IJavaObject)) {
return false;
@@ -269,6 +271,7 @@
/**
* @see org.eclipse.debug.core.model.ILogicalStructureTypeDelegate#getLogicalStructure(IValue)
*/
+ @Override
public IValue getLogicalStructure(IValue value) throws CoreException {
if (!(value instanceof IJavaObject)) {
return value;
@@ -500,6 +503,7 @@
* org.eclipse.debug.core.model.ILogicalStructureTypeDelegate2#getDescription
* (org.eclipse.debug.core.model.IValue)
*/
+ @Override
public String getDescription(IValue value) {
return getDescription();
}
@@ -509,6 +513,7 @@
*
* @see org.eclipse.debug.core.ILogicalStructureType#getDescription()
*/
+ @Override
public String getDescription() {
return fDescription;
}
@@ -540,6 +545,7 @@
*
* @see org.eclipse.debug.core.ILogicalStructureType#getId()
*/
+ @Override
public String getId() {
return JDIDebugPlugin.getUniqueIdentifier() + fType + fDescription;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructures.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructures.java
index 0300a17..b2989b9 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructures.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaLogicalStructures.java
@@ -81,6 +81,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (PREF_JAVA_LOGICAL_STRUCTURES.equals(event.getKey())) {
initUserDefinedJavaLogicalStructures();
@@ -273,6 +274,7 @@
fListeners.remove(listener);
}
+ @Override
public ILogicalStructureType[] getLogicalStructureTypes(IValue value) {
if (!(value instanceof IJavaObject)) {
return new ILogicalStructureType[0];
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java
index 10416c4..d59d746 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/JavaStructureErrorValue.java
@@ -51,6 +51,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return null;
}
@@ -60,6 +61,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return null;
}
@@ -69,6 +71,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return null;
}
@@ -78,6 +81,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
return ""; //$NON-NLS-1$
}
@@ -87,6 +91,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getValueString()
*/
+ @Override
public String getValueString() throws DebugException {
return fMessages[0];
}
@@ -96,6 +101,7 @@
*
* @see org.eclipse.debug.core.model.IValue#isAllocated()
*/
+ @Override
public boolean isAllocated() throws DebugException {
return false;
}
@@ -105,6 +111,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getVariables()
*/
+ @Override
public IVariable[] getVariables() throws DebugException {
IVariable[] variables = new IVariable[fMessages.length];
for (int i = 0; i < variables.length; i++) {
@@ -127,6 +134,7 @@
*
* @see org.eclipse.debug.core.model.IValue#hasVariables()
*/
+ @Override
public boolean hasVariables() throws DebugException {
return false;
}
@@ -136,6 +144,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -145,6 +154,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fValue.getDebugTarget();
}
@@ -154,6 +164,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return getDebugTarget().getLaunch();
}
@@ -163,6 +174,7 @@
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return null;
}
@@ -172,6 +184,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#isNull()
*/
+ @Override
public boolean isNull() {
return false;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java
index 1c41590..118ad63 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureValue.java
@@ -51,6 +51,7 @@
* java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread, boolean)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature,
IJavaValue[] args, IJavaThread thread, boolean superSend)
throws DebugException {
@@ -65,6 +66,7 @@
* java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread, java.lang.String)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature,
IJavaValue[] args, IJavaThread thread, String typeSignature)
throws DebugException {
@@ -78,6 +80,7 @@
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String,
* boolean)
*/
+ @Override
public IJavaFieldVariable getField(String name, boolean superField)
throws DebugException {
return fObject.getField(name, superField);
@@ -89,6 +92,7 @@
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String,
* java.lang.String)
*/
+ @Override
public IJavaFieldVariable getField(String name, String typeSignature)
throws DebugException {
return fObject.getField(name, typeSignature);
@@ -99,6 +103,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
return fObject.getSignature();
}
@@ -108,6 +113,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return fObject.getGenericSignature();
}
@@ -117,6 +123,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return fObject.getJavaType();
}
@@ -126,6 +133,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
return fObject.getReferenceTypeName();
}
@@ -135,6 +143,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getValueString()
*/
+ @Override
public String getValueString() throws DebugException {
return fObject.getValueString();
}
@@ -144,6 +153,7 @@
*
* @see org.eclipse.debug.core.model.IValue#isAllocated()
*/
+ @Override
public boolean isAllocated() throws DebugException {
return fObject.isAllocated();
}
@@ -153,6 +163,7 @@
*
* @see org.eclipse.debug.core.model.IValue#getVariables()
*/
+ @Override
public IVariable[] getVariables() {
return fVariables;
}
@@ -162,6 +173,7 @@
*
* @see org.eclipse.debug.core.model.IValue#hasVariables()
*/
+ @Override
public boolean hasVariables() {
return fVariables.length > 0;
}
@@ -171,6 +183,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return fObject.getModelIdentifier();
}
@@ -180,6 +193,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/
+ @Override
public IDebugTarget getDebugTarget() {
return fObject.getDebugTarget();
}
@@ -189,6 +203,7 @@
*
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fObject.getLaunch();
}
@@ -198,6 +213,7 @@
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return fObject.getAdapter(adapter);
}
@@ -207,6 +223,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getWaitingThreads()
*/
+ @Override
public IJavaThread[] getWaitingThreads() throws DebugException {
return null;
}
@@ -216,6 +233,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getOwningThread()
*/
+ @Override
public IJavaThread getOwningThread() throws DebugException {
return null;
}
@@ -225,6 +243,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getReferringObjects(long)
*/
+ @Override
public IJavaObject[] getReferringObjects(long max) throws DebugException {
return fObject.getReferringObjects(max);
}
@@ -234,6 +253,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#disableCollection()
*/
+ @Override
public void disableCollection() throws DebugException {
fObject.disableCollection();
}
@@ -243,6 +263,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#enableCollection()
*/
+ @Override
public void enableCollection() throws DebugException {
fObject.enableCollection();
}
@@ -252,6 +273,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getUniqueId()
*/
+ @Override
public long getUniqueId() throws DebugException {
return fObject.getUniqueId();
}
@@ -261,6 +283,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#isNull()
*/
+ @Override
public boolean isNull() {
return false;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java
index 3cdb8eb..7b391ea 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayEntryVariable.java
@@ -92,6 +92,7 @@
/**
* @see IVariable#getName()
*/
+ @Override
public String getName() {
return "[" + getIndex() + "]"; //$NON-NLS-2$ //$NON-NLS-1$
}
@@ -137,6 +138,7 @@
/**
* @see IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
try {
if (fReferenceTypeName == null) {
@@ -172,6 +174,7 @@
/**
* @see IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return ((ArrayType) getArrayReference().type())
@@ -192,6 +195,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
try {
ReferenceType referenceType = getArrayReference().referenceType();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayType.java
index 5e6a2dd..e0d340f 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayType.java
@@ -37,6 +37,7 @@
/**
* @see IJavaArrayType#newInstance(int)
*/
+ @Override
public IJavaArray newInstance(int size) throws DebugException {
try {
ArrayReference ar = ((ArrayType) getUnderlyingType())
@@ -56,6 +57,7 @@
/**
* @see IJavaArray#getComponentType()
*/
+ @Override
public IJavaType getComponentType() throws DebugException {
try {
Type type = ((ArrayType) getUnderlyingType()).componentType();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayValue.java
index 1f3a910..ab5f2f9 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIArrayValue.java
@@ -46,6 +46,7 @@
/**
* @see IJavaArray#getValues()
*/
+ @Override
public IJavaValue[] getValues() throws DebugException {
List<Value> list = getUnderlyingValues();
@@ -62,6 +63,7 @@
/**
* @see IJavaArray#getValue(int)
*/
+ @Override
public IJavaValue getValue(int index) throws DebugException {
Value v = getUnderlyingValue(index);
return JDIValue.createValue((JDIDebugTarget) getDebugTarget(), v);
@@ -70,6 +72,7 @@
/**
* @see IJavaArray#getLength()
*/
+ @Override
public synchronized int getLength() throws DebugException {
if (fLength == -1) {
try {
@@ -87,6 +90,7 @@
/**
* @see IJavaArray#setValue(int, IJavaValue)
*/
+ @Override
public void setValue(int index, IJavaValue value) throws DebugException {
try {
getArrayReference().setValue(index,
@@ -185,6 +189,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getSize()
*/
+ @Override
public int getSize() throws DebugException {
return getLength();
}
@@ -194,6 +199,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int)
*/
+ @Override
public IVariable getVariable(int offset) throws DebugException {
if (offset >= getLength()) {
requestFailed(JDIDebugModelMessages.JDIArrayValue_6, null);
@@ -207,6 +213,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int)
*/
+ @Override
public IVariable[] getVariables(int offset, int length)
throws DebugException {
if (offset >= getLength()) {
@@ -230,6 +237,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset()
*/
+ @Override
public int getInitialOffset() {
return 0;
}
@@ -250,6 +258,7 @@
* @see org.eclipse.jdt.debug.core.IJavaArray#setValues(int, int,
* org.eclipse.jdt.debug.core.IJavaValue[], int)
*/
+ @Override
public void setValues(int offset, int length, IJavaValue[] values,
int startOffset) throws DebugException {
try {
@@ -286,6 +295,7 @@
* org.eclipse.jdt.debug.core.IJavaArray#setValues(org.eclipse.jdt.debug
* .core.IJavaValue[])
*/
+ @Override
public void setValues(IJavaValue[] values) throws DebugException {
int length = Math.min(values.length, getSize());
setValues(0, length, values, 0);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassObjectValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassObjectValue.java
index 55d2bf7..5b05513 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassObjectValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassObjectValue.java
@@ -35,6 +35,7 @@
/**
* @see IJavaClassObject#getInstanceType()
*/
+ @Override
public IJavaType getInstanceType() {
return JDIType.createType((JDIDebugTarget) getDebugTarget(),
getUnderlyingClassObject().reflectedType());
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
index dd715d8..a42ea2b 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
@@ -49,6 +49,7 @@
* org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread)
*/
+ @Override
public IJavaObject newInstance(String signature, IJavaValue[] args,
IJavaThread thread) throws DebugException {
if (getUnderlyingType() instanceof ClassType) {
@@ -93,6 +94,7 @@
* java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature,
IJavaValue[] args, IJavaThread thread) throws DebugException {
if (getUnderlyingType() instanceof ClassType) {
@@ -154,6 +156,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaClassType#getSuperclass()
*/
+ @Override
public IJavaClassType getSuperclass() throws DebugException {
try {
ClassType superclazz = ((ClassType) getUnderlyingType())
@@ -177,6 +180,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaClassType#getAllInterfaces()
*/
+ @Override
public IJavaInterfaceType[] getAllInterfaces() throws DebugException {
try {
List<InterfaceType> interfaceList = ((ClassType) getUnderlyingType())
@@ -207,6 +211,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaClassType#getInterfaces()
*/
+ @Override
public IJavaInterfaceType[] getInterfaces() throws DebugException {
try {
List<InterfaceType> interfaceList = ((ClassType) getUnderlyingType()).interfaces();
@@ -236,6 +241,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaClassType#isEnum()
*/
+ @Override
public boolean isEnum() {
return ((ClassType) getReferenceType()).isEnum();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
index 4961f38..3d74718 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
@@ -93,6 +93,7 @@
/**
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/
+ @Override
public String getModelIdentifier() {
return JDIDebugModel.getPluginIdentifier();
}
@@ -419,6 +420,7 @@
/**
* @see org.eclipse.debug.core.model.IDisconnect#canDisconnect()
*/
+ @Override
public boolean canDisconnect() {
return getDebugTarget().canDisconnect();
}
@@ -426,6 +428,7 @@
/**
* @see org.eclipse.debug.core.model.IDisconnect#disconnect()
*/
+ @Override
public void disconnect() throws DebugException {
getDebugTarget().disconnect();
}
@@ -433,6 +436,7 @@
/**
* @see org.eclipse.debug.core.model.IDisconnect#isDisconnected()
*/
+ @Override
public boolean isDisconnected() {
return getDebugTarget().isDisconnected();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
index 7292bb6..6caa0cc 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
@@ -463,6 +463,7 @@
// begin handling/dispatching events after the creation event is handled
// by all listeners
plugin.asyncExec(new Runnable() {
+ @Override
public void run() {
EventDispatcher dispatcher = getEventDispatcher();
if (dispatcher != null) {
@@ -580,6 +581,7 @@
/**
* @see IDebugTarget#getThreads()
*/
+ @Override
public IThread[] getThreads() {
synchronized (fThreads) {
return fThreads.toArray(new IThread[0]);
@@ -589,6 +591,7 @@
/**
* @see ISuspendResume#canResume()
*/
+ @Override
public boolean canResume() {
return (isSuspended() || canResumeThreads()) && isAvailable()
&& !isPerformingHotCodeReplace();
@@ -614,6 +617,7 @@
/**
* @see ISuspendResume#canSuspend()
*/
+ @Override
public boolean canSuspend() {
if (isAvailable()) {
// allow suspend when one or more threads are currently running
@@ -631,6 +635,7 @@
/**
* @see ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return supportsTerminate() && isAvailable();
}
@@ -686,6 +691,7 @@
/**
* @see IJavaDebugTarget#supportsHotCodeReplace()
*/
+ @Override
public boolean supportsHotCodeReplace() {
return supportsJ9HotCodeReplace() || supportsJDKHotCodeReplace();
}
@@ -693,6 +699,7 @@
/**
* @see IJavaDebugTarget#supportsInstanceBreakpoints()
*/
+ @Override
public boolean supportsInstanceBreakpoints() {
if (isAvailable()
&& JDIDebugPlugin.isJdiVersionGreaterThanOrEqual(new int[] { 1,
@@ -866,6 +873,7 @@
/**
* @see IJavaDebugTarget#isOutOfSynch()
*/
+ @Override
public boolean isOutOfSynch() throws DebugException {
Iterator<JDIThread> threads = getThreadIterator();
while (threads.hasNext()) {
@@ -880,6 +888,7 @@
/**
* @see IJavaDebugTarget#mayBeOutOfSynch()
*/
+ @Override
public boolean mayBeOutOfSynch() {
Iterator<JDIThread> threads = getThreadIterator();
while (threads.hasNext()) {
@@ -958,6 +967,7 @@
/**
* @see IDebugElement#getName()
*/
+ @Override
public String getName() throws DebugException {
if (fName == null) {
setName(getVMName());
@@ -994,6 +1004,7 @@
/**
* @see IDebugTarget#getProcess()
*/
+ @Override
public IProcess getProcess() {
return fProcess;
}
@@ -1027,6 +1038,7 @@
/**
* @see ISuspendResume#isSuspended()
*/
+ @Override
public boolean isSuspended() {
return fSuspended;
}
@@ -1051,6 +1063,7 @@
/**
* @see ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return fTerminated;
}
@@ -1215,6 +1228,7 @@
/**
* @see ISuspendResume#resume()
*/
+ @Override
public void resume() throws DebugException {
// if a client calls resume, then we should resume on a VMStart event in
// case
@@ -1270,6 +1284,7 @@
/**
* @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(IBreakpoint)
*/
+ @Override
public boolean supportsBreakpoint(IBreakpoint breakpoint) {
return breakpoint instanceof IJavaBreakpoint;
}
@@ -1282,6 +1297,7 @@
* @param breakpoint
* the breakpoint added to the breakpoint manager
*/
+ @Override
public void breakpointAdded(IBreakpoint breakpoint) {
if (!isAvailable()) {
return;
@@ -1315,6 +1331,7 @@
* @param breakpoint
* the breakpoint that has changed
*/
+ @Override
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
}
@@ -1326,6 +1343,7 @@
* @param breakpoint
* the breakpoint has been removed from the breakpoint manager.
*/
+ @Override
public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
if (!isAvailable()) {
return;
@@ -1348,6 +1366,7 @@
/**
* @see ISuspendResume
*/
+ @Override
public void suspend() throws DebugException {
if (isSuspended()) {
IThread[] threads = getThreads();
@@ -1451,6 +1470,7 @@
/**
* @see ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
if (!isAvailable()) {
return;
@@ -1623,6 +1643,7 @@
/**
* @see IJavaDebugTarget#findVariable(String)
*/
+ @Override
public IJavaVariable findVariable(String varName) throws DebugException {
IThread[] threads = getThreads();
for (IThread thread2 : threads) {
@@ -1715,6 +1736,7 @@
/**
* @see IJavaDebugTarget#getJavaTypes(String)
*/
+ @Override
public IJavaType[] getJavaTypes(String name) throws DebugException {
try {
// get java.lang.Class
@@ -1787,6 +1809,7 @@
/**
* @see IJavaDebugTarget#newValue(boolean)
*/
+ @Override
public IJavaValue newValue(boolean value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1799,6 +1822,7 @@
/**
* @see IJavaDebugTarget#newValue(byte)
*/
+ @Override
public IJavaValue newValue(byte value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1811,6 +1835,7 @@
/**
* @see IJavaDebugTarget#newValue(char)
*/
+ @Override
public IJavaValue newValue(char value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1823,6 +1848,7 @@
/**
* @see IJavaDebugTarget#newValue(double)
*/
+ @Override
public IJavaValue newValue(double value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1835,6 +1861,7 @@
/**
* @see IJavaDebugTarget#newValue(float)
*/
+ @Override
public IJavaValue newValue(float value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1847,6 +1874,7 @@
/**
* @see IJavaDebugTarget#newValue(int)
*/
+ @Override
public IJavaValue newValue(int value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1859,6 +1887,7 @@
/**
* @see IJavaDebugTarget#newValue(long)
*/
+ @Override
public IJavaValue newValue(long value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1871,6 +1900,7 @@
/**
* @see IJavaDebugTarget#newValue(short)
*/
+ @Override
public IJavaValue newValue(short value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1883,6 +1913,7 @@
/**
* @see IJavaDebugTarget#newValue(String)
*/
+ @Override
public IJavaValue newValue(String value) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -1895,6 +1926,7 @@
/**
* @see IJavaDebugTarget#nullValue()
*/
+ @Override
public IJavaValue nullValue() {
return JDIValue.createValue(this, null);
}
@@ -1902,6 +1934,7 @@
/**
* @see IJavaDebugTarget#voidValue()
*/
+ @Override
public IJavaValue voidValue() {
return new JDIVoidValue(this);
}
@@ -1957,6 +1990,7 @@
* the target in which the thread started
* @return <code>true</code> - the thread should be resumed
*/
+ @Override
public boolean handleEvent(Event event, JDIDebugTarget target,
boolean suspendVote, EventSet eventSet) {
ThreadReference thread = ((ThreadStartEvent) event).thread();
@@ -1994,6 +2028,7 @@
* (com.sun.jdi.event.Event,
* org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget, boolean)
*/
+ @Override
public void eventSetComplete(Event event, JDIDebugTarget target,
boolean suspend, EventSet eventSet) {
// do nothing
@@ -2057,6 +2092,7 @@
* the target in which the thread died
* @return <code>true</code> - the thread should be resumed
*/
+ @Override
public boolean handleEvent(Event event, JDIDebugTarget target,
boolean suspendVote, EventSet eventSet) {
ThreadReference ref = ((ThreadDeathEvent) event).thread();
@@ -2088,6 +2124,7 @@
* (com.sun.jdi.event.Event,
* org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget, boolean)
*/
+ @Override
public void eventSetComplete(Event event, JDIDebugTarget target,
boolean suspend, EventSet eventSet) {
// do nothing
@@ -2158,6 +2195,7 @@
*
* @see IMemoryBlockRetrieval#supportsStorageRetrieval()
*/
+ @Override
public boolean supportsStorageRetrieval() {
return false;
}
@@ -2165,6 +2203,7 @@
/**
* @see IMemoryBlockRetrieval#getMemoryBlock(long, long)
*/
+ @Override
public IMemoryBlock getMemoryBlock(long startAddress, long length)
throws DebugException {
notSupported(JDIDebugModelMessages.JDIDebugTarget_does_not_support_storage_retrieval);
@@ -2176,6 +2215,7 @@
/**
* @see ILaunchListener#launchRemoved(ILaunch)
*/
+ @Override
public void launchRemoved(ILaunch launch) {
if (!isAvailable()) {
return;
@@ -2191,12 +2231,14 @@
/**
* @see ILaunchListener#launchAdded(ILaunch)
*/
+ @Override
public void launchAdded(ILaunch launch) {
}
/**
* @see ILaunchListener#launchChanged(ILaunch)
*/
+ @Override
public void launchChanged(ILaunch launch) {
}
@@ -2223,6 +2265,7 @@
/**
* @see IJavaDebugTarget#getStepFilters()
*/
+ @Override
public String[] getStepFilters() {
return fStepFilters;
}
@@ -2230,6 +2273,7 @@
/**
* @see IJavaDebugTarget#isFilterConstructors()
*/
+ @Override
public boolean isFilterConstructors() {
return (fStepFilterMask & FILTER_CONSTRUCTORS) > 0;
}
@@ -2237,6 +2281,7 @@
/**
* @see IJavaDebugTarget#isFilterStaticInitializers()
*/
+ @Override
public boolean isFilterStaticInitializers() {
return (fStepFilterMask & FILTER_STATIC_INITIALIZERS) > 0;
}
@@ -2244,6 +2289,7 @@
/**
* @see IJavaDebugTarget#isFilterSynthetics()
*/
+ @Override
public boolean isFilterSynthetics() {
return (fStepFilterMask & FILTER_SYNTHETICS) > 0;
}
@@ -2253,6 +2299,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#isStepThruFilters()
*/
+ @Override
public boolean isStepThruFilters() {
return (fStepFilterMask & STEP_THRU_FILTERS) > 0;
}
@@ -2268,6 +2315,7 @@
/**
* @see IJavaDebugTarget#setFilterConstructors(boolean)
*/
+ @Override
public void setFilterConstructors(boolean filter) {
if (filter) {
fStepFilterMask = fStepFilterMask | FILTER_CONSTRUCTORS;
@@ -2280,6 +2328,7 @@
/**
* @see IJavaDebugTarget#setFilterStaticInitializers(boolean)
*/
+ @Override
public void setFilterStaticInitializers(boolean filter) {
if (filter) {
fStepFilterMask = fStepFilterMask | FILTER_STATIC_INITIALIZERS;
@@ -2292,6 +2341,7 @@
/**
* @see IJavaDebugTarget#setFilterSynthetics(boolean)
*/
+ @Override
public void setFilterSynthetics(boolean filter) {
if (filter) {
fStepFilterMask = fStepFilterMask | FILTER_SYNTHETICS;
@@ -2306,6 +2356,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaDebugTarget#setStepThruFilters(boolean)
*/
+ @Override
public void setStepThruFilters(boolean thru) {
if (thru) {
fStepFilterMask = fStepFilterMask | STEP_THRU_FILTERS;
@@ -2314,10 +2365,12 @@
}
}
+ @Override
public boolean isFilterGetters() {
return (fStepFilterMask & FILTER_GETTERS) > 0;
}
+ @Override
public void setFilterGetters(boolean filter) {
if (filter) {
fStepFilterMask = fStepFilterMask | FILTER_GETTERS;
@@ -2326,10 +2379,12 @@
}
}
+ @Override
public boolean isFilterSetters() {
return (fStepFilterMask & FILTER_SETTERS) > 0;
}
+ @Override
public void setFilterSetters(boolean filter) {
if (filter) {
fStepFilterMask = fStepFilterMask | FILTER_SETTERS;
@@ -2341,6 +2396,7 @@
/**
* @see IJavaDebugTarget#setStepFilters(String[])
*/
+ @Override
public void setStepFilters(String[] list) {
fStepFilters = list;
}
@@ -2348,6 +2404,7 @@
/**
* @see IJavaDebugTarget#setStepFiltersEnabled(boolean)
*/
+ @Override
public void setStepFiltersEnabled(boolean enabled) {
if (enabled) {
fStepFilterMask = fStepFilterMask | STEP_FILTERS_ENABLED;
@@ -2360,6 +2417,7 @@
/**
* @see IDebugTarget#hasThreads()
*/
+ @Override
public boolean hasThreads() {
return fThreads.size() > 0;
}
@@ -2429,6 +2487,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#supportsMonitorInformation()
*/
+ @Override
public boolean supportsMonitorInformation() {
if (!isAvailable()) {
return false;
@@ -2452,6 +2511,7 @@
/**
* @see IJavaDebugTarget#isPerformingHotCodeReplace()
*/
+ @Override
public boolean isPerformingHotCodeReplace() {
return fIsPerformingHotCodeReplace;
}
@@ -2462,6 +2522,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaDebugTarget#supportsAccessWatchpoints()
*/
+ @Override
public boolean supportsAccessWatchpoints() {
VirtualMachine vm = getVM();
if (isAvailable() && vm != null) {
@@ -2477,6 +2538,7 @@
* org.eclipse.jdt.debug.core.IJavaDebugTarget#supportsModificationWatchpoints
* ()
*/
+ @Override
public boolean supportsModificationWatchpoints() {
VirtualMachine vm = getVM();
if (isAvailable() && vm != null) {
@@ -2488,6 +2550,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#setDefaultStratum()
*/
+ @Override
public void setDefaultStratum(String stratum) {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -2495,6 +2558,7 @@
}
}
+ @Override
public String getDefaultStratum() {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -2508,6 +2572,7 @@
*
* @see org.eclipse.debug.core.model.IStepFilters#supportsStepFilters()
*/
+ @Override
public boolean supportsStepFilters() {
return isAvailable();
}
@@ -2516,6 +2581,7 @@
* When the breakpoint manager disables, remove all registered breakpoints
* requests from the VM. When it enables, reinstall them.
*/
+ @Override
public void breakpointManagerEnablementChanged(boolean enabled) {
if (!isAvailable()) {
return;
@@ -2542,6 +2608,7 @@
* org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse
* .debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
if (events.length == 1) {
DebugEvent event = events[0];
@@ -2610,6 +2677,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#getThreadGroups()
*/
+ @Override
public IJavaThreadGroup[] getRootThreadGroups() throws DebugException {
try {
VirtualMachine vm = getVM();
@@ -2639,6 +2707,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#getAllThreadGroups()
*/
+ @Override
public IJavaThreadGroup[] getAllThreadGroups() throws DebugException {
synchronized (fGroups) {
return fGroups
@@ -2652,6 +2721,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaDebugTarget#supportsInstanceRetrieval()
*/
+ @Override
public boolean supportsInstanceRetrieval() {
VirtualMachine vm = getVM();
if (vm != null) {
@@ -2691,6 +2761,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#supportsForceReturn()
*/
+ @Override
public boolean supportsForceReturn() {
VirtualMachine machine = getVM();
if (machine == null) {
@@ -2705,6 +2776,7 @@
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#
* supportsSelectiveGarbageCollection()
*/
+ @Override
public boolean supportsSelectiveGarbageCollection() {
return fSupportsDisableGC;
}
@@ -2725,6 +2797,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#getVMName()
*/
+ @Override
public String getVMName() throws DebugException {
VirtualMachine vm = getVM();
if (vm == null) {
@@ -2746,6 +2819,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#getVersion()
*/
+ @Override
public String getVersion() throws DebugException {
VirtualMachine vm = getVM();
if (vm == null) {
@@ -2767,6 +2841,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#refreshState()
*/
+ @Override
public void refreshState() throws DebugException {
if (isTerminated() || isDisconnected()) {
return;
@@ -2877,6 +2952,7 @@
* @see org.eclipse.jdt.debug.core.IJavaDebugTarget#sendCommand(byte, byte,
* byte[])
*/
+ @Override
public byte[] sendCommand(byte commandSet, byte commandId, byte[] data)
throws DebugException {
try {
@@ -2894,6 +2970,7 @@
* org.eclipse.jdt.debug.core.IJavaDebugTarget#addHotCodeReplaceListener
* (org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener)
*/
+ @Override
public void addHotCodeReplaceListener(IJavaHotCodeReplaceListener listener) {
fHCRListeners.add(listener);
}
@@ -2905,6 +2982,7 @@
* org.eclipse.jdt.debug.core.IJavaDebugTarget#removeHotCodeReplaceListener
* (org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener)
*/
+ @Override
public void removeHotCodeReplaceListener(
IJavaHotCodeReplaceListener listener) {
fHCRListeners.remove(listener);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
index 781126b..054f11c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
@@ -97,6 +97,7 @@
/**
* @see IJavaFieldVariable#getDeclaringType()
*/
+ @Override
public IJavaType getDeclaringType() {
return JDIType.createType((JDIDebugTarget) getDebugTarget(),
fField.declaringType());
@@ -105,6 +106,7 @@
/**
* @see IVariable#getName()
*/
+ @Override
public String getName() throws DebugException {
try {
return getField().name();
@@ -155,6 +157,7 @@
/**
* @see IJavaVariable#isVolatile()
*/
+ @Override
public boolean isVolatile() {
return getField().isVolatile();
}
@@ -162,6 +165,7 @@
/**
* @see IJavaVariable#isTransient()
*/
+ @Override
public boolean isTransient() {
return getField().isTransient();
}
@@ -225,6 +229,7 @@
/**
* @see IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
String genericSignature = getField().genericSignature();
if (genericSignature != null) {
@@ -241,6 +246,7 @@
/**
* @see IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return getField().signature();
@@ -260,6 +266,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
try {
String genericSignature = fField.genericSignature();
@@ -367,6 +374,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaFieldVariable#getObject()
*/
+ @Override
public IJavaObject getReceiver() {
ObjectReference objectReference = getObjectReference();
if (objectReference == null) {
@@ -376,6 +384,7 @@
objectReference);
}
+ @Override
public IJavaReferenceType getReceivingType() {
return (IJavaReferenceType) JDIType.createType(getJavaDebugTarget(),
getReferenceType());
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIInterfaceType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIInterfaceType.java
index 90efe59..56fafea 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIInterfaceType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIInterfaceType.java
@@ -41,6 +41,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaInterfaceType#getImplementors()
*/
+ @Override
public IJavaClassType[] getImplementors() throws DebugException {
try {
List<ClassType> implementorList = ((InterfaceType) getUnderlyingType())
@@ -73,6 +74,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaInterfaceType#getSubInterfaces()
*/
+ @Override
public IJavaInterfaceType[] getSubInterfaces() throws DebugException {
try {
List<InterfaceType> subList = ((InterfaceType) getUnderlyingType())
@@ -105,6 +107,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaInterfaceType#getSuperInterfaces()
*/
+ @Override
public IJavaInterfaceType[] getSuperInterfaces() throws DebugException {
try {
List<InterfaceType> superList = ((InterfaceType) getUnderlyingType())
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java
index 2ab0067..c41c798 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDILocalVariable.java
@@ -65,6 +65,7 @@
/**
* @see IVariable#getName()
*/
+ @Override
public String getName() throws DebugException {
try {
return getLocal().name();
@@ -111,6 +112,7 @@
/**
* @see IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
try {
String genericSignature = getLocal().genericSignature();
@@ -143,6 +145,7 @@
/**
* @see IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return getLocal().signature();
@@ -162,6 +165,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
try {
String genericSignature = fLocal.genericSignature();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
index cad718d..8b52520 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
@@ -61,6 +61,7 @@
* java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread, boolean)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature,
IJavaValue[] args, IJavaThread thread, boolean superSend)
throws DebugException {
@@ -106,6 +107,7 @@
* java.lang.String, org.eclipse.jdt.debug.core.IJavaValue[],
* org.eclipse.jdt.debug.core.IJavaThread, java.lang.String)
*/
+ @Override
public IJavaValue sendMessage(String selector, String signature,
IJavaValue[] args, IJavaThread thread, String typeSignature)
throws DebugException {
@@ -197,6 +199,7 @@
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String,
* boolean)
*/
+ @Override
public IJavaFieldVariable getField(String name, boolean superField)
throws DebugException {
ReferenceType ref = getUnderlyingReferenceType();
@@ -242,6 +245,7 @@
* @see org.eclipse.jdt.debug.core.IJavaObject#getField(java.lang.String,
* java.lang.String)
*/
+ @Override
public IJavaFieldVariable getField(String name,
String declaringTypeSignature) throws DebugException {
ReferenceType ref = getUnderlyingReferenceType();
@@ -381,6 +385,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getWaitingThreads()
*/
+ @Override
public IJavaThread[] getWaitingThreads() throws DebugException {
List<JDIThread> waiting = new ArrayList<JDIThread>();
try {
@@ -407,6 +412,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getOwningThread()
*/
+ @Override
public IJavaThread getOwningThread() throws DebugException {
IJavaThread owningThread = null;
try {
@@ -452,6 +458,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getUniqueId()
*/
+ @Override
public long getUniqueId() throws DebugException {
try {
ObjectReference underlyingObject = getUnderlyingObject();
@@ -475,6 +482,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#getReferringObjects(long)
*/
+ @Override
public IJavaObject[] getReferringObjects(long max) throws DebugException {
// The cached references should be reloaded if the suspend count has
// changed, or the maximum entries has changed
@@ -532,6 +540,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#disableCollection()
*/
+ @Override
public void disableCollection() throws DebugException {
if (getJavaDebugTarget().supportsSelectiveGarbageCollection()) {
try {
@@ -552,6 +561,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaObject#enableCollection()
*/
+ @Override
public void enableCollection() throws DebugException {
if (getJavaDebugTarget().supportsSelectiveGarbageCollection()) {
try {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPrimitiveValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPrimitiveValue.java
index ee5f7df..6a58429 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPrimitiveValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIPrimitiveValue.java
@@ -44,6 +44,7 @@
/*
* @see IJavaPrimitiveValue#getBooleanValue()
*/
+ @Override
public boolean getBooleanValue() {
return getUnderlyingPrimitiveValue().booleanValue();
}
@@ -51,6 +52,7 @@
/*
* @see IJavaPrimitiveValue#getByteValue()
*/
+ @Override
public byte getByteValue() {
return getUnderlyingPrimitiveValue().byteValue();
}
@@ -58,6 +60,7 @@
/*
* @see IJavaPrimitiveValue#getCharValue()
*/
+ @Override
public char getCharValue() {
return getUnderlyingPrimitiveValue().charValue();
}
@@ -65,6 +68,7 @@
/*
* @see IJavaPrimitiveValue#getDoubleValue()
*/
+ @Override
public double getDoubleValue() {
return getUnderlyingPrimitiveValue().doubleValue();
}
@@ -72,6 +76,7 @@
/*
* @see IJavaPrimitiveValue#getFloatValue()
*/
+ @Override
public float getFloatValue() {
return getUnderlyingPrimitiveValue().floatValue();
}
@@ -79,6 +84,7 @@
/*
* @see IJavaPrimitiveValue#getIntValue()
*/
+ @Override
public int getIntValue() {
return getUnderlyingPrimitiveValue().intValue();
}
@@ -86,6 +92,7 @@
/*
* @see IJavaPrimitiveValue#getLongValue()
*/
+ @Override
public long getLongValue() {
return getUnderlyingPrimitiveValue().longValue();
}
@@ -93,6 +100,7 @@
/*
* @see IJavaPrimitiveValue#getShortValue()
*/
+ @Override
public short getShortValue() {
return getUnderlyingPrimitiveValue().shortValue();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java
index 894fc1d..7b2bd4c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceListValue.java
@@ -289,6 +289,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset()
*/
+ @Override
public int getInitialOffset() {
return 0;
}
@@ -298,6 +299,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getSize()
*/
+ @Override
public int getSize() throws DebugException {
return getVariables().length;
}
@@ -307,6 +309,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int)
*/
+ @Override
public IVariable getVariable(int offset) throws DebugException {
IVariable[] variables = getVariables();
if (offset < variables.length) {
@@ -321,6 +324,7 @@
*
* @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int)
*/
+ @Override
public IVariable[] getVariables(int offset, int length)
throws DebugException {
IVariable[] variables = getVariables();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceType.java
index b954ed2..44623c3 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIReferenceType.java
@@ -61,6 +61,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getAvailableStrata()
*/
+ @Override
public String[] getAvailableStrata() {
List<String> strata = getReferenceType().availableStrata();
return strata.toArray(new String[strata.size()]);
@@ -80,6 +81,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getDefaultStratum()
*/
+ @Override
public String getDefaultStratum() throws DebugException {
try {
return getReferenceType().defaultStratum();
@@ -96,6 +98,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaReferenceType#getField(java.lang.String)
*/
+ @Override
public IJavaFieldVariable getField(String name) throws DebugException {
try {
ReferenceType type = (ReferenceType) getUnderlyingType();
@@ -118,6 +121,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getClassObject()
*/
+ @Override
public IJavaClassObject getClassObject() throws DebugException {
try {
ReferenceType type = (ReferenceType) getUnderlyingType();
@@ -139,6 +143,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getAllFieldNames()
*/
+ @Override
public String[] getAllFieldNames() throws DebugException {
if (fAllFields == null) {
try {
@@ -164,6 +169,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaReferenceType#getDeclaredFieldNames()
*/
+ @Override
public String[] getDeclaredFieldNames() throws DebugException {
if (fDeclaredFields == null) {
try {
@@ -190,6 +196,7 @@
* org.eclipse.jdt.debug.core.IJavaReferenceType#getSourcePaths(java.lang
* .String)
*/
+ @Override
public String[] getSourcePaths(String stratum) throws DebugException {
try {
List<String> sourcePaths = getReferenceType().sourcePaths(stratum);
@@ -208,6 +215,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getSourceName()
*/
+ @Override
public String getSourceName() throws DebugException {
try {
return getReferenceType().sourceName();
@@ -226,6 +234,7 @@
* org.eclipse.jdt.debug.core.IJavaReferenceType#getSourceNames(java.lang
* .String)
*/
+ @Override
public String[] getSourceNames(String stratum) throws DebugException {
try {
List<String> sourceNames = getReferenceType().sourceNames(stratum);
@@ -244,6 +253,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getClassLoaderObject()
*/
+ @Override
public IJavaObject getClassLoaderObject() throws DebugException {
try {
ReferenceType type = (ReferenceType) getUnderlyingType();
@@ -338,6 +348,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return getReferenceType().genericSignature();
}
@@ -347,6 +358,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getInstances(long)
*/
+ @Override
public IJavaObject[] getInstances(long max) throws DebugException {
try {
List<ObjectReference> list = getReferenceType().instances(max);
@@ -367,6 +379,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaReferenceType#getInstanceCount()
*/
+ @Override
public long getInstanceCount() throws DebugException {
JDIDebugTarget target = getJavaDebugTarget();
if (target.supportsInstanceRetrieval()) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
index c8a8cbc..ea30bf5 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
@@ -194,6 +194,7 @@
/**
* @see IStackFrame#getThread()
*/
+ @Override
public IThread getThread() {
return fThread;
}
@@ -201,6 +202,7 @@
/**
* @see ISuspendResume#canResume()
*/
+ @Override
public boolean canResume() {
return getThread().canResume();
}
@@ -208,6 +210,7 @@
/**
* @see ISuspendResume#canSuspend()
*/
+ @Override
public boolean canSuspend() {
return getThread().canSuspend();
}
@@ -215,6 +218,7 @@
/**
* @see IStep#canStepInto()
*/
+ @Override
public boolean canStepInto() {
try {
return exists() && isTopStackFrame() && !isObsolete()
@@ -228,6 +232,7 @@
/**
* @see IStep#canStepOver()
*/
+ @Override
public boolean canStepOver() {
return exists() && !isObsolete() && getThread().canStepOver();
}
@@ -235,6 +240,7 @@
/**
* @see IStep#canStepReturn()
*/
+ @Override
public boolean canStepReturn() {
try {
if (!exists() || isObsolete() || !getThread().canStepReturn()) {
@@ -275,6 +281,7 @@
/**
* @see IStackFrame#getVariables()
*/
+ @Override
public IVariable[] getVariables() throws DebugException {
List<IJavaVariable> list = getVariables0();
return list.toArray(new IVariable[list.size()]);
@@ -324,6 +331,7 @@
}
Collections.sort(fVariables,
new Comparator<IJavaVariable>() {
+ @Override
public int compare(IJavaVariable a, IJavaVariable b) {
JDIFieldVariable v1 = (JDIFieldVariable) a;
JDIFieldVariable v2 = (JDIFieldVariable) b;
@@ -364,6 +372,7 @@
/**
* @see IStackFrame#getName()
*/
+ @Override
public String getName() throws DebugException {
return getMethodName();
}
@@ -371,6 +380,7 @@
/**
* @see IJavaStackFrame#getArgumentTypeNames()
*/
+ @Override
public List<String> getArgumentTypeNames() throws DebugException {
try {
Method underlyingMethod = getUnderlyingMethod();
@@ -402,6 +412,7 @@
/**
* @see IStackFrame#getLineNumber()
*/
+ @Override
public int getLineNumber() throws DebugException {
synchronized (fThread) {
try {
@@ -421,6 +432,7 @@
/**
* @see IStep#isStepping()
*/
+ @Override
public boolean isStepping() {
return getThread().isStepping();
}
@@ -428,6 +440,7 @@
/**
* @see ISuspendResume#isSuspended()
*/
+ @Override
public boolean isSuspended() {
return getThread().isSuspended();
}
@@ -435,6 +448,7 @@
/**
* @see ISuspendResume#resume()
*/
+ @Override
public void resume() throws DebugException {
getThread().resume();
}
@@ -442,6 +456,7 @@
/**
* @see IStep#stepInto()
*/
+ @Override
public void stepInto() throws DebugException {
if (!canStepInto()) {
return;
@@ -452,6 +467,7 @@
/**
* @see IStep#stepOver()
*/
+ @Override
public void stepOver() throws DebugException {
if (!canStepOver()) {
return;
@@ -466,6 +482,7 @@
/**
* @see IStep#stepReturn()
*/
+ @Override
public void stepReturn() throws DebugException {
if (!canStepReturn()) {
return;
@@ -486,6 +503,7 @@
/**
* @see ISuspendResume#suspend()
*/
+ @Override
public void suspend() throws DebugException {
getThread().suspend();
}
@@ -587,6 +605,7 @@
/**
* @see org.eclipse.debug.core.model.IDropToFrame#canDropToFrame()
*/
+ @Override
public boolean canDropToFrame() {
return supportsDropToFrame();
}
@@ -594,6 +613,7 @@
/**
* @see IJavaStackFrame#supportsDropToFrame()
*/
+ @Override
public boolean supportsDropToFrame() {
JDIThread thread = (JDIThread) getThread();
JDIDebugTarget target = (JDIDebugTarget) thread.getDebugTarget();
@@ -671,6 +691,7 @@
/**
* @see IJavaStackFrame#dropToFrame()
*/
+ @Override
public void dropToFrame() throws DebugException {
if (supportsDropToFrame()) {
((JDIThread) getThread()).dropToFrame(this);
@@ -690,6 +711,7 @@
/**
* @see IJavaStackFrame#findVariable(String)
*/
+ @Override
public IJavaVariable findVariable(String varName) throws DebugException {
if (isNative()) {
return null;
@@ -794,6 +816,7 @@
/**
* @see IJavaStackFrame#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return getUnderlyingMethod().signature();
@@ -811,6 +834,7 @@
/**
* @see IJavaStackFrame#getDeclaringTypeName()
*/
+ @Override
public String getDeclaringTypeName() throws DebugException {
synchronized (fThread) {
try {
@@ -834,6 +858,7 @@
/**
* @see IJavaStackFrame#getReceivingTypeName()
*/
+ @Override
public String getReceivingTypeName() throws DebugException {
if (fStackFrame == null || fReceivingTypeName == null) {
try {
@@ -864,6 +889,7 @@
/**
* @see IJavaStackFrame#getMethodName()
*/
+ @Override
public String getMethodName() throws DebugException {
try {
return getUnderlyingMethod().name();
@@ -881,6 +907,7 @@
/**
* @see IJavaStackFrame#isNative()
*/
+ @Override
public boolean isNative() throws DebugException {
return getUnderlyingMethod().isNative();
}
@@ -888,6 +915,7 @@
/**
* @see IJavaStackFrame#isConstructor()
*/
+ @Override
public boolean isConstructor() throws DebugException {
return getUnderlyingMethod().isConstructor();
}
@@ -895,6 +923,7 @@
/**
* @see IJavaStackFrame#isStaticInitializer()
*/
+ @Override
public boolean isStaticInitializer() throws DebugException {
return getUnderlyingMethod().isStaticInitializer();
}
@@ -902,6 +931,7 @@
/**
* @see IJavaModifiers#isFinal()
*/
+ @Override
public boolean isFinal() throws DebugException {
return getUnderlyingMethod().isFinal();
}
@@ -909,6 +939,7 @@
/**
* @see IJavaStackFrame#isSynchronized()
*/
+ @Override
public boolean isSynchronized() throws DebugException {
return getUnderlyingMethod().isSynchronized();
}
@@ -916,6 +947,7 @@
/**
* @see IJavaModifiers#isSynthetic()
*/
+ @Override
public boolean isSynthetic() throws DebugException {
return getUnderlyingMethod().isSynthetic();
}
@@ -923,6 +955,7 @@
/**
* @see IJavaModifiers#isPublic()
*/
+ @Override
public boolean isPublic() throws DebugException {
return getUnderlyingMethod().isPublic();
}
@@ -930,6 +963,7 @@
/**
* @see IJavaModifiers#isPrivate()
*/
+ @Override
public boolean isPrivate() throws DebugException {
return getUnderlyingMethod().isPrivate();
}
@@ -937,6 +971,7 @@
/**
* @see IJavaModifiers#isProtected()
*/
+ @Override
public boolean isProtected() throws DebugException {
return getUnderlyingMethod().isProtected();
}
@@ -944,6 +979,7 @@
/**
* @see IJavaModifiers#isPackagePrivate()
*/
+ @Override
public boolean isPackagePrivate() throws DebugException {
return getUnderlyingMethod().isPackagePrivate();
}
@@ -951,6 +987,7 @@
/**
* @see IJavaModifiers#isStatic()
*/
+ @Override
public boolean isStatic() throws DebugException {
return getUnderlyingMethod().isStatic();
}
@@ -958,6 +995,7 @@
/**
* @see IJavaStackFrame#getSourceName()
*/
+ @Override
public String getSourceName() throws DebugException {
synchronized (fThread) {
return getSourceName(fLocation);
@@ -1008,6 +1046,7 @@
/**
* @see IJavaStackFrame#isOutOfSynch()
*/
+ @Override
public boolean isOutOfSynch() throws DebugException {
if (fIsOutOfSynch) {
return true;
@@ -1028,6 +1067,7 @@
/**
* @see IJavaStackFrame#isObsolete()
*/
+ @Override
public boolean isObsolete() {
if (!JDIDebugPlugin.isJdiVersionGreaterThanOrEqual(new int[] { 1, 4 })
|| !((JDIDebugTarget) getDebugTarget()).hasHCROccurred()) {
@@ -1054,6 +1094,7 @@
/**
* @see ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return exists() && getThread().canTerminate()
|| getDebugTarget().canTerminate();
@@ -1062,6 +1103,7 @@
/**
* @see ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getThread().isTerminated();
}
@@ -1069,6 +1111,7 @@
/**
* @see ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
if (getThread().canTerminate()) {
getThread().terminate();
@@ -1142,6 +1185,7 @@
/**
* @see IJavaStackFrame#getLocalVariables()
*/
+ @Override
public IJavaVariable[] getLocalVariables() throws DebugException {
List<LocalVariable> list = getUnderlyingVisibleVariables();
IJavaVariable[] locals = new IJavaVariable[list.size()];
@@ -1154,6 +1198,7 @@
/**
* @see IJavaStackFrame#getThis()
*/
+ @Override
public IJavaObject getThis() throws DebugException {
IJavaObject receiver = null;
if (!isStatic() && !isNative()) {
@@ -1171,6 +1216,7 @@
*
* @see IStackFrame#getRegisterGroups()
*/
+ @Override
public IRegisterGroup[] getRegisterGroups() {
return new IRegisterGroup[0];
}
@@ -1178,6 +1224,7 @@
/**
* @see IJavaStackFrame#getDeclaringType()
*/
+ @Override
public IJavaClassType getDeclaringType() throws DebugException {
Method method = getUnderlyingMethod();
try {
@@ -1201,6 +1248,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaStackFrame#getReferenceType()
*/
+ @Override
public IJavaReferenceType getReferenceType() throws DebugException {
Method method = getUnderlyingMethod();
try {
@@ -1221,6 +1269,7 @@
*
* @see IStackFrame#getCharEnd()
*/
+ @Override
public int getCharEnd() {
return -1;
}
@@ -1230,6 +1279,7 @@
*
* @see IStackFrame#getCharStart()
*/
+ @Override
public int getCharStart() {
return -1;
}
@@ -1246,6 +1296,7 @@
/**
* @see IJavaStackFrame#wereLocalsAvailable()
*/
+ @Override
public boolean wereLocalsAvailable() {
return fLocalsAvailable;
}
@@ -1268,6 +1319,7 @@
/**
* @see IStackFrame#hasRegisterGroups()
*/
+ @Override
public boolean hasRegisterGroups() {
return false;
}
@@ -1275,6 +1327,7 @@
/**
* @see IStackFrame#hasVariables()
*/
+ @Override
public boolean hasVariables() throws DebugException {
return getVariables0().size() > 0;
}
@@ -1282,6 +1335,7 @@
/**
* @see org.eclipse.debug.core.model.IFilteredStep#canStepWithFilters()
*/
+ @Override
public boolean canStepWithFilters() {
if (canStepInto()) {
String[] filters = getJavaDebugTarget().getStepFilters();
@@ -1293,6 +1347,7 @@
/**
* @see org.eclipse.debug.core.model.IFilteredStep#stepWithFilters()
*/
+ @Override
public void stepWithFilters() throws DebugException {
((IJavaThread) getThread()).stepWithFilters();
}
@@ -1300,6 +1355,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaStackFrame#getSourcePath(java.lang.String)
*/
+ @Override
public String getSourcePath(String stratum) throws DebugException {
synchronized (fThread) {
try {
@@ -1318,6 +1374,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaStackFrame#getSourcePath()
*/
+ @Override
public String getSourcePath() throws DebugException {
synchronized (fThread) {
try {
@@ -1338,6 +1395,7 @@
* org.eclipse.jdt.debug.core.IJavaStackFrame#getLineNumber(java.lang.String
* )
*/
+ @Override
public int getLineNumber(String stratum) throws DebugException {
synchronized (fThread) {
try {
@@ -1359,6 +1417,7 @@
* org.eclipse.jdt.debug.core.IJavaStackFrame#getSourceName(java.lang.String
* )
*/
+ @Override
public String getSourceName(String stratum) throws DebugException {
synchronized (fThread) {
try {
@@ -1380,6 +1439,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaStackFrame#isVarargs()
*/
+ @Override
public boolean isVarArgs() throws DebugException {
return getUnderlyingMethod().isVarArgs();
}
@@ -1389,6 +1449,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaStackFrame#canForceReturn()
*/
+ @Override
public boolean canForceReturn() {
if (getJavaDebugTarget().supportsForceReturn() && isSuspended()) {
try {
@@ -1417,6 +1478,7 @@
* org.eclipse.jdt.debug.core.IJavaStackFrame#forceReturn(org.eclipse.jdt
* .debug.core.IJavaValue)
*/
+ @Override
public void forceReturn(IJavaValue value) throws DebugException {
if (isTopStackFrame()) {
fThread.forceReturn(value);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java
index 03e96fb..fc78a77 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThisVariable.java
@@ -49,6 +49,7 @@
/**
* @see IVariable#getName()
*/
+ @Override
public String getName() {
return "this"; //$NON-NLS-1$
}
@@ -56,6 +57,7 @@
/**
* @see IJavaVariable#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return retrieveValue().type().signature();
@@ -75,6 +77,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaVariable#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
return getSignature();
}
@@ -82,6 +85,7 @@
/**
* @see IVariable#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
try {
return getValue().getReferenceTypeName();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
index df01112..cf7844d 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -388,6 +388,7 @@
*
* @see org.eclipse.debug.core.model.IThread#getBreakpoints()
*/
+ @Override
public synchronized IBreakpoint[] getBreakpoints() {
return fCurrentBreakpoints
.toArray(new IBreakpoint[fCurrentBreakpoints.size()]);
@@ -398,6 +399,7 @@
*
* @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/
+ @Override
public boolean canResume() {
return isSuspended()
&& (!isPerformingEvaluation() || isInvokingMethod())
@@ -410,6 +412,7 @@
*
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/
+ @Override
public boolean canSuspend() {
return !isSuspended()
|| (isPerformingEvaluation() && !isInvokingMethod())
@@ -421,6 +424,7 @@
*
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return getDebugTarget().canTerminate();
}
@@ -430,6 +434,7 @@
*
* @see org.eclipse.debug.core.model.IStep#canStepInto()
*/
+ @Override
public boolean canStepInto() {
return canStep();
}
@@ -439,6 +444,7 @@
*
* @see org.eclipse.debug.core.model.IStep#canStepOver()
*/
+ @Override
public boolean canStepOver() {
return canStep();
}
@@ -448,6 +454,7 @@
*
* @see org.eclipse.debug.core.model.IStep#canStepReturn()
*/
+ @Override
public boolean canStepReturn() {
return canStep();
}
@@ -544,6 +551,7 @@
*
* @see IThread#getStackFrames()
*/
+ @Override
public synchronized IStackFrame[] getStackFrames() throws DebugException {
List<IJavaStackFrame> list = computeStackFrames();
return list.toArray(new IStackFrame[list.size()]);
@@ -728,6 +736,7 @@
* debug.core.IEvaluationRunnable,
* org.eclipse.core.runtime.IProgressMonitor, int, boolean)
*/
+ @Override
public void runEvaluation(IEvaluationRunnable evaluation,
IProgressMonitor monitor, int evaluationDetail,
boolean hitBreakpoints) throws DebugException {
@@ -833,6 +842,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaThread#queueRunnable(java.lang.Runnable)
*/
+ @Override
public void queueRunnable(Runnable evaluation) {
if (fAsyncJob == null) {
fAsyncJob = new ThreadJob(this);
@@ -845,6 +855,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#terminateEvaluation()
*/
+ @Override
public void terminateEvaluation() throws DebugException {
synchronized (fEvaluationLock) {
if (canTerminateEvaluation()) {
@@ -859,6 +870,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#canTerminateEvaluation()
*/
+ @Override
public boolean canTerminateEvaluation() {
synchronized (fEvaluationLock) {
return fEvaluationRunnable instanceof ITerminate;
@@ -1145,6 +1157,7 @@
*
* @see org.eclipse.debug.core.model.IThread#getName()
*/
+ @Override
public String getName() throws DebugException {
try {
fPreviousName = fThread.name();
@@ -1180,6 +1193,7 @@
* if an exception occurs retrieving the priority
* @see IThread#getPriority
*/
+ @Override
public int getPriority() throws DebugException {
// to get the priority, we must get the value from the "priority" field
Field p = null;
@@ -1213,6 +1227,7 @@
*
* @see org.eclipse.debug.core.model.IThread#getTopStackFrame()
*/
+ @Override
public synchronized IStackFrame getTopStackFrame() throws DebugException {
List<IJavaStackFrame> c = computeStackFrames();
if (c.isEmpty()) {
@@ -1370,6 +1385,7 @@
*
* @see org.eclipse.debug.core.model.IStep#isStepping()
*/
+ @Override
public boolean isStepping() {
return getPendingStepHandler() != null;
}
@@ -1379,6 +1395,7 @@
*
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/
+ @Override
public boolean isSuspended() {
return !fRunning && !fTerminated;
}
@@ -1388,6 +1405,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#isSystemThread()
*/
+ @Override
public boolean isSystemThread() {
return fIsSystemThread;
}
@@ -1397,6 +1415,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#isDaemon()
*/
+ @Override
public boolean isDaemon() throws DebugException {
return fIsDaemon;
}
@@ -1406,6 +1425,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#getThreadGroupName()
*/
+ @Override
public String getThreadGroupName() throws DebugException {
if (fThreadGroupName == null) {
ThreadGroupReference tgr = getUnderlyingThreadGroup();
@@ -1435,6 +1455,7 @@
*
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return fTerminated;
}
@@ -1444,6 +1465,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#isOutOfSynch()
*/
+ @Override
public synchronized boolean isOutOfSynch() throws DebugException {
if (isSuspended() && ((JDIDebugTarget) getDebugTarget()).hasHCRFailed()) {
List<IJavaStackFrame> frames = computeStackFrames();
@@ -1464,6 +1486,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#mayBeOutOfSynch()
*/
+ @Override
public boolean mayBeOutOfSynch() {
if (!isSuspended()) {
return ((JDIDebugTarget) getDebugTarget()).hasHCRFailed();
@@ -1486,6 +1509,7 @@
*
* @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/
+ @Override
public synchronized void resume() throws DebugException {
if (!isSuspended() && getDebugTarget().isSuspended()) {
getDebugTarget().resume();
@@ -1576,6 +1600,7 @@
*
* @see IStep#stepInto()
*/
+ @Override
public void stepInto() throws DebugException {
synchronized (this) {
if (!canStepInto()) {
@@ -1592,6 +1617,7 @@
*
* @see IStep#stepOver()
*/
+ @Override
public void stepOver() throws DebugException {
synchronized (this) {
if (!canStepOver()) {
@@ -1608,6 +1634,7 @@
*
* @see IStep#stepReturn()
*/
+ @Override
public void stepReturn() throws DebugException {
synchronized (this) {
if (!canStepReturn()) {
@@ -1713,6 +1740,7 @@
*
* @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/
+ @Override
public void suspend() throws DebugException {
// prepare for the suspend request
prepareForClientSuspend();
@@ -1807,6 +1835,7 @@
}
fIsSuspending = true;
Thread thread = new Thread(new Runnable() {
+ @Override
public void run() {
try {
fThread.suspend();
@@ -1900,6 +1929,7 @@
/**
* @see ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
terminateEvaluation();
getDebugTarget().terminate();
@@ -2028,6 +2058,7 @@
* @see
* org.eclipse.jdt.debug.core.IJavaThread#findVariable(java.lang.String)
*/
+ @Override
public IJavaVariable findVariable(String varName) throws DebugException {
if (isSuspended()) {
try {
@@ -2131,6 +2162,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#isPerformingEvaluation()
*/
+ @Override
public boolean isPerformingEvaluation() {
return fEvaluationRunnable != null;
}
@@ -2463,6 +2495,7 @@
* @see IJDIEventListener#handleEvent(Event, JDIDebugTarget, boolean,
* EventSet)
*/
+ @Override
public boolean handleEvent(Event event, JDIDebugTarget target,
boolean suspendVote, EventSet eventSet) {
try {
@@ -2505,6 +2538,7 @@
* (com.sun.jdi.event.Event,
* org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget, boolean)
*/
+ @Override
public void eventSetComplete(Event event, JDIDebugTarget target,
boolean suspend, EventSet eventSet) {
// do nothing
@@ -3026,6 +3060,7 @@
/**
* @see IThread#hasStackFrames()
*/
+ @Override
public boolean hasStackFrames() throws DebugException {
return isSuspended();
}
@@ -3052,6 +3087,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaThread#hasOwnedMonitors()
*/
+ @Override
public boolean hasOwnedMonitors() throws DebugException {
return isSuspended() && getOwnedMonitors().length > 0;
}
@@ -3059,6 +3095,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaThread#getOwnedMonitors()
*/
+ @Override
public IJavaObject[] getOwnedMonitors() throws DebugException {
try {
JDIDebugTarget target = (JDIDebugTarget) getDebugTarget();
@@ -3084,6 +3121,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaThread#getContendedMonitor()
*/
+ @Override
public IJavaObject getContendedMonitor() throws DebugException {
try {
ObjectReference monitor = fThread.currentContendedMonitor();
@@ -3103,6 +3141,7 @@
/**
* @see org.eclipse.debug.core.model.IFilteredStep#canStepWithFilters()
*/
+ @Override
public boolean canStepWithFilters() {
if (canStepInto()) {
String[] filters = getJavaDebugTarget().getStepFilters();
@@ -3114,6 +3153,7 @@
/**
* @see org.eclipse.debug.core.model.IFilteredStep#stepWithFilters()
*/
+ @Override
public void stepWithFilters() throws DebugException {
if (!canStepWithFilters()) {
return;
@@ -3207,6 +3247,7 @@
* org.eclipse.jdt.debug.core.IJavaThread#stop(org.eclipse.jdt.debug.core
* .IJavaObject)
*/
+ @Override
public void stop(IJavaObject exception) throws DebugException {
try {
fThread.stop(((JDIObjectValue) exception).getUnderlyingObject());
@@ -3222,6 +3263,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#getThreadGroup()
*/
+ @Override
public IJavaThreadGroup getThreadGroup() throws DebugException {
ThreadGroupReference group = getUnderlyingThreadGroup();
if (group != null) {
@@ -3235,6 +3277,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#getFrameCount()
*/
+ @Override
public int getFrameCount() throws DebugException {
return getUnderlyingFrameCount();
}
@@ -3283,6 +3326,7 @@
* org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse
* .core.runtime.jobs.ISchedulingRule)
*/
+ @Override
public boolean contains(ISchedulingRule rule) {
return rule == this;
}
@@ -3294,6 +3338,7 @@
* org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse
* .core.runtime.jobs.ISchedulingRule)
*/
+ @Override
public boolean isConflicting(ISchedulingRule rule) {
if (rule instanceof SerialPerObjectRule) {
SerialPerObjectRule vup = (SerialPerObjectRule) rule;
@@ -3341,6 +3386,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThread#getThreadObject()
*/
+ @Override
public IJavaObject getThreadObject() throws DebugException {
return (IJavaObject) JDIValue
.createValue(getJavaDebugTarget(), fThread);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThreadGroup.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThreadGroup.java
index 2336b2a..56ee382 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThreadGroup.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThreadGroup.java
@@ -52,6 +52,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#getThreads()
*/
+ @Override
public synchronized IJavaThread[] getThreads() throws DebugException {
try {
List<ThreadReference> threads = fGroup.threads();
@@ -80,6 +81,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#getThreadGroup()
*/
+ @Override
public IJavaThreadGroup getThreadGroup() throws DebugException {
try {
ThreadGroupReference reference = fGroup.parent();
@@ -97,6 +99,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#getThreadGroups()
*/
+ @Override
public IJavaThreadGroup[] getThreadGroups() throws DebugException {
try {
List<ThreadGroupReference> groups = fGroup.threadGroups();
@@ -126,6 +129,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#getName()
*/
+ @Override
public synchronized String getName() throws DebugException {
if (fName == null) {
try {
@@ -146,6 +150,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#hasThreadGroups()
*/
+ @Override
public boolean hasThreadGroups() throws DebugException {
try {
List<ThreadGroupReference> groups = fGroup.threadGroups();
@@ -161,6 +166,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaThreadGroup#hasThreads()
*/
+ @Override
public boolean hasThreads() throws DebugException {
try {
List<ThreadReference> threads = fGroup.threads();
@@ -174,6 +180,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
// the group can terminate if the target can terminate
return getDebugTarget().canTerminate();
@@ -182,6 +189,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return getDebugTarget().isTerminated();
}
@@ -189,6 +197,7 @@
/**
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
getDebugTarget().terminate();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIType.java
index 9965ebc..518062c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIType.java
@@ -120,6 +120,7 @@
/**
* @see IJavaType#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
return getUnderlyingType().signature();
@@ -164,6 +165,7 @@
/**
* @see IJavaType#getName()
*/
+ @Override
public String getName() throws DebugException {
try {
return getUnderlyingType().name();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
index f529cf4..4167da0 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
@@ -116,6 +116,7 @@
/**
* @see IValue#getValueString()
*/
+ @Override
public String getValueString() throws DebugException {
if (fValue == null) {
return JDIDebugModelMessages.JDIValue_null_4;
@@ -167,6 +168,7 @@
/**
* @see IValue#getReferenceTypeName()
*/
+ @Override
public String getReferenceTypeName() throws DebugException {
try {
if (fValue == null) {
@@ -219,6 +221,7 @@
/**
* @see IValue#getVariables()
*/
+ @Override
public IVariable[] getVariables() throws DebugException {
List<IJavaVariable> list = getVariablesList();
return list.toArray(new IVariable[list.size()]);
@@ -275,6 +278,7 @@
fLogicalParent));
}
Collections.sort(fVariables, new Comparator<IJavaVariable>() {
+ @Override
public int compare(IJavaVariable a, IJavaVariable b) {
return sortChildren(a, b);
}
@@ -331,6 +335,7 @@
/**
* @see IValue#isAllocated()
*/
+ @Override
public boolean isAllocated() throws DebugException {
if (fAllocated) {
if (fValue instanceof ObjectReference) {
@@ -358,6 +363,7 @@
/**
* @see IJavaValue#getSignature()
*/
+ @Override
public String getSignature() throws DebugException {
try {
if (fValue != null) {
@@ -380,6 +386,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#getGenericSignature()
*/
+ @Override
public String getGenericSignature() throws DebugException {
try {
if (fValue != null) {
@@ -428,6 +435,7 @@
/**
* @see IJavaValue#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return JDIType.createType((JDIDebugTarget) getDebugTarget(),
getUnderlyingType());
@@ -468,6 +476,7 @@
/**
* @see IValue#hasVariables()
*/
+ @Override
public boolean hasVariables() throws DebugException {
return getVariablesList().size() > 0;
}
@@ -499,6 +508,7 @@
*
* @see org.eclipse.jdt.debug.core.IJavaValue#isNull()
*/
+ @Override
public boolean isNull() {
return false;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
index e119b45..8f092ec 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
@@ -91,6 +91,7 @@
*
* @see IVariable#getValue()
*/
+ @Override
public IValue getValue() throws DebugException {
Value currentValue = getCurrentValue();
if (fValue == null) {
@@ -117,6 +118,7 @@
/**
* @see IValueModification#supportsValueModification()
*/
+ @Override
public boolean supportsValueModification() {
return false;
}
@@ -124,6 +126,7 @@
/**
* @see IValueModification#setValue(String)
*/
+ @Override
public void setValue(String expression) throws DebugException {
notSupported(JDIDebugModelMessages.JDIVariable_does_not_support_value_modification);
}
@@ -131,6 +134,7 @@
/**
* @see IValueModification#setValue(IValue)
*/
+ @Override
public void setValue(IValue value) throws DebugException {
notSupported(JDIDebugModelMessages.JDIVariable_does_not_support_value_modification);
}
@@ -138,6 +142,7 @@
/**
* @see IValueModification#verifyValue(String)
*/
+ @Override
public boolean verifyValue(String expression) throws DebugException {
return false;
}
@@ -145,6 +150,7 @@
/**
* @see IValueModification#verifyValue(IValue)
*/
+ @Override
public boolean verifyValue(IValue value) throws DebugException {
return false;
}
@@ -152,6 +158,7 @@
/**
* @see IJavaModifiers#isSynthetic()
*/
+ @Override
public boolean isSynthetic() {
return false;
}
@@ -159,6 +166,7 @@
/**
* @see IJavaModifiers#isPublic()
*/
+ @Override
public boolean isPublic() throws DebugException {
return false;
}
@@ -166,6 +174,7 @@
/**
* @see IJavaModifiers#isPrivate()
*/
+ @Override
public boolean isPrivate() throws DebugException {
return false;
}
@@ -173,6 +182,7 @@
/**
* @see IJavaModifiers#isProtected()
*/
+ @Override
public boolean isProtected() throws DebugException {
return false;
}
@@ -180,6 +190,7 @@
/**
* @see IJavaModifiers#isPackagePrivate()
*/
+ @Override
public boolean isPackagePrivate() {
return false;
}
@@ -187,6 +198,7 @@
/**
* @see IJavaModifiers#isStatic()
*/
+ @Override
public boolean isStatic() {
return false;
}
@@ -194,6 +206,7 @@
/**
* @see IJavaModifiers#isFinal()
*/
+ @Override
public boolean isFinal() {
return false;
}
@@ -201,6 +214,7 @@
/**
* @see org.eclipse.jdt.debug.core.IJavaVariable#isLocal()
*/
+ @Override
public boolean isLocal() {
return false;
}
@@ -208,6 +222,7 @@
/**
* @see IJavaVariable#getJavaType()
*/
+ @Override
public IJavaType getJavaType() throws DebugException {
return JDIType.createType((JDIDebugTarget) getDebugTarget(),
getUnderlyingType());
@@ -263,6 +278,7 @@
/**
* @see IVariable#hasValueChanged()
*/
+ @Override
public boolean hasValueChanged() {
return getChangeCount() == getJavaDebugTarget().getSuspendCount();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/Timer.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/Timer.java
index b47af4d..d8e21e4 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/Timer.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/Timer.java
@@ -49,6 +49,7 @@
public Timer() {
setTimeout(Integer.MAX_VALUE);
Runnable r = new Runnable() {
+ @Override
public void run() {
while (isAlive()) {
boolean interrupted = false;
diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml
index 7227801..b8a47cb 100644
--- a/org.eclipse.jdt.debug/pom.xml
+++ b/org.eclipse.jdt.debug/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,6 +18,6 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug</artifactId>
- <version>3.8.200-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.jdt.launching.macosx/.classpath b/org.eclipse.jdt.launching.macosx/.classpath
index 112107e..f81ba7c 100644
--- a/org.eclipse.jdt.launching.macosx/.classpath
+++ b/org.eclipse.jdt.launching.macosx/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="macosx"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
index 5eb9f8a..0448784 100644
--- a/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
index bc359ec..f14ea93 100644
--- a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching.macosx; singleton:=true
-Bundle-Version: 3.2.300.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,6 +13,6 @@
org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)"
Eclipse-LazyStart: true
Eclipse-PlatformFilter: (osgi.os=macosx)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jdt.internal.launching.macosx;x-internal:=true
diff --git a/org.eclipse.jdt.launching.macosx/pom.xml b/org.eclipse.jdt.launching.macosx/pom.xml
index b66cd68..b7b6bac 100644
--- a/org.eclipse.jdt.launching.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.macosx/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.macosx</artifactId>
- <version>3.2.300-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/org.eclipse.jdt.launching.ui.macosx/.classpath b/org.eclipse.jdt.launching.ui.macosx/.classpath
index 64c5e31..098194c 100644
--- a/org.eclipse.jdt.launching.ui.macosx/.classpath
+++ b/org.eclipse.jdt.launching.ui.macosx/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jdt.launching.ui.macosx/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.launching.ui.macosx/.settings/org.eclipse.jdt.core.prefs
index 876aed9..f8c4822 100644
--- a/org.eclipse.jdt.launching.ui.macosx/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.launching.ui.macosx/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
index 3b3eb68..45f6481 100644
--- a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching.ui.macosx;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %providerName
Eclipse-PlatformFilter: (osgi.os=macosx)
Require-Bundle: org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml
index a90b801..e9d1691 100644
--- a/org.eclipse.jdt.launching.ui.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.ui.macosx</artifactId>
- <version>1.0.400-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
index d47a0b1..0e57c8a 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,17 +10,28 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.*;
-
import org.eclipse.core.runtime.IProgressMonitor;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
public class BundleBuilder implements BundleAttributes {
@@ -42,8 +53,9 @@
File tmp_dir= new File(bd.get(DESTINATIONDIRECTORY));
String app_dir_name= bd.get(APPNAME) + ".app"; //$NON-NLS-1$
File app_dir= new File(tmp_dir, app_dir_name);
- if (app_dir.exists())
+ if (app_dir.exists()) {
deleteDir(app_dir);
+ }
app_dir= createDir(tmp_dir, app_dir_name, false);
File contents_dir= createDir(app_dir, "Contents", false); //$NON-NLS-1$
@@ -51,8 +63,9 @@
File macos_dir= createDir(contents_dir, "MacOS", false); //$NON-NLS-1$
String launcher_path= bd.get(LAUNCHER);
- if (launcher_path == null)
- throw new IOException();
+ if (launcher_path == null) {
+ throw new IOException();
+ }
String launcher= copyFile(macos_dir, launcher_path, null);
File resources_dir= createDir(contents_dir, "Resources", false); //$NON-NLS-1$
@@ -97,10 +110,14 @@
String iconName= null;
String appName= fBundleDescription.get(APPNAME, null);
if (appName != null)
+ {
iconName= appName + ".icns"; //$NON-NLS-1$
+ }
String fname= copyFile(resources_dir, fBundleDescription.get(ICONFILE, null), iconName);
if (fname != null)
+ {
pair(dict, "CFBundleIconFile", null, fname); //$NON-NLS-1$
+ }
pair(dict, "CFBundleIdentifier", IDENTIFIER, null); //$NON-NLS-1$
pair(dict, "CFBundleName", APPNAME, null); //$NON-NLS-1$
@@ -117,7 +134,9 @@
pair(jdict, "WorkingDirectory", WORKINGDIR, null); //$NON-NLS-1$
if (fBundleDescription.get(USES_SWT, false))
+ {
addTrue(jdict, "StartOnMainThread"); //$NON-NLS-1$
+ }
String arguments= fBundleDescription.get(ARGUMENTS, null);
if (arguments != null) {
@@ -141,8 +160,9 @@
for (int i= 0; i < ris.length; i++) {
ResourceInfo ri= ris[i];
String e= processClasspathEntry(java_dir, ri.fPath, id);
- if (cp.length() > 0)
+ if (cp.length() > 0) {
cp.append(':');
+ }
cp.append(e);
}
add(jdict, "ClassPath", cp.toString()); //$NON-NLS-1$
@@ -157,9 +177,7 @@
}
File info= new File(contents_dir, "Info.plist"); //$NON-NLS-1$
- FileOutputStream fos= new FileOutputStream(info);
- BufferedOutputStream fOutputStream= new BufferedOutputStream(fos);
- try {
+ try (FileOutputStream fos = new FileOutputStream(info); BufferedOutputStream fOutputStream = new BufferedOutputStream(fos);) {
// Write the document to the stream
Transformer transformer= TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Apple Computer//DTD PLIST 1.0//EN"); //$NON-NLS-1$
@@ -174,9 +192,6 @@
} catch (TransformerException e) {
System.err.println("createInfoPList: could not transform to XML"); //$NON-NLS-1$
}
- finally {
- fOutputStream.close();
- }
}
private void add(Element dict, String key, Element value) {
@@ -218,10 +233,11 @@
private void pair(Element dict, String outkey, String inkey, String dflt) {
String value= null;
- if (inkey != null)
+ if (inkey != null) {
value= fBundleDescription.get(inkey, dflt);
- else
+ } else {
value= dflt;
+ }
if (value != null && value.trim().length() > 0) {
add(dict, outkey, value);
}
@@ -243,16 +259,17 @@
private void createPkgInfo(File contents_dir) throws IOException {
File pkgInfo= new File(contents_dir, "PkgInfo"); //$NON-NLS-1$
- FileOutputStream os= new FileOutputStream(pkgInfo);
- os.write(("APPL" + fBundleDescription.get(SIGNATURE, "????")).getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
- os.close();
+ try (FileOutputStream os = new FileOutputStream(pkgInfo)) {
+ os.write(("APPL" + fBundleDescription.get(SIGNATURE, "????")).getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
private static void deleteDir(File dir) {
File[] files= dir.listFiles();
if (files != null) {
- for (int i= 0; i < files.length; i++)
+ for (int i= 0; i < files.length; i++) {
deleteDir(files[i]);
+ }
}
dir.delete();
}
@@ -260,22 +277,26 @@
private File createDir(File parent_dir, String dir_name, boolean remove) throws IOException {
File dir= new File(parent_dir, dir_name);
if (dir.exists()) {
- if (!remove)
+ if (!remove) {
return dir;
+ }
deleteDir(dir);
}
if (! dir.mkdir())
+ {
throw new IOException("cannot create dir " + dir_name); //$NON-NLS-1$
+ }
return dir;
}
private String copyFile(File todir, String fromPath, String toname) throws IOException {
if (toname == null) {
int pos= fromPath.lastIndexOf('/');
- if (pos >= 0)
+ if (pos >= 0) {
toname= fromPath.substring(pos+1);
- else
+ } else {
toname= fromPath;
+ }
}
File to= new File(todir, toname);
fProcesses.add(Runtime.getRuntime().exec(new String[] { "/bin/cp", fromPath, to.getAbsolutePath() })); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
index 3426e35..d3209ec 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,15 +10,26 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.wizard.*;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
public abstract class BundleWizardBasePage extends DialogPage implements IWizardPage, BundleAttributes, IPropertyChangeListener {
@@ -56,10 +67,11 @@
*/
@Override
public void setVisible(boolean visible) {
- if (visible)
+ if (visible) {
enterPage();
- else
+ } else {
leavePage();
+ }
super.setVisible(visible);
}
@@ -75,8 +87,9 @@
public Image getImage() {
Image result = super.getImage();
- if (result == null && fWizard != null)
- return fWizard.getDefaultPageImage();
+ if (result == null && fWizard != null) {
+ return fWizard.getDefaultPageImage();
+ }
return result;
}
@@ -84,6 +97,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
final public void createControl(Composite parent) {
Composite c= new Composite(parent, SWT.NULL);
@@ -122,8 +136,9 @@
Text createText(Composite parent, String key, int lines) {
Text t= new Text(parent, SWT.BORDER);
GridData gd= new GridData(GridData.FILL_HORIZONTAL);
- if (lines == 2)
+ if (lines == 2) {
gd.heightHint= 30;
+ }
t.setLayoutData(gd);
hookField(t, key);
return t;
@@ -146,8 +161,9 @@
Button createButton(Composite parent, int flags, String text) {
Button b= new Button(parent, flags);
- if (text != null)
+ if (text != null) {
b.setText(text);
+ }
return b;
}
@@ -162,6 +178,7 @@
void hookField(final Text tf, final String key) {
tf.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
fBundleDescription.setValue(key, tf.getText());
checkIfPageComplete();
@@ -171,6 +188,7 @@
void hookField(final Combo tf, final String key) {
tf.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
fBundleDescription.setValue(key, tf.getText());
checkIfPageComplete();
@@ -190,8 +208,9 @@
final void checkIfPageComplete() {
IWizardContainer c= (fWizard != null) ? fWizard.getContainer() : null;
- if (c != null && this == c.getCurrentPage())
+ if (c != null && this == c.getCurrentPage()) {
c.updateButtons();
+ }
}
/////////////////////////////////////////////////////////
@@ -199,6 +218,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
*/
+ @Override
public boolean canFlipToNextPage() {
return isPageComplete() && getNextPage() != null;
}
@@ -206,6 +226,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#getName()
*/
+ @Override
public String getName() {
return Util.getString(fKey + ".title"); //$NON-NLS-1$;
}
@@ -213,26 +234,32 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#getNextPage()
*/
+ @Override
public IWizardPage getNextPage() {
- if (fWizard == null)
+ if (fWizard == null) {
return null;
+ }
return fWizard.getNextPage(this);
}
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#getPreviousPage()
*/
+ @Override
public IWizardPage getPreviousPage() {
- if (fPreviousPage != null)
+ if (fPreviousPage != null) {
return fPreviousPage;
- if (fWizard != null)
+ }
+ if (fWizard != null) {
return fWizard.getPreviousPage(this);
+ }
return null;
}
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#getWizard()
*/
+ @Override
public IWizard getWizard() {
return fWizard;
}
@@ -240,6 +267,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
*/
+ @Override
public void setPreviousPage(IWizardPage page) {
fPreviousPage= page;
}
@@ -247,6 +275,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardPage#setWizard(org.eclipse.jface.wizard.IWizard)
*/
+ @Override
public void setWizard(IWizard newWizard) {
fWizard= newWizard;
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
index 6e5a131..77d876b 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,19 +10,33 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
public class BundleWizardPage1 extends BundleWizardBasePage {
@@ -114,8 +128,9 @@
dd.setMessage(Util.getString("page1.appFolder.browseDialog.message")); //$NON-NLS-1$
dd.setText(Util.getString("page1.appFolder.browseDialog.title")); //$NON-NLS-1$
String name= dd.open();
- if (name != null)
+ if (name != null) {
fLocation.setText(name);
+ }
}
});
@@ -126,8 +141,9 @@
Composite c8= createComposite(g6, 4);
fJVMVersion= new Combo(c8, SWT.READ_ONLY);
- for (int i= 0; i < JVMS.length; i++)
+ for (int i= 0; i < JVMS.length; i++) {
fJVMVersion.add(JVMS[i]);
+ }
fJVMVersion.setText(JVMS[4]);
hookField(fJVMVersion, JVMVERSION);
createLabel(c8, " ", GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
@@ -146,8 +162,9 @@
fd.setText(Util.getString("page1.appIcon.chooseDialog.title")); //$NON-NLS-1$
fd.setFilterExtensions(new String[] { "icns" }); //$NON-NLS-1$
String name= fd.open();
- if (name != null)
+ if (name != null) {
fIconFileName.setText(name);
+ }
}
});
@@ -159,17 +176,26 @@
initCombo(fLaunchConfigs);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (fAppName != null)
+ {
fAppName.setText(fBundleDescription.get(APPNAME, "")); //$NON-NLS-1$
+ }
if (fMainClass != null)
+ {
fMainClass.setText(fBundleDescription.get(MAINCLASS, "")); //$NON-NLS-1$
+ }
if (fJVMVersion != null)
+ {
fJVMVersion.setText(fBundleDescription.get(JVMVERSION, "")); //$NON-NLS-1$
- if (fUseSWT != null)
+ }
+ if (fUseSWT != null) {
fUseSWT.setSelection(fBundleDescription.get(USES_SWT, false));
+ }
}
+ @Override
public boolean isPageComplete() {
return fAppName != null && fAppName.getText().length() > 0 && fLocation.getText().length() > 0;
}
@@ -184,14 +210,16 @@
ILaunchConfiguration[] configurations= manager.getLaunchConfigurations(type);
for (int i= 0; i < configurations.length; i++) {
ILaunchConfiguration configuration= configurations[i];
- if (BundleDescription.verify(configuration))
+ if (BundleDescription.verify(configuration)) {
configs.add(configuration);
+ }
}
} catch (CoreException e) {
//
}
fConfigurations= configs.toArray(new ILaunchConfiguration[configs.size()]);
Arrays.sort(fConfigurations, new Comparator<Object>() {
+ @Override
public int compare(Object o1, Object o2) {
ILaunchConfiguration lc1= (ILaunchConfiguration) o1;
ILaunchConfiguration lc2= (ILaunchConfiguration) o2;
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
index d35d1ad..eae7c7f 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,12 +10,19 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
public class BundleWizardPage2 extends BundleWizardBasePage {
@@ -103,32 +110,39 @@
ResourceInfo ri= (ResourceInfo) ti.getData();
if (fBundleDescription.removeResource(ri, b)) {
int ix= table.indexOf(ti);
- if (ix >= 0)
+ if (ix >= 0) {
table.remove(ix);
+ }
}
}
removeButton.setEnabled(table.getSelectionCount() > 0);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (fWorkingDir != null)
+ {
fWorkingDir.setText(fBundleDescription.get(WORKINGDIR, "")); //$NON-NLS-1$
+ }
if (fClassPath != null) {
fClassPath.removeAll();
ResourceInfo[] ris= fBundleDescription.getResources(true);
- for (int i= 0; i < ris.length; i++)
+ for (int i= 0; i < ris.length; i++) {
add(fClassPath, ris[i]);
+ }
}
if (fResources != null) {
fResources.removeAll();
ResourceInfo[] ris= fBundleDescription.getResources(false);
- for (int i= 0; i < ris.length; i++)
+ for (int i= 0; i < ris.length; i++) {
add(fResources, ris[i]);
+ }
}
}
+ @Override
public boolean isPageComplete() {
return true;
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
index 752fd4a..a365a80 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,14 +12,17 @@
import java.util.Enumeration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Composite;
-
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
public class BundleWizardPage3 extends BundleWizardBasePage {
@@ -68,9 +71,11 @@
col1.setWidth(150);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
- if (fProperties == null)
+ if (fProperties == null) {
return;
+ }
fIdentifier.setText(fBundleDescription.get(IDENTIFIER, "")); //$NON-NLS-1$
fSignature.setText(fBundleDescription.get(SIGNATURE, "")); //$NON-NLS-1$
fVMOptions.setText(fBundleDescription.get(VMOPTIONS, "")); //$NON-NLS-1$
@@ -88,6 +93,7 @@
}
}
+ @Override
public boolean isPageComplete() {
return true;
}
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
index 3032440..885b1c2 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
fWorkbench= workbench;
fSelection= selection;
@@ -74,8 +75,9 @@
private static ImageDescriptor createWizardImageDescriptor(String name) {
try {
URL baseUrl= MacOSXUILaunchingPlugin.getDefault().getBundle().getEntry("/icons/full/wizban/"); //$NON-NLS-1$
- if (baseUrl != null)
+ if (baseUrl != null) {
return ImageDescriptor.createFromURL(new URL(baseUrl, name));
+ }
} catch (MalformedURLException e) {
// fall through
}
diff --git a/org.eclipse.jdt.launching/.classpath b/org.eclipse.jdt.launching/.classpath
index 11a32bc..ca1c556 100644
--- a/org.eclipse.jdt.launching/.classpath
+++ b/org.eclipse.jdt.launching/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="launching"/>
<classpathentry kind="src" output="support_bin" path="support">
diff --git a/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
index c18dadc..507f385 100644
--- a/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,10 @@
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -35,7 +36,7 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -55,7 +56,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -66,7 +67,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -112,6 +113,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -124,7 +126,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 5225c51..526f7f2 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.7.200.qualifier
+Bundle-Version: 3.8.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -22,4 +22,4 @@
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Import-Package: com.ibm.icu.text
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
index 62f647f..86ab083 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
*
* @see org.eclipse.jdt.internal.launching.IRuntimeClasspathEntry2#isComposite()
*/
+ @Override
public boolean isComposite() {
return false;
}
@@ -86,6 +87,7 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc= DebugPlugin.newDocument();
Element root = doc.createElement("runtimeClasspathEntry"); //$NON-NLS-1$
@@ -115,6 +117,7 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getPath()
*/
+ @Override
public IPath getPath() {
return null;
}
@@ -126,6 +129,7 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getResource()
*/
+ @Override
public IResource getResource() {
return null;
}
@@ -133,36 +137,42 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentPath()
*/
+ @Override
public IPath getSourceAttachmentPath() {
return sourceAttachmentPath;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentPath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public void setSourceAttachmentPath(IPath path) {
sourceAttachmentPath = path;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootPath()
*/
+ @Override
public IPath getSourceAttachmentRootPath() {
return rootSourcePath;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentRootPath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public void setSourceAttachmentRootPath(IPath path) {
rootSourcePath = path;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathProperty()
*/
+ @Override
public int getClasspathProperty() {
return classpathProperty;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setClasspathProperty(int)
*/
+ @Override
public void setClasspathProperty(int property) {
classpathProperty = property;
}
@@ -173,6 +183,7 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getLocation()
*/
+ @Override
public String getLocation() {
return null;
}
@@ -183,6 +194,7 @@
* Subclasses should override if required.
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentLocation()
*/
+ @Override
public String getSourceAttachmentLocation() {
return null;
}
@@ -192,6 +204,7 @@
* Subclasses should override if required.
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootLocation()
*/
+ @Override
public String getSourceAttachmentRootLocation() {
return null;
}
@@ -202,6 +215,7 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getVariableName()
*/
+ @Override
public String getVariableName() {
return null;
}
@@ -212,12 +226,14 @@
*
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathEntry()
*/
+ @Override
public IClasspathEntry getClasspathEntry() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getJavaProject()
*/
+ @Override
public IJavaProject getJavaProject() {
return fJavaProject;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
index f4dd479..e84db9e 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
*/
+ @Override
public ISourceContainer createSourceContainer(String memento) throws CoreException {
Node node = parseDocument(memento);
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -48,6 +49,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/
+ @Override
public String getMemento(ISourceContainer container) throws CoreException {
ClasspathContainerSourceContainer var = (ClasspathContainerSourceContainer) container;
Document document = newDocument();
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
index aba2802..a7750ca 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
*/
+ @Override
public ISourceContainer createSourceContainer(String memento) throws CoreException {
Node node = parseDocument(memento);
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -48,6 +49,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/
+ @Override
public String getMemento(ISourceContainer container) throws CoreException {
ClasspathVariableSourceContainer var = (ClasspathVariableSourceContainer) container;
Document document = newDocument();
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
index 078d5e4..d9ed7e1 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)entry;
IRuntimeClasspathEntry[] entries = entry2.getRuntimeClasspathEntries(configuration);
@@ -45,6 +46,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)entry;
IRuntimeClasspathEntry[] entries = entry2.getRuntimeClasspathEntries(null);
@@ -61,6 +63,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveVMInstall(org.eclipse.jdt.core.IClasspathEntry)
*/
+ @Override
public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
return null;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
index b8b800a..7f5e1ee 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -75,6 +75,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
*/
+ @Override
public void initializeFrom(Element memento) throws CoreException {
String name = memento.getAttribute("project"); //$NON-NLS-1$
if (name == null) {
@@ -90,12 +91,14 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
*/
+ @Override
public String getTypeId() {
return TYPE_ID;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
*/
+ @Override
public int getType() {
return OTHER;
}
@@ -131,6 +134,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
IClasspathEntry entry = JavaCore.newProjectEntry(getJavaProject().getProject().getFullPath());
List<Object> classpathEntries = new ArrayList<Object>(5);
@@ -322,6 +326,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
*/
+ @Override
public String getName() {
if (isExportedEntriesOnly()) {
return NLS.bind(LaunchingMessages.DefaultProjectClasspathEntry_2, new String[] {getJavaProject().getElementName()});
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EEVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EEVMType.java
index 19bd4ac..c7883ca 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EEVMType.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EEVMType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -151,6 +151,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#detectInstallLocation()
*/
+ @Override
public File detectInstallLocation() {
return null;
}
@@ -158,6 +159,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#getDefaultLibraryLocations(java.io.File)
*/
+ @Override
public LibraryLocation[] getDefaultLibraryLocations(File installLocationOrDefinitionFile) {
return new LibraryLocation[0];
}
@@ -165,6 +167,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#getName()
*/
+ @Override
public String getName() {
return LaunchingMessages.EEVMType_2;
}
@@ -172,6 +175,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#validateInstallLocation(java.io.File)
*/
+ @Override
public IStatus validateInstallLocation(File installLocation) {
if (installLocation.exists()) {
return new Status(IStatus.INFO, LaunchingPlugin.ID_PLUGIN, LaunchingMessages.EEVMType_4);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
index c33a586..53ae6be 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -196,16 +196,19 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall newVm) {}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(PropertyChangeEvent event) {
if (event.getSource() != null) {
fgClasspathEntries.remove(event.getSource());
@@ -216,6 +219,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall removedVm) {
fgClasspathEntries.remove(removedVm);
removeRuleEntry(removedVm);
@@ -373,6 +377,7 @@
/**
* @see IClasspathContainer#getClasspathEntries()
*/
+ @Override
public IClasspathEntry[] getClasspathEntries() {
if (LaunchingPlugin.DEBUG_JRE_CONTAINER) {
LaunchingPlugin.trace("<JRE_CONTAINER> getClasspathEntries() " + this.toString()); //$NON-NLS-1$
@@ -390,6 +395,7 @@
/**
* @see IClasspathContainer#getDescription()
*/
+ @Override
public String getDescription() {
String environmentId = JavaRuntime.getExecutionEnvironmentId(getPath());
String tag = null;
@@ -404,6 +410,7 @@
/**
* @see IClasspathContainer#getKind()
*/
+ @Override
public int getKind() {
return IClasspathContainer.K_DEFAULT_SYSTEM;
}
@@ -411,6 +418,7 @@
/**
* @see IClasspathContainer#getPath()
*/
+ @Override
public IPath getPath() {
return fPath;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
index 3159b97..2ca2ed2 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@
class Visitor implements IPreferenceNodeVisitor {
+ @Override
public boolean visit(IEclipsePreferences node) throws BackingStoreException {
if (node.name().equals(LaunchingPlugin.getUniqueIdentifier())) {
String jresXML = node.get(JavaRuntime.PREF_VM_XML, null);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
index 8155924..edc4767 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
IVMInstall jre = null;
if (entry.getType() == IRuntimeClasspathEntry.CONTAINER && entry.getPath().segmentCount() > 1) {
@@ -63,6 +64,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
IVMInstall jre = null;
if (entry.getType() == IRuntimeClasspathEntry.CONTAINER && entry.getPath().segmentCount() > 1) {
@@ -165,6 +167,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveVMInstall(IClasspathEntry)
*/
+ @Override
public IVMInstall resolveVMInstall(IClasspathEntry entry) {
switch (entry.getEntryKind()) {
case IClasspathEntry.CPE_VARIABLE:
@@ -186,6 +189,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver2#isVMInstallReference(org.eclipse.jdt.core.IClasspathEntry)
*/
+ @Override
public boolean isVMInstallReference(IClasspathEntry entry) {
switch (entry.getEntryKind()) {
case IClasspathEntry.CPE_VARIABLE:
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
index 1347cd8..6930302 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,13 +23,11 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IDebugEventSetListener;
@@ -37,7 +35,6 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IProcess;
-
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.JavaLaunchDelegate;
import org.eclipse.jdt.launching.JavaRuntime;
@@ -82,21 +79,12 @@
if (!file.exists()) {
// copy it to the working directory
File test = LaunchingPlugin.getFileInPlugin(new Path("java.policy.applet")); //$NON-NLS-1$
- BufferedOutputStream outputStream= null;
- try {
+ try (BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file))) {
byte[] bytes = getFileByteContent(test);
- outputStream = new BufferedOutputStream(new FileOutputStream(file));
outputStream.write(bytes);
} catch (IOException e) {
return "";//$NON-NLS-1$
- } finally {
- if (outputStream != null) {
- try {
- outputStream.close();
- } catch (IOException e1) {
- }
- }
- }
+ }
}
return "-Djava.security.policy=java.policy.applet";//$NON-NLS-1$
}
@@ -110,9 +98,8 @@
* @return the new HTML file
*/
private File buildHTMLFile(ILaunchConfiguration configuration, File dir) {
- FileOutputStream stream = null;
File tempFile = null;
- try {
+ try (FileOutputStream stream = new FileOutputStream(tempFile)) {
String encoding = getLaunchManager().getEncoding(configuration);
String name = getAppletMainTypeName(configuration);
StringBuffer buf = new StringBuffer();
@@ -148,17 +135,9 @@
buf.append("</html>\n"); //$NON-NLS-1$
tempFile = new File(dir, name + System.currentTimeMillis() + ".html"); //$NON-NLS-1$
- stream = new FileOutputStream(tempFile);
stream.write(buf.toString().getBytes(encoding));
} catch(IOException e) {
} catch(CoreException e) {
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch(IOException e) {
- }
- }
}
return tempFile;
@@ -167,19 +146,21 @@
private String getQuotedString(String string) {
int singleQuotes = count(string, '\'');
int doubleQuotes = count(string, '"');
- if (doubleQuotes == 0)
+ if (doubleQuotes == 0) {
return '"' + string + '"';
- else if (singleQuotes == 0)
+ } else if (singleQuotes == 0) {
return '\'' + string + '\'';
- else
+ } else {
return '"' + convertToHTMLContent(string) + '"';
+ }
}
private static int count(String string, char character) {
int count = 0;
for (int i = 0; i < string.length(); i++) {
- if (string.charAt(i) == character)
+ if (string.charAt(i) == character) {
count++;
+ }
}
return count;
}
@@ -195,8 +176,9 @@
int previous = 0;
int current = text.indexOf(c, previous);
- if (current == -1)
+ if (current == -1) {
return text;
+ }
StringBuffer buffer = new StringBuffer();
while (current > -1) {
@@ -266,17 +248,8 @@
* @throws IOException if a problem occurred reading the file.
*/
protected static byte[] getFileByteContent(File file) throws IOException {
- InputStream stream = null;
- try {
- stream = new BufferedInputStream(new FileInputStream(file));
+ try (InputStream stream = new BufferedInputStream(new FileInputStream(file))) {
return getInputStreamAsByteArray(stream, (int) file.length());
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- }
- }
}
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaFxLibraryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaFxLibraryResolver.java
index 2507f65..42c139d 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaFxLibraryResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaFxLibraryResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 IBM Corporation and others.
+ * Copyright (c) 2014, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,10 +28,12 @@
return JFXRT_JAR.equals(libraryPath.lastSegment());
}
+ @Override
public IPath getPackageRoot(IPath libraryPath) {
return Path.EMPTY;
}
+ @Override
public IPath getSourcePath(IPath libraryPath) {
if (isJavaFx(libraryPath)) {
File parent = libraryPath.toFile().getParentFile();
@@ -46,6 +48,7 @@
return Path.EMPTY;
}
+ @Override
public URL getJavadocLocation(IPath libraryPath) {
if (isJavaFx(libraryPath)) {
/*
@@ -62,6 +65,7 @@
return null;
}
+ @Override
public URL getIndexLocation(IPath libraryPath) {
return null;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
index c5076b9..e746988 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
@@ -572,6 +572,7 @@
* @since 3.2
* @return true if the specified tests pass, or the context is a container, false otherwise
*/
+ @Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
if (PROPERTY_IS_CONTAINER.equals(property)) {
if (receiver instanceof IAdaptable) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaMigrationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaMigrationDelegate.java
index 7f08447..ea94e5b 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaMigrationDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaMigrationDelegate.java
@@ -46,6 +46,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchConfigurationMigrationDelegate#isCandidate()
*/
+ @Override
public boolean isCandidate(ILaunchConfiguration candidate) throws CoreException {
String pName = candidate.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);
if(pName.equals(EMPTY_STRING)) {
@@ -129,6 +130,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchConfigurationMigrationDelegate#migrate(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void migrate(ILaunchConfiguration candidate) throws CoreException {
ILaunchConfigurationWorkingCopy wc = candidate.getWorkingCopy();
updateResourceMapping(wc);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
index 48e0527..d6c441c 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
*/
+ @Override
public ISourceContainer createSourceContainer(String memento) throws CoreException {
Node node = parseDocument(memento);
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -53,6 +54,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/
+ @Override
public String getMemento(ISourceContainer container) throws CoreException {
JavaProjectSourceContainer project = (JavaProjectSourceContainer) container;
Document document = newDocument();
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
index 58dd5a5..2176775 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
index 510b9b5..f539253 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector#initializeParticipants()
*/
+ @Override
public void initializeParticipants() {
addParticipants(new ISourceLookupParticipant[] {new JavaSourceLookupParticipant()});
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
index ac57d1e..7ff6286 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -209,6 +209,7 @@
/**
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
fDefaultChanged = true;
}
@@ -216,12 +217,14 @@
/**
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall vm) {
}
/**
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent event) {
String property = event.getProperty();
IVMInstall vm = (IVMInstall)event.getSource();
@@ -260,6 +263,7 @@
/**
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall vm) {
}
@@ -274,6 +278,7 @@
protected void doit(IProgressMonitor monitor) throws CoreException {
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor1) throws CoreException {
IJavaProject[] projects = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProjects();
monitor1.beginTask(LaunchingMessages.LaunchingPlugin_0, projects.length + 1);
@@ -528,9 +533,13 @@
props.put(org.eclipse.osgi.service.debug.DebugOptions.LISTENER_SYMBOLICNAME, getUniqueIdentifier());
context.registerService(DebugOptionsListener.class.getName(), this, props);
ResourcesPlugin.getWorkspace().addSaveParticipant(ID_PLUGIN, new ISaveParticipant() {
+ @Override
public void doneSaving(ISaveContext context1) {}
+ @Override
public void prepareToSave(ISaveContext context1) throws CoreException {}
+ @Override
public void rollback(ISaveContext context1) {}
+ @Override
public void saving(ISaveContext context1) throws CoreException {
try {
InstanceScope.INSTANCE.getNode(ID_PLUGIN).flush();
@@ -745,6 +754,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
if (!fBatchingChanges) {
VMChanges changes = new VMChanges();
@@ -756,12 +766,14 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall vm) {
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent event) {
if (!fBatchingChanges) {
VMChanges changes = new VMChanges();
@@ -773,6 +785,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall vm) {
if (!fBatchingChanges) {
VMChanges changes = new VMChanges();
@@ -784,6 +797,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
*/
+ @Override
public void resourceChanged(IResourceChangeEvent event) {
ArchiveSourceLocation.closeArchives();
}
@@ -877,7 +891,6 @@
* Saves the library info in a local workspace state location
*/
private static void saveLibraryInfo() {
- OutputStream stream= null;
try {
String xml = getLibraryInfoAsXML();
IPath libPath = getDefault().getStateLocation();
@@ -886,19 +899,13 @@
if (!file.exists()) {
file.createNewFile();
}
- stream = new BufferedOutputStream(new FileOutputStream(file));
- stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
+ try (OutputStream stream = new BufferedOutputStream(new FileOutputStream(file))) {
+ stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
+ }
} catch (IOException e) {
log(e);
} catch (CoreException e) {
log(e);
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e1) {
- }
- }
}
}
@@ -1047,7 +1054,6 @@
*/
private static void writeInstallInfo() {
if(fgInstallTimeMap != null) {
- OutputStream stream= null;
try {
Document doc = DebugPlugin.newDocument();
Element root = doc.createElement("dirs"); //$NON-NLS-1$
@@ -1073,19 +1079,13 @@
if (!file.exists()) {
file.createNewFile();
}
- stream = new BufferedOutputStream(new FileOutputStream(file));
- stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
+ try (OutputStream stream = new BufferedOutputStream(new FileOutputStream(file))) {
+ stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
+ }
} catch (IOException e) {
log(e);
} catch (CoreException e) {
log(e);
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e1) {
- }
- }
}
}
}
@@ -1132,6 +1132,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public void launchesRemoved(ILaunch[] launches) {
ArchiveSourceLocation.closeArchives();
}
@@ -1139,18 +1140,21 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public void launchesAdded(ILaunch[] launches) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
*/
+ @Override
public void launchesChanged(ILaunch[] launches) {
}
/* (non-Javadoc)
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
@@ -1252,6 +1256,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
String property = event.getKey();
if (property.equals(JavaRuntime.PREF_VM_XML)) {
@@ -1264,6 +1269,7 @@
/* (non-Javadoc)
* @see org.eclipse.osgi.service.debug.DebugOptionsListener#optionsChanged(org.eclipse.osgi.service.debug.DebugOptions)
*/
+ @Override
public void optionsChanged(DebugOptions options) {
DEBUG = options.getBooleanOption(DEBUG_FLAG, false);
DEBUG_JRE_CONTAINER = DEBUG && options.getBooleanOption(DEBUG_JRE_CONTAINER_FLAG, false);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
index 74c0e9b..880568b 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
*/
+ @Override
public ISourceContainer createSourceContainer(String memento) throws CoreException {
Node node = parseDocument(memento);
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -55,6 +56,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/
+ @Override
public String getMemento(ISourceContainer container) throws CoreException {
PackageFragmentRootSourceContainer root = (PackageFragmentRootSourceContainer) container;
Document document = newDocument();
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java
index bfae5cc..a23b7a9 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@
*/
public class ProjectClasspathVariableResolver implements IDynamicVariableResolver {
+ @Override
public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
IProject proj = null;
if (argument == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
index 72f3b35..c46920b 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -225,6 +225,7 @@
/**
* @see IRuntimeClasspathEntry#getType()
*/
+ @Override
public int getType() {
return fType;
}
@@ -252,6 +253,7 @@
/**
* @see IRuntimeClasspathEntry#getClasspathEntry()
*/
+ @Override
public IClasspathEntry getClasspathEntry() {
return fClasspathEntry;
}
@@ -259,6 +261,7 @@
/**
* @see IRuntimeClasspathEntry#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("runtimeClasspathEntry"); //$NON-NLS-1$
@@ -297,6 +300,7 @@
/**
* @see IRuntimeClasspathEntry#getPath()
*/
+ @Override
public IPath getPath() {
IClasspathEntry entry = getClasspathEntry();
return entry != null ? entry.getPath() : fInvalidPath;
@@ -305,6 +309,7 @@
/**
* @see IRuntimeClasspathEntry#getResource()
*/
+ @Override
public IResource getResource() {
switch (getType()) {
case CONTAINER:
@@ -348,6 +353,7 @@
/**
* @see IRuntimeClasspathEntry#getSourceAttachmentPath()
*/
+ @Override
public IPath getSourceAttachmentPath() {
IClasspathEntry entry = getClasspathEntry();
return entry != null ? entry.getSourceAttachmentPath() : null;
@@ -356,6 +362,7 @@
/**
* @see IRuntimeClasspathEntry#setSourceAttachmentPath(IPath)
*/
+ @Override
public void setSourceAttachmentPath(IPath path) {
if (path != null && path.isEmpty()) {
path = null;
@@ -366,6 +373,7 @@
/**
* @see IRuntimeClasspathEntry#getSourceAttachmentRootPath()
*/
+ @Override
public IPath getSourceAttachmentRootPath() {
IClasspathEntry entry = getClasspathEntry();
IPath path = entry != null ? getClasspathEntry().getSourceAttachmentRootPath() : null;
@@ -378,6 +386,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentRootPath(org.eclipse.core.runtime.IPath)
*/
+ @Override
public void setSourceAttachmentRootPath(IPath path) {
if (path != null && path.isEmpty()) {
path = null;
@@ -410,6 +419,7 @@
/**
* @see IRuntimeClasspathEntry#setClasspathProperty(int)
*/
+ @Override
public void setClasspathProperty(int location) {
fClasspathProperty = location;
}
@@ -417,6 +427,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathProperty()
*/
+ @Override
public int getClasspathProperty() {
return fClasspathProperty;
}
@@ -424,6 +435,7 @@
/**
* @see IRuntimeClasspathEntry#getLocation()
*/
+ @Override
public String getLocation() {
IPath path = null;
@@ -479,6 +491,7 @@
/**
* @see IRuntimeClasspathEntry#getVariableName()
*/
+ @Override
public String getVariableName() {
if (getType() == IRuntimeClasspathEntry.VARIABLE || getType() == IRuntimeClasspathEntry.CONTAINER) {
return getPath().segment(0);
@@ -545,6 +558,7 @@
/**
* @see IRuntimeClasspathEntry#getSourceAttachmentLocation()
*/
+ @Override
public String getSourceAttachmentLocation() {
IPath path = null;
switch (getType()) {
@@ -564,6 +578,7 @@
/**
* @see IRuntimeClasspathEntry#getSourceAttachmentRootLocation()
*/
+ @Override
public String getSourceAttachmentRootLocation() {
IPath path = null;
switch (getType()) {
@@ -633,6 +648,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getJavaProject()
*/
+ @Override
public IJavaProject getJavaProject() {
return fJavaProject;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
index 221a6ec..f975091 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
/**
* @see Comparator#compare(Object, Object)
*/
+ @Override
public int compare(Object o1, Object o2) {
List<?> list1 = (List<?>)o1;
List<?> list2 = (List<?>)o2;
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
index 745be7f..cd1abdd 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
return getResolver().resolveRuntimeClasspathEntry(entry, configuration);
}
@@ -85,6 +86,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveVMInstall(IClasspathEntry)
*/
+ @Override
public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
return getResolver().resolveVMInstall(entry);
}
@@ -92,6 +94,7 @@
/**
* @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
return getResolver().resolveRuntimeClasspathEntry(entry, project);
}
@@ -99,6 +102,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver2#isVMInstallReference(org.eclipse.jdt.core.IClasspathEntry)
*/
+ @Override
public boolean isVMInstallReference(IClasspathEntry entry) {
try {
IRuntimeClasspathEntryResolver resolver = getResolver();
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
index 9eae8d5..4241fc9 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@
/**
* @see IRuntimeClasspathProvider#computeUnresolvedClasspath(ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
return getProvider().computeUnresolvedClasspath(configuration);
}
@@ -59,6 +60,7 @@
/**
* @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
return getProvider().resolveClasspath(entries, configuration);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
index 364391a..cabc0ad 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -71,6 +71,7 @@
/**
* @see IVMConnector#getIdentifier()
*/
+ @Override
public String getIdentifier() {
return IJavaLaunchConfigurationConstants.ID_SOCKET_ATTACH_VM_CONNECTOR;
}
@@ -78,6 +79,7 @@
/**
* @see IVMConnector#getName()
*/
+ @Override
public String getName() {
return LaunchingMessages.SocketAttachConnector_Standard__Socket_Attach__4;
}
@@ -99,6 +101,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#connect(java.util.Map, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.ILaunch)
*/
+ @Override
public void connect(Map<String, String> arguments, IProgressMonitor monitor, ILaunch launch) throws CoreException {
if (monitor == null) {
monitor = new NullProgressMonitor();
@@ -196,6 +199,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getDefaultArguments()
*/
+ @Override
public Map<String, Connector.Argument> getDefaultArguments() throws CoreException {
Map<String, Connector.Argument> def = getAttachingConnector().defaultArguments();
Connector.IntegerArgument arg = (Connector.IntegerArgument)def.get("port"); //$NON-NLS-1$
@@ -206,6 +210,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getArgumentOrder()
*/
+ @Override
public List<String> getArgumentOrder() {
List<String> list = new ArrayList<String>(2);
list.add("hostname"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
index 09600e1..8ce56d7 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getIdentifier()
*/
+ @Override
public String getIdentifier() {
return IJavaLaunchConfigurationConstants.ID_SOCKET_LISTEN_VM_CONNECTOR;
}
@@ -71,6 +72,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getName()
*/
+ @Override
public String getName() {
return LaunchingMessages.SocketListenConnector_1;
}
@@ -78,6 +80,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#connect(java.util.Map, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.ILaunch)
*/
+ @Override
public void connect(Map<String, String> arguments, IProgressMonitor monitor, ILaunch launch) throws CoreException {
if (monitor == null) {
monitor = new NullProgressMonitor();
@@ -113,6 +116,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getDefaultArguments()
*/
+ @Override
public Map<String, Connector.Argument> getDefaultArguments() throws CoreException {
Map<String, Connector.Argument> def = getListeningConnector().defaultArguments();
Connector.IntegerArgument arg = (Connector.IntegerArgument)def.get("port"); //$NON-NLS-1$
@@ -123,6 +127,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMConnector#getArgumentOrder()
*/
+ @Override
public List<String> getArgumentOrder() {
List<String> list = new ArrayList<String>(1);
list.add("port"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java
index b151e54..c7587c5 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java
@@ -130,6 +130,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#getExitValue()
*/
+ @Override
public int getExitValue() throws DebugException {
return 0;
}
@@ -137,6 +138,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#getLabel()
*/
+ @Override
public String getLabel() {
return NLS.bind(LaunchingMessages.SocketListenConnectorProcess_1, new String[]{fPort});
}
@@ -144,6 +146,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#getLaunch()
*/
+ @Override
public ILaunch getLaunch() {
return fLaunch;
}
@@ -151,6 +154,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/
+ @Override
public boolean canTerminate() {
return !fTerminated;
}
@@ -158,6 +162,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/
+ @Override
public boolean isTerminated() {
return fTerminated;
}
@@ -165,6 +170,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#terminate()
*/
+ @Override
public void terminate() throws DebugException {
if (!fTerminated){
fTerminated = true;
@@ -201,6 +207,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#getStreamsProxy()
*/
+ @Override
public IStreamsProxy getStreamsProxy() {
return null;
}
@@ -208,6 +215,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#getAttribute(java.lang.String)
*/
+ @Override
public String getAttribute(String key) {
return null;
}
@@ -215,12 +223,14 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IProcess#setAttribute(java.lang.String, java.lang.String)
*/
+ @Override
public void setAttribute(String key, String value) {
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
return null;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
index 55873b1..8ed1929 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
@@ -106,6 +106,7 @@
fConnectionMap = map;
}
+ @Override
public void run() {
try {
fVirtualMachine = fConnector.accept(fConnectionMap);
@@ -547,12 +548,14 @@
* Returns the default 'com.sun.jdi.SocketListen' connector
* @return the {@link ListeningConnector}
*/
+ @SuppressWarnings("nls")
protected ListeningConnector getConnector() {
List<ListeningConnector> connectors= Bootstrap.virtualMachineManager().listeningConnectors();
for (int i= 0; i < connectors.size(); i++) {
ListeningConnector c= connectors.get(i);
- if ("com.sun.jdi.SocketListen".equals(c.name())) //$NON-NLS-1$
+ if ("com.sun.jdi.SocketListen".equals(c.name())) {
return c;
+ }
}
return null;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
index 146dc56..7b696c0 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -349,6 +349,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMRunner#run(org.eclipse.jdt.launching.VMRunnerConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
index cb07085..fd11dd8 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -86,6 +86,7 @@
* @since 3.7.0
*/
private static FilenameFilter fgArchiveFilter = new FilenameFilter() {
+ @Override
public boolean accept(File arg0, String arg1) {
return arg1.endsWith(".zip") || arg1.endsWith(".jar"); //$NON-NLS-1$//$NON-NLS-2$
}
@@ -154,6 +155,7 @@
// The "libraryLocationResolvers" extension point doesn't have any conflict resolution.
// Sorting by namespace at least makes makes the order predictable.
Arrays.sort(configs, new Comparator<IConfigurationElement>() {
+ @Override
public int compare(IConfigurationElement e1, IConfigurationElement e2) {
return e1.getNamespaceIdentifier().compareTo(e2.getNamespaceIdentifier());
}
@@ -176,6 +178,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#getName()
*/
+ @Override
public String getName() {
return LaunchingMessages.StandardVMType_Standard_VM_3;
}
@@ -245,6 +248,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#detectInstallLocation()
*/
+ @Override
public File detectInstallLocation() {
// We want a Mac OSX VM install so don't process the install location for this type
if(Platform.OS_MACOSX.equals(Platform.getOS())) {
@@ -399,6 +403,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#getDefaultLibraryLocations(java.io.File)
*/
+ @Override
public LibraryLocation[] getDefaultLibraryLocations(File installLocation) {
//NOTE: We do not add libraries from the "endorsed" directory explicitly, as
//the bootpath contains these entries already (if they exist).
@@ -577,6 +582,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#validateInstallLocation(java.io.File)
*/
+ @Override
public IStatus validateInstallLocation(File javaHome) {
IStatus status = null;
File javaExecutable = findJavaExecutable(javaHome);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
index 0ece35c..e9cd46e 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -432,22 +432,18 @@
*/
public static void parseXMLIntoContainer(InputStream inputStream, VMDefinitionsContainer container) throws IOException {
- // Wrapper the stream for efficient parsing
- InputStream stream= new BufferedInputStream(inputStream);
// Do the parsing and obtain the top-level node
Element config= null;
- try {
+ // Wrapper the stream for efficient parsing
+ try (InputStream stream = new BufferedInputStream(inputStream)) {
DocumentBuilder parser= DocumentBuilderFactory.newInstance().newDocumentBuilder();
parser.setErrorHandler(new DefaultHandler());
config = parser.parse(new InputSource(stream)).getDocumentElement();
} catch (SAXException e) {
throw new IOException(LaunchingMessages.JavaRuntime_badFormat);
} catch (ParserConfigurationException e) {
- stream.close();
throw new IOException(LaunchingMessages.JavaRuntime_badFormat);
- } finally {
- stream.close();
}
// If the top-level node wasn't what we expected, bail out
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMListener.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMListener.java
index 03e57c2..4ffad85 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMListener.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
fChanged = true;
}
@@ -34,6 +35,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall vm) {
fChanged = true;
}
@@ -41,6 +43,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(PropertyChangeEvent event) {
fChanged = true;
}
@@ -48,6 +51,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall vm) {
fChanged = true;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
index 2974f45..307a90e 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
*/
+ @Override
public void initializeFrom(Element memento) throws CoreException {
variableString = memento.getAttribute("variableString"); //$NON-NLS-1$
String property = memento.getAttribute("path"); //$NON-NLS-1$
@@ -65,6 +66,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
*/
+ @Override
public String getTypeId() {
return TYPE_ID;
}
@@ -72,6 +74,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
return new IRuntimeClasspathEntry[0];
}
@@ -79,6 +82,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
*/
+ @Override
public String getName() {
return variableString;
}
@@ -86,6 +90,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
*/
+ @Override
public int getType() {
return OTHER;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
index c6f0cc2..dd4ee98 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
return resolveRuntimeClasspathEntry(entry);
}
@@ -36,6 +37,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
return resolveRuntimeClasspathEntry(entry);
}
@@ -51,6 +53,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveVMInstall(org.eclipse.jdt.core.IClasspathEntry)
*/
+ @Override
public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
return null;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java
index 172ccc4..1db8251 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/AccessRuleParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IAccessRuleParticipant#getAccessRules(org.eclipse.jdt.launching.environments.IExecutionEnvironment, org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.LibraryLocation[], org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IAccessRule[][] getAccessRules(IExecutionEnvironment environment, IVMInstall vm, LibraryLocation[] libraries, IJavaProject project) {
try {
return getDelegate().getAccessRules(environment, vm, libraries, project);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java
index 50db5c6..007fd3d 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/Analyzer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironmentAnalyzer#analyze(org.eclipse.jdt.launching.IVMInstall, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
return getDelegate().analyze(vm, monitor);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/DefaultAccessRuleParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/DefaultAccessRuleParticipant.java
index 7bf793c..d97cbf8 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/DefaultAccessRuleParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/DefaultAccessRuleParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,6 +42,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IAccessRuleParticipant#getAccessRules(org.eclipse.jdt.launching.environments.IExecutionEnvironment, org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.LibraryLocation[], org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IAccessRule[][] getAccessRules(IExecutionEnvironment environment, IVMInstall vm, LibraryLocation[] libraries, IJavaProject project) {
IAccessRule[][] allRules = null;
allRules = fgRules.get(environment.getId());
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
index f00fa70..fd00663 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -152,6 +152,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager#getExecutionEnvironments()
*/
+ @Override
public synchronized IExecutionEnvironment[] getExecutionEnvironments() {
initializeExtensions();
return fEnvironments.toArray(new IExecutionEnvironment[fEnvironments.size()]);
@@ -171,6 +172,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager#getEnvironment(java.lang.String)
*/
+ @Override
public synchronized IExecutionEnvironment getEnvironment(String id) {
initializeExtensions();
return fEnvironmentsMap.get(id);
@@ -192,6 +194,7 @@
IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.ID_PLUGIN, JavaRuntime.EXTENSION_POINT_EXECUTION_ENVIRONMENTS);
IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
fEnvironments = new TreeSet<IExecutionEnvironment>(new Comparator<IExecutionEnvironment>() {
+ @Override
public int compare(IExecutionEnvironment o1, IExecutionEnvironment o2) {
return o1.getId().compareTo(o2.getId());
}
@@ -353,6 +356,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
// nothing
}
@@ -360,6 +364,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public synchronized void vmChanged(PropertyChangeEvent event) {
IVMInstall vm = (IVMInstall) event.getSource();
if (vm instanceof VMStandin) {
@@ -372,6 +377,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public synchronized void vmAdded(IVMInstall vm) {
// TODO: progress reporting?
if (vm instanceof VMStandin) {
@@ -383,6 +389,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public synchronized void vmRemoved(IVMInstall vm) {
if (vm instanceof VMStandin) {
return;
@@ -406,6 +413,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
// don't respond to myself
if (fIsUpdatingDefaults) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java
index 13c8593..26f9738 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,16 +64,19 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmAdded(IVMInstall newVm) {}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
*/
+ @Override
public void vmChanged(PropertyChangeEvent event) {
if (event.getSource() != null) {
fParticipantMap.remove(event.getSource());
@@ -84,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void vmRemoved(IVMInstall removedVm) {
fParticipantMap.remove(removedVm);
fRuleCache.remove(removedVm);
@@ -180,6 +184,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getId()
*/
+ @Override
public String getId() {
return fElement.getAttribute("id"); //$NON-NLS-1$
}
@@ -187,6 +192,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getDescription()
*/
+ @Override
public String getDescription() {
return fElement.getAttribute("description"); //$NON-NLS-1$
}
@@ -194,6 +200,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getCompatibleVMs()
*/
+ @Override
public IVMInstall[] getCompatibleVMs() {
init();
return fCompatibleVMs.toArray(new IVMInstall[fCompatibleVMs.size()]);
@@ -202,6 +209,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#isStrictlyCompatible(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public boolean isStrictlyCompatible(IVMInstall vm) {
init();
return fStrictlyCompatible.contains(vm);
@@ -210,6 +218,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getDefaultVM()
*/
+ @Override
public IVMInstall getDefaultVM() {
init();
return fDefault;
@@ -218,6 +227,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#setDefaultVM(org.eclipse.jdt.launching.IVMInstall)
*/
+ @Override
public void setDefaultVM(IVMInstall vm) {
init();
if (vm != null && !fCompatibleVMs.contains(vm)) {
@@ -303,6 +313,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getAccessRules(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.LibraryLocation[], org.eclipse.jdt.core.IJavaProject)
*/
+ @Override
public IAccessRule[][] getAccessRules(IVMInstall vm, LibraryLocation[] libraries, IJavaProject project) {
IAccessRuleParticipant[] participants = getParticipants();
Map<IAccessRuleParticipant, IAccessRule[][]> rulesByParticipant = collectRulesByParticipant(participants, vm, libraries, project);
@@ -403,6 +414,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getProfileProperties()
*/
+ @Override
public Properties getProfileProperties() {
if (!fPropertiesInitialized) {
fPropertiesInitialized = true;
@@ -434,23 +446,14 @@
private Properties getJavaProfileProperties(Bundle bundle, String path) {
URL profileURL = bundle.getEntry(path);
if (profileURL != null) {
- InputStream is = null;
- try {
+ try (InputStream is = profileURL.openStream()) {
profileURL = FileLocator.resolve(profileURL);
- is = profileURL.openStream();
if (is != null) {
Properties profile = new Properties();
profile.load(is);
return profile;
}
} catch (IOException e) {
- } finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException e) {
- }
}
}
return null;
@@ -459,6 +462,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getSubEnvironments()
*/
+ @Override
public IExecutionEnvironment[] getSubEnvironments() {
Properties properties = getProfileProperties();
Set<IExecutionEnvironment> subenv = new LinkedHashSet<IExecutionEnvironment>();
@@ -481,6 +485,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.environments.IExecutionEnvironment#getComplianceOptions()
*/
+ @Override
public Map<String, String> getComplianceOptions() {
Properties properties = getProfileProperties();
if (properties != null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
index 299a40f..f815314 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -77,10 +77,12 @@
mappings.put(JavaSE_1_7, new String[] {JavaSE_1_6});
mappings.put(JavaSE_1_8, new String[] { JavaSE_1_7 });
}
+ @Override
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
ArrayList<CompatibleEnvironment> result = new ArrayList<CompatibleEnvironment>();
- if (!(vm instanceof IVMInstall2))
+ if (!(vm instanceof IVMInstall2)) {
return new CompatibleEnvironment[0];
+ }
IVMInstall2 vm2 = (IVMInstall2) vm;
List<String> types = null;
if (EEVMType.ID_EE_VM_TYPE.equals(vm.getVMInstallType().getId())) {
@@ -93,40 +95,44 @@
String javaVersion = vm2.getJavaVersion();
if (javaVersion == null) {
// We have a contributed VM type. Check to see if its a foundation VM, if we can.
- if ((vm instanceof IVMInstall3) && isFoundation1_0((IVMInstall3) vm))
+ if ((vm instanceof IVMInstall3) && isFoundation1_0((IVMInstall3) vm)) {
types = getTypes(CDC_FOUNDATION_1_0);
- else if ((vm instanceof IVMInstall3) && isFoundation1_1((IVMInstall3) vm))
+ } else if ((vm instanceof IVMInstall3) && isFoundation1_1((IVMInstall3) vm)) {
types = getTypes(CDC_FOUNDATION_1_1);
+ }
} else {
- if (javaVersion.startsWith("1.8")) //$NON-NLS-1$
+ if (javaVersion.startsWith("1.8")) { //$NON-NLS-1$
types = getTypes(JavaSE_1_8);
- else if (javaVersion.startsWith("1.7")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.7")) { //$NON-NLS-1$
types = getTypes(JavaSE_1_7);
- else if (javaVersion.startsWith("1.6")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.6")) { //$NON-NLS-1$
types = getTypes(JavaSE_1_6);
- else if (javaVersion.startsWith("1.5")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.5")) { //$NON-NLS-1$
types = getTypes(J2SE_1_5);
- else if (javaVersion.startsWith("1.4")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.4")) { //$NON-NLS-1$
types = getTypes(J2SE_1_4);
- else if (javaVersion.startsWith("1.3")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.3")) { //$NON-NLS-1$
types = getTypes(J2SE_1_3);
- else if (javaVersion.startsWith("1.2")) //$NON-NLS-1$
+ } else if (javaVersion.startsWith("1.2")) { //$NON-NLS-1$
types = getTypes(J2SE_1_2);
- else if (javaVersion.startsWith("1.1")) { //$NON-NLS-1$
- if ((vm instanceof IVMInstall3) && isFoundation1_1((IVMInstall3) vm))
+ } else if (javaVersion.startsWith("1.1")) { //$NON-NLS-1$
+ if ((vm instanceof IVMInstall3) && isFoundation1_1((IVMInstall3) vm)) {
types = getTypes(CDC_FOUNDATION_1_1);
- else
+ } else {
types = getTypes(JRE_1_1);
+ }
} else if (javaVersion.startsWith("1.0")) { //$NON-NLS-1$
- if ((vm instanceof IVMInstall3) && isFoundation1_0((IVMInstall3) vm))
+ if ((vm instanceof IVMInstall3) && isFoundation1_0((IVMInstall3) vm)) {
types = getTypes(CDC_FOUNDATION_1_0);
+ }
}
}
}
if (types != null) {
- for (int i=0; i < types.size(); i++)
+ for (int i=0; i < types.size(); i++) {
addEnvironment(result, types.get(i), i ==0);
+ }
}
return result.toArray(new CompatibleEnvironment[result.size()]);
}
@@ -137,11 +143,14 @@
private boolean isFoundation(Map<String, String> properties) {
for (int i=0; i < VM_PROPERTIES.length; i++) {
String value = properties.get(VM_PROPERTIES[i]);
- if (value == null)
+ if (value == null) {
continue;
- for (StringTokenizer tokenizer = new StringTokenizer(value); tokenizer.hasMoreTokens(); )
- if (FOUNDATION.equalsIgnoreCase(tokenizer.nextToken()))
+ }
+ for (StringTokenizer tokenizer = new StringTokenizer(value); tokenizer.hasMoreTokens(); ) {
+ if (FOUNDATION.equalsIgnoreCase(tokenizer.nextToken())) {
return true;
+ }
+ }
}
return false;
}
@@ -159,8 +168,9 @@
private void addEnvironment(ArrayList<CompatibleEnvironment> result, String id, boolean strict) {
IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
IExecutionEnvironment env = manager.getEnvironment(id);
- if (env != null)
+ if (env != null) {
result.add(new CompatibleEnvironment(env, strict));
+ }
}
// first entry in the list is the perfect match
@@ -169,8 +179,9 @@
result.add(type);
String[] values = mappings.get(type);
if (values != null) {
- for (int i=0; i<values.length; i++)
+ for (int i=0; i<values.length; i++) {
result.addAll(getTypes(values[i]));
+ }
}
return result;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java
index a641f55..8ff3ae4 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
*/
+ @Override
public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
if (argument == null) {
throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, EnvironmentMessages.ExecutionEnvironmentVariableResolver_0));
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
index e328d93..894dbf2 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -811,6 +811,7 @@
* the debug events.
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/
+ @Override
public void handleDebugEvents(DebugEvent[] events) {
for (int i = 0; i < events.length; i++) {
DebugEvent event = events[i];
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
index 4a4a746..d90f55a 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -97,6 +97,7 @@
* Subclasses should not override this method.
* @see IVMInstall#getId()
*/
+ @Override
public String getId() {
return fId;
}
@@ -105,6 +106,7 @@
* Subclasses should not override this method.
* @see IVMInstall#getName()
*/
+ @Override
public String getName() {
return fName;
}
@@ -113,6 +115,7 @@
* Subclasses should not override this method.
* @see IVMInstall#setName(String)
*/
+ @Override
public void setName(String name) {
if (!name.equals(fName)) {
PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_NAME, fName, name);
@@ -127,6 +130,7 @@
* Subclasses should not override this method.
* @see IVMInstall#getInstallLocation()
*/
+ @Override
public File getInstallLocation() {
return fInstallLocation;
}
@@ -135,6 +139,7 @@
* Subclasses should not override this method.
* @see IVMInstall#setInstallLocation(File)
*/
+ @Override
public void setInstallLocation(File installLocation) {
if (!installLocation.equals(fInstallLocation)) {
PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_INSTALL_LOCATION, fInstallLocation, installLocation);
@@ -149,6 +154,7 @@
* Subclasses should not override this method.
* @see IVMInstall#getVMInstallType()
*/
+ @Override
public IVMInstallType getVMInstallType() {
return fType;
}
@@ -156,6 +162,7 @@
/* (non-Javadoc)
* @see IVMInstall#getVMRunner(String)
*/
+ @Override
public IVMRunner getVMRunner(String mode) {
return null;
}
@@ -163,6 +170,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall#getLibraryLocations()
*/
+ @Override
public LibraryLocation[] getLibraryLocations() {
return fSystemLibraryDescriptions;
}
@@ -170,6 +178,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall#setLibraryLocations(org.eclipse.jdt.launching.LibraryLocation[])
*/
+ @Override
public void setLibraryLocations(LibraryLocation[] locations) {
if (locations == fSystemLibraryDescriptions) {
return;
@@ -206,6 +215,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall#getJavadocLocation()
*/
+ @Override
public URL getJavadocLocation() {
return fJavadocLocation;
}
@@ -213,6 +223,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall#setJavadocLocation(java.net.URL)
*/
+ @Override
public void setJavadocLocation(URL url) {
if (url == fJavadocLocation) {
return;
@@ -268,6 +279,7 @@
* @see org.eclipse.jdt.launching.IVMInstall#getDefaultVMArguments()
* @since 3.0
*/
+ @Override
public String[] getVMArguments() {
String args = getVMArgs();
if (args == null) {
@@ -281,6 +293,7 @@
* @see org.eclipse.jdt.launching.IVMInstall#setDefaultVMArguments(java.lang.String[])
* @since 3.0
*/
+ @Override
public void setVMArguments(String[] vmArgs) {
if (vmArgs == null) {
setVMArgs(null);
@@ -298,14 +311,16 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall2#getVMArgs()
*/
- public String getVMArgs() {
+ @Override
+ public String getVMArgs() {
return fVMArgs;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall2#setVMArgs(java.lang.String)
*/
- public void setVMArgs(String vmArgs) {
+ @Override
+ public void setVMArgs(String vmArgs) {
if (fVMArgs == null) {
if (vmArgs == null) {
// No change
@@ -326,13 +341,15 @@
* Subclasses should override.
* @see org.eclipse.jdt.launching.IVMInstall2#getJavaVersion()
*/
- public String getJavaVersion() {
+ @Override
+ public String getJavaVersion() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstall3#evaluateSystemProperties(java.lang.String[], org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public Map<String, String> evaluateSystemProperties(String[] properties, IProgressMonitor monitor) throws CoreException {
//locate the launching support jar - it contains the main program to run
if (monitor == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
index e7a5c27..3d91a2b 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
* Subclasses should not override this method.
* @see IVMType#getVMs()
*/
+ @Override
public synchronized IVMInstall[] getVMInstalls() {
IVMInstall[] vms= new IVMInstall[fVMs.size()];
return fVMs.toArray(vms);
@@ -58,6 +59,7 @@
* Subclasses should not override this method.
* @see IVMType#disposeVM(String)
*/
+ @Override
public void disposeVMInstall(String id) {
synchronized (this) {
for (int i= 0; i < fVMs.size(); i++) {
@@ -75,6 +77,7 @@
* Subclasses should not override this method.
* @see IVMType#getVM(String)
*/
+ @Override
public IVMInstall findVMInstall(String id) {
synchronized (this) {
for (int i = 0; i < fVMs.size(); i++) {
@@ -91,6 +94,7 @@
* Subclasses should not override this method.
* @see IVMType#createVM(String)
*/
+ @Override
public IVMInstall createVMInstall(String id) throws IllegalArgumentException {
if (findVMInstall(id) != null) {
String format= LaunchingMessages.vmInstallType_duplicateVM;
@@ -129,6 +133,7 @@
* a <code>Hashtable</code>, or <code>null</code>.
* @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
+ @Override
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) {
fId= config.getAttribute("id"); //$NON-NLS-1$
}
@@ -137,6 +142,7 @@
* Subclasses should not override this method.
* @see IVMType#getId()
*/
+ @Override
public String getId() {
return fId;
}
@@ -144,6 +150,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IVMInstallType#findVMInstallByName(java.lang.String)
*/
+ @Override
public IVMInstall findVMInstallByName(String name) {
synchronized (this) {
for (int i = 0; i < fVMs.size(); i++) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
index 9ca7b41..f3782f0 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
index 84f3e22..3e9a4ea 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,21 +41,12 @@
public static int findUnusedLocalPort(String host, int searchFrom, int searchTo) {
for (int i= 0; i < 10; i++) {
- Socket s= null;
int port= getRandomPort(searchFrom, searchTo);
- try {
- s= new Socket(host, port);
+ try (Socket s= new Socket(host, port)){
} catch (ConnectException e) {
return port;
} catch (IOException e) {
- } finally {
- if (s != null) {
- try {
- s.close();
- } catch (IOException ioe) {
- }
- }
- }
+ }
}
return -1;
}
@@ -71,18 +62,9 @@
* @since 3.0
*/
public static int findFreePort() {
- ServerSocket socket= null;
- try {
- socket= new ServerSocket(0);
+ try (ServerSocket socket = new ServerSocket(0)) {
return socket.getLocalPort();
} catch (IOException e) {
- } finally {
- if (socket != null) {
- try {
- socket.close();
- } catch (IOException e) {
- }
- }
}
return -1;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
index cbcc493..b1cd757 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
if (useDefault) {
@@ -68,6 +69,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#resolveClasspath(org.eclipse.jdt.launching.IRuntimeClasspathEntry[], org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
// use an ordered set to avoid duplicates
Set<IRuntimeClasspathEntry> all = new LinkedHashSet<IRuntimeClasspathEntry>(entries.length);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
index e476b3d..77c96aa 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -109,9 +109,7 @@
if (entry.getType() == IRuntimeClasspathEntry.ARCHIVE) {
String location = entry.getLocation();
if (location != null) {
- JarFile jar = null;
- try {
- jar = new JarFile(location, false);
+ try (JarFile jar = new JarFile(location, false);) {
Manifest manifest = jar.getManifest();
if (manifest != null) {
Attributes mainAttributes = manifest.getMainAttributes();
@@ -134,14 +132,7 @@
}
}
} catch (IOException e) {
- } finally {
- if (jar != null) {
- try {
- jar.close();
- } catch (IOException e) {
- }
- }
- }
+ }
}
}
}
@@ -161,28 +152,32 @@
@Override
public void add(int index, IRuntimeClasspathEntry element) {
- if (set.add(element))
- super.add(index, element);
+ if (set.add(element)) {
+ super.add(index, element);
+ }
}
@Override
public boolean add(IRuntimeClasspathEntry o) {
- if (set.add(o))
- return super.add(o);
+ if (set.add(o)) {
+ return super.add(o);
+ }
return false;
}
@Override
public boolean addAll(Collection<? extends IRuntimeClasspathEntry> c) {
- if (set.addAll(c))
- return super.addAll(c);
+ if (set.addAll(c)) {
+ return super.addAll(c);
+ }
return false;
}
@Override
public boolean addAll(int index, Collection<? extends IRuntimeClasspathEntry> c) {
- if (set.addAll(c))
- return super.addAll(index, c);
+ if (set.addAll(c)) {
+ return super.addAll(index, c);
+ }
return false;
}
@@ -211,15 +206,17 @@
@Override
protected void removeRange(int fromIndex, int toIndex) {
- for (int index = fromIndex; index<=toIndex; index++)
- remove(index);
+ for (int index = fromIndex; index<=toIndex; index++) {
+ remove(index);
+ }
}
@Override
public IRuntimeClasspathEntry set(int index, IRuntimeClasspathEntry element) {
set.remove(element);
- if (set.add(element))
- return super.set(index, element);
+ if (set.add(element)) {
+ return super.set(index, element);
+ }
return null; //should not happen.
}
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
index c69fc04..1786f17 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -369,10 +369,7 @@
private void initProperties(File eeFile) throws CoreException {
Map<String, String> properties = new LinkedHashMap<String, String>();
String eeHome = eeFile.getParentFile().getAbsolutePath();
- BufferedReader bufferedReader = null;
- try {
- FileReader reader = new FileReader(eeFile);
- bufferedReader = new BufferedReader(reader);
+ try (FileReader reader = new FileReader(eeFile); BufferedReader bufferedReader = new BufferedReader(reader);) {
String line = bufferedReader.readLine();
while (line != null) {
if (!line.startsWith("#")) { //$NON-NLS-1$
@@ -398,13 +395,6 @@
} catch (IOException e) {
throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN,
NLS.bind(LaunchingMessages.ExecutionEnvironmentDescription_1,new String[]{eeFile.getPath()}), e));
- } finally {
- try {
- if (bufferedReader != null) {
- bufferedReader.close();
- }
- } catch (IOException e) {
- }
}
if (!properties.containsKey(EE_HOME)) {
properties.put(EE_HOME, eeHome);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
index c2f0224..58139f9 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -97,14 +97,14 @@
synchronized (fZipFileCache) {
Iterator<ZipFile> iter = fZipFileCache.values().iterator();
while (iter.hasNext()) {
- ZipFile file = iter.next();
- synchronized (file) {
- try {
+ try (ZipFile file = iter.next()) {
+ synchronized (file) {
file.close();
- } catch (IOException e) {
- LaunchingPlugin.log(e);
}
}
+ catch (IOException e) {
+ LaunchingPlugin.log(e);
+ }
}
fZipFileCache.clear();
}
@@ -150,6 +150,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
*/
+ @Override
public Object findSourceElement(String name) throws CoreException {
try {
if (getArchive() == null) {
@@ -310,6 +311,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("archiveSourceLocation"); //$NON-NLS-1$
@@ -325,6 +327,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
*/
+ @Override
public void initializeFrom(String memento) throws CoreException {
Exception ex = null;
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
index ea82407..a489f89 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -81,6 +81,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
*/
+ @Override
public Object findSourceElement(String name) throws CoreException {
if (getDirectory() == null) {
return null;
@@ -152,6 +153,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("directorySourceLocation"); //$NON-NLS-1$
@@ -163,6 +165,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
*/
+ @Override
public void initializeFrom(String memento) throws CoreException {
Exception ex = null;
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
index d6b44bd..0c09de3 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -91,6 +91,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
*/
+ @Override
public Object findSourceElement(String name) throws CoreException {
if (fRootLocations != null) {
for (int i = 0; i < fRootLocations.length; i++) {
@@ -159,6 +160,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("javaProjectSourceLocation"); //$NON-NLS-1$
@@ -170,6 +172,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
*/
+ @Override
public void initializeFrom(String memento) throws CoreException {
Exception ex = null;
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
index 4ac2023..98f55c8 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -250,6 +250,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(org.eclipse.debug.core.model.IStackFrame)
*/
+ @Override
public Object getSourceElement(IStackFrame stackFrame) {
if (stackFrame instanceof IJavaStackFrame) {
IJavaStackFrame frame = (IJavaStackFrame)stackFrame;
@@ -372,6 +373,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("javaSourceLocator"); //$NON-NLS-1$
@@ -390,6 +392,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
@@ -399,6 +402,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String)
*/
+ @Override
public void initializeFromMemento(String memento) throws CoreException {
Exception ex = null;
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
index a5bdf05..ffb2bbb 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -83,6 +83,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
*/
+ @Override
public Object findSourceElement(String name) throws CoreException {
if (name != null && getPackageFragmentRoot() != null) {
IPackageFragment pkg = null;
@@ -122,6 +123,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
*/
+ @Override
public String getMemento() throws CoreException {
Document doc = DebugPlugin.newDocument();
Element node = doc.createElement("javaPackageFragmentRootSourceLocation"); //$NON-NLS-1$
@@ -137,6 +139,7 @@
/* (non-Javadoc)
* @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
*/
+ @Override
public void initializeFrom(String memento) throws CoreException {
Exception ex = null;
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
index 253be52..00bf659 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -58,6 +58,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
*/
+ @Override
public String getName() {
IClasspathContainer container = null;
try {
@@ -72,6 +73,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
*/
+ @Override
public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
index 62cef4f..8a56db0 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
*/
+ @Override
public String getName() {
return fVariable.toOSString();
}
@@ -85,6 +86,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
*/
+ @Override
public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
index 15157ba..6bddb08 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -79,6 +79,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
*/
+ @Override
public String getName() {
return fProject.getElementName();
}
@@ -86,6 +87,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
*/
+ @Override
public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
index 0e2e548..b230a37 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,6 +56,7 @@
* if none
* @exception CoreException if unable to retrieve the source name
*/
+ @Override
public String getSourceName(Object object) throws CoreException {
return JavaDebugUtils.getSourceName(object);
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
index 9792302..b3a0fb7 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
index 163625f..710263e 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/
+ @Override
public Object[] findSourceElements(String name) throws CoreException {
// look for a class file
int index = name.lastIndexOf('.');
@@ -97,12 +98,14 @@
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
*/
+ @Override
public String getName() {
return fRoot.getElementName();
}
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
*/
+ @Override
public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID);
}
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index d08f1b2..d94d2c4 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
- <version>3.7.200-SNAPSHOT</version>
+ <version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
