Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Khouzam2015-03-25 17:42:20 +0000
committerMarc Khouzam2015-03-25 17:42:20 +0000
commit4781f2049539f09f184f0109e4e35dccee0aaeb9 (patch)
tree9da777f514a266a22746a9804ea400d2954dc88f /dsf/org.eclipse.cdt.tests.dsf
parenta04d64606e4602434365f5eb7516376de17a9a7e (diff)
downloadorg.eclipse.cdt-4781f2049539f09f184f0109e4e35dccee0aaeb9.tar.gz
org.eclipse.cdt-4781f2049539f09f184f0109e4e35dccee0aaeb9.tar.xz
org.eclipse.cdt-4781f2049539f09f184f0109e4e35dccee0aaeb9.zip
Move some leftover plugins from Java 5 to Java 7.
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Diffstat (limited to 'dsf/org.eclipse.cdt.tests.dsf')
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/.classpath2
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF2
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java17
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java4
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java8
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java38
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java51
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java12
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java24
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java27
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java15
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java1
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java27
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java6
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java21
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java3
-rw-r--r--dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java1
33 files changed, 236 insertions, 89 deletions
diff --git a/dsf/org.eclipse.cdt.tests.dsf/.classpath b/dsf/org.eclipse.cdt.tests.dsf/.classpath
index 304e86186aa..3bc247511f0 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/.classpath
+++ b/dsf/org.eclipse.cdt.tests.dsf/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <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/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs b/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs
index cc70a3b2f7c..720e12ea0d4 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs
+++ b/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
#Wed Mar 10 12:16:35 PST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+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
@@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
index 75a63b8abfe..4531626409d 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.core;bundle-version="5.2.0",
org.eclipse.test.performance;bundle-version="3.6.0",
org.junit;bundle-version="3.8.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java
index bc50eed29f5..75b7133c79a 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java
@@ -325,6 +325,7 @@ public class ViewerUpdatesListener
return true;
}
+ @Override
public void updateStarted(IViewerUpdate update) {
synchronized (this) {
fContentUpdatesCounter++;
@@ -338,6 +339,7 @@ public class ViewerUpdatesListener
}
}
+ @Override
public void updateComplete(IViewerUpdate update) {
synchronized (this) {
fContentUpdatesCounter--;
@@ -378,6 +380,7 @@ public class ViewerUpdatesListener
}
}
+ @Override
public void viewerUpdatesBegin() {
if (fFailOnMultipleModelUpdateSequences && fContentSequenceComplete) {
fMultipleModelUpdateSequencesObserved = true;
@@ -385,10 +388,12 @@ public class ViewerUpdatesListener
fContentSequenceStarted = true;
}
+ @Override
public void viewerUpdatesComplete() {
fContentSequenceComplete = true;
}
+ @Override
public void labelUpdateComplete(ILabelUpdate update) {
synchronized (this) {
fLabelUpdatesRunning.remove(update);
@@ -400,6 +405,7 @@ public class ViewerUpdatesListener
}
}
+ @Override
public void labelUpdateStarted(ILabelUpdate update) {
synchronized (this) {
fLabelUpdatesRunning.add(update);
@@ -407,6 +413,7 @@ public class ViewerUpdatesListener
}
}
+ @Override
public void labelUpdatesBegin() {
if (fFailOnMultipleLabelUpdateSequences && fLabelSequenceComplete) {
fMultipleLabelUpdateSequencesObserved = true;
@@ -414,10 +421,12 @@ public class ViewerUpdatesListener
fLabelUpdatesStarted = true;
}
+ @Override
public void labelUpdatesComplete() {
fLabelSequenceComplete = true;
}
+ @Override
public void propertiesUpdatesStarted(IPropertiesUpdate[] updates) {
for (IPropertiesUpdate update : updates) {
fPropertiesUpdatesRunning.add(update);
@@ -425,6 +434,7 @@ public class ViewerUpdatesListener
}
}
+ @Override
public void propertiesUpdateCompleted(IPropertiesUpdate update) {
synchronized (this) {
fPropertiesUpdatesRunning.remove(update);
@@ -437,29 +447,36 @@ public class ViewerUpdatesListener
}
+ @Override
public void modelChanged(IModelDelta delta, IModelProxy proxy) {
fModelChangedComplete = true;
}
+ @Override
public void stateRestoreUpdatesBegin(Object input) {
fStateRestoreStarted = true;
}
+ @Override
public void stateRestoreUpdatesComplete(Object input) {
fStateRestoreComplete = true;
}
+ @Override
public void stateSaveUpdatesBegin(Object input) {
fStateSaveStarted = true;
}
+ @Override
public void stateSaveUpdatesComplete(Object input) {
fStateSaveComplete = true;
}
+ @Override
public void stateUpdateComplete(Object input, IViewerUpdate update) {
}
+ @Override
public void stateUpdateStarted(Object input, IViewerUpdate update) {
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
index 5aa7ec93528..b75b59618eb 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
@@ -155,7 +155,8 @@ public class BreakpointMediatorTests {
fExecutor.execute(seq);
seq.get();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java
index 3d5b288d01b..0d5292bc5ad 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java
@@ -46,7 +46,8 @@ public class DsfTestBreakpoint extends Breakpoint {
{
final IResource resource = ResourcesPlugin.getWorkspace().getRoot();
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
+ @Override
+ public void run(IProgressMonitor monitor) throws CoreException {
IMarker marker = resource.createMarker("org.eclipse.cdt.tests.dsf.markerType.breakpoint");
setMarker(marker);
marker.setAttribute(IBreakpoint.ENABLED, enabled);
@@ -65,6 +66,7 @@ public class DsfTestBreakpoint extends Breakpoint {
return (Integer)ensureMarker().getAttribute(ATTR_ID);
}
+ @Override
public String getModelIdentifier() {
return DSF_TEST_BREAKPOINT_MODEL_ID;
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java
index 6c5a093f890..856af31c831 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java
@@ -29,16 +29,20 @@ import org.eclipse.debug.core.model.IBreakpoint;
*/
public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttributeTranslator2 {
+ @Override
public void initialize(BreakpointsMediator2 mediator) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean supportsBreakpoint(IBreakpoint bp) {
return DsfTestBreakpoint.DSF_TEST_BREAKPOINT_MODEL_ID.equals(bp.getModelIdentifier());
}
+ @Override
public void resolveBreakpoint(IBreakpointsTargetDMContext context, IBreakpoint breakpoint,
Map<String, Object> bpAttrs, DataRequestMonitor<List<Map<String, Object>>> drm)
{
@@ -56,6 +60,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
drm.done();
}
+ @Override
public Map<String, Object> getAllBreakpointAttributes(IBreakpoint platformBP, boolean bpManagerEnabled)
throws CoreException
{
@@ -67,6 +72,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
return convertAttributes(platformBPAttr);
}
+ @Override
public Map<String, Object> convertAttributes(Map<String, Object> platformBPAttr) {
Map<String, Object> debugAttrs = new HashMap<String, Object>(platformBPAttr.size());
for (Map.Entry<String, Object> entry : platformBPAttr.entrySet()) {
@@ -82,6 +88,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
return debugAttrs;
}
+ @Override
public void updateBreakpointsStatus(
Map<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>> bpsInfo,
BreakpointEventType eventType)
@@ -89,6 +96,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
}
+ @Override
public boolean canUpdateAttributes(IBreakpoint bp, IBreakpointsTargetDMContext context,
Map<String, Object> attributes)
{
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java
index 1605a7dd2f8..1b6764760fd 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java
@@ -114,16 +114,25 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
fAttributes = Collections.unmodifiableMap( new HashMap<String, Object>(attributes) );
}
- public IAddress[] getAddresses() { return null; }
- public String getBreakpointType() { return null; }
- public String getFileName() { return null; }
- public int getLineNumber() { return 0; }
- public String getFunctionName() { return null; }
- public String getCondition() { return null; }
- public int getIgnoreCount() { return 0; }
- public String getExpression() { return null; }
+ @Override
+ public IAddress[] getAddresses() { return null; }
+ @Override
+ public String getBreakpointType() { return null; }
+ @Override
+ public String getFileName() { return null; }
+ @Override
+ public int getLineNumber() { return 0; }
+ @Override
+ public String getFunctionName() { return null; }
+ @Override
+ public String getCondition() { return null; }
+ @Override
+ public int getIgnoreCount() { return 0; }
+ @Override
+ public String getExpression() { return null; }
- public boolean isEnabled() { return (Boolean)getAttributes().get(ATTR_ENABLED); }
+ @Override
+ public boolean isEnabled() { return (Boolean)getAttributes().get(ATTR_ENABLED); }
public Map<String, Object> getAttributes() { return fAttributes; }
}
@@ -136,11 +145,13 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
fBreakpointArray = new IBreakpointDMContext[] { bp };
}
- public IBreakpointsTargetDMContext getDMContext() {
+ @Override
+ public IBreakpointsTargetDMContext getDMContext() {
return DMContexts.getAncestorOfType(fBreakpoint, IBreakpointsTargetDMContext.class);
}
- public IBreakpointDMContext[] getBreakpoints() {
+ @Override
+ public IBreakpointDMContext[] getBreakpoints() {
return fBreakpointArray;
}
}
@@ -205,6 +216,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
return DsfTestPlugin.getBundleContext();
}
+ @Override
public void getBreakpoints(final IBreakpointsTargetDMContext context, final DataRequestMonitor<IBreakpointDMContext[]> rm) {
// Validate the context
// TODO: check the target context
@@ -217,10 +229,12 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
rm.done();
}
+ @Override
public void getBreakpointDMData(IBreakpointDMContext dmc, DataRequestMonitor<IBreakpointDMData> rm) {
DsfTestPlugin.failRequest(rm, NOT_SUPPORTED, "Retrieving breakpoint data is not supported");
}
+ @Override
public void insertBreakpoint(IBreakpointsTargetDMContext context, Map<String, Object> attributes,
DataRequestMonitor<IBreakpointDMContext> rm)
{
@@ -275,6 +289,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
}
+ @Override
public void removeBreakpoint(IBreakpointDMContext bpCtx, RequestMonitor rm) {
if (!fBreakpoints.containsKey(bpCtx)) {
DsfTestPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint already removed");
@@ -294,6 +309,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
}
}
+ @Override
public void updateBreakpoint(final IBreakpointDMContext bpCtx, Map<String, Object> attributes, final RequestMonitor rm) {
if (!fBreakpoints.containsKey(bpCtx)) {
DsfTestPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint not installed");
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
index 077f6fd767f..c5456164ad3 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
@@ -109,7 +109,8 @@ public class CacheTests {
@After
public void shutdownExecutor() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
@@ -189,7 +190,8 @@ public class CacheTests {
assertFalse(fTestCache.isValid());
// Complete the cache's retrieve data request.
- fExecutor.submit(new Callable<Object>() { public Object call() {
+ fExecutor.submit(new Callable<Object>() { @Override
+ public Object call() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
@@ -318,7 +320,8 @@ public class CacheTests {
public void disableBeforeRequestTest() throws InterruptedException, ExecutionException {
// Disable the cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.set(null, STATUS_TARGET_RUNNING);
}
}).get();
@@ -356,7 +359,8 @@ public class CacheTests {
// Disable the cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.set(null, STATUS_TARGET_RUNNING);
}
}).get();
@@ -367,7 +371,8 @@ public class CacheTests {
// disassociates it from its retrieval RM. Thus regardless of how that
// request completes, it does not affect the cache.
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -399,7 +404,8 @@ public class CacheTests {
// Disable the cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.set(null, STATUS_TARGET_RUNNING);
}
}).get();
@@ -412,7 +418,8 @@ public class CacheTests {
public void setWithValueTest() throws InterruptedException, ExecutionException {
// Disable the cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.set(2, Status.OK_STATUS);
}
}).get();
@@ -444,7 +451,8 @@ public class CacheTests {
// request. Perhaps the retrieval logic isn't checking the RM status.
// Even if it is checking, it may have gotten passed its last checkpoint
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -481,7 +489,8 @@ public class CacheTests {
// completing the RM. Note that it hasn't provided the data to the
// cache.
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.done();
}
}).get();
@@ -512,7 +521,8 @@ public class CacheTests {
// aborts its processing, sets STATUS.CANCEL_STATUS in the RM and
// completes it.
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setStatus(Status.CANCEL_STATUS);
fRetrieveRm.done();
}
@@ -568,7 +578,8 @@ public class CacheTests {
// called in a separate dispatch cycle, so we have to wait one cycle of the executor
// after is canceled is called.
fRetrieveRm.isCanceled();
- fExecutor.submit(new Runnable() { public void run() {} }).get();
+ fExecutor.submit(new Runnable() { @Override
+ public void run() {} }).get();
assertTrue(canceledCalled[0]);
try {
@@ -579,7 +590,8 @@ public class CacheTests {
// Completed the retrieve RM
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -645,7 +657,8 @@ public class CacheTests {
// Reset the cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm = null;
fTestCache.set(null, Status.OK_STATUS);
fTestCache.reset();
@@ -665,7 +678,8 @@ public class CacheTests {
// Completed the retrieve RM
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -711,7 +725,8 @@ public class CacheTests {
// Completed the retrieve RM
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -769,7 +784,8 @@ public class CacheTests {
// Completed the retrieve RM
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRetrieveRm.setData(1);
fRetrieveRm.done();
}
@@ -796,7 +812,8 @@ public class CacheTests {
// Disable cache
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.reset();
}
}).get();
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
index 8a4a507aa0c..d2cd4d222d9 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
@@ -44,7 +44,8 @@ public class DsfQueryTests {
@After
public void shutdownServices() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
@@ -142,7 +143,8 @@ public class DsfQueryTests {
@Override
protected void execute(final DataRequestMonitor<Integer> rm) {
fExecutor.execute(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
rm.setData(1);
rm.done();
}
@@ -236,7 +238,8 @@ public class DsfQueryTests {
// Add a cancel listener to the query RM
rmHolder[0].addCancelListener(new ICanceledListener() {
- public void requestCanceled(RequestMonitor rm) {
+ @Override
+ public void requestCanceled(RequestMonitor rm) {
cancelCalled[0] = Boolean.TRUE;
}
});
@@ -289,7 +292,8 @@ public class DsfQueryTests {
// Call done with a delay of 1 second, to avoid stalling the tests.
fExecutor.schedule(
new DsfRunnable() {
- public void run() { rm.done(); }
+ @Override
+ public void run() { rm.done(); }
},
60, TimeUnit.SECONDS);
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java
index 6da37fb6ef8..bbcbb726788 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java
@@ -45,7 +45,8 @@ public class DsfSequenceProgressTests {
@After
public void shutdownExecutor() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java
index 4abd902ae9d..98ce8d0225d 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java
@@ -46,7 +46,8 @@ public class DsfSequenceTests {
if (!fExecutor.isShutdown()) {
// Some tests shut down the executor deliberatly)
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java
index 27277ea00de..3530cbb77e4 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java
@@ -97,7 +97,8 @@ public class RangeCacheTests {
fRm = rm;
}
- public int compareTo(RetrieveInfo o) {
+ @Override
+ public int compareTo(RetrieveInfo o) {
if (fOffset > o.fOffset) {
return 1;
} else if (fOffset == o.fOffset) {
@@ -148,7 +149,8 @@ public class RangeCacheTests {
@After
public void shutdownExecutor() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
@@ -314,7 +316,8 @@ public class RangeCacheTests {
getRange(0, 100, new long[] { 0 }, new int[] { 100 });
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.reset();
};
}).get();
@@ -341,7 +344,8 @@ public class RangeCacheTests {
getRange(2050, 50, new long[] {}, new int[] {});
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.reset();
};
}).get();
@@ -379,7 +383,8 @@ public class RangeCacheTests {
assertCacheWaiting(fRangeCache);
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.reset();
};
}).get();
@@ -403,7 +408,8 @@ public class RangeCacheTests {
// Force an error status into the range cache.
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fTestCache.set(0, 100, null, new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Cache invalid", null));
};
}).get();
@@ -411,7 +417,8 @@ public class RangeCacheTests {
// Retrieve a range cache and check that it immediately contains the error status in it.
fRangeCache = null;
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRangeCache = fTestCache.getRange(0, 100);
}
}).get();
@@ -453,7 +460,8 @@ public class RangeCacheTests {
completeInfo(info, 0, 100);
fExecutor.submit(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fRangeCache = fTestCache.getRange(0, 100);
}
}).get();
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
index 49d00964e7a..981ff2083e7 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
@@ -115,7 +115,8 @@ public class TransactionTests {
@After
public void shutdownExecutor() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
index ff4951a4827..4708b929c7b 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
@@ -64,9 +64,11 @@ public class VMTest1 extends VMTestBase implements IViewerUpdatesListenerConstan
final boolean[] containerExpandReceived = new boolean[1];
containerExpandReceived[0] = false;
dv.addModelChangedListener(new IModelChangedListener() {
- public void modelChanged(IModelDelta delta, IModelProxy proxy) {
+ @Override
+ public void modelChanged(IModelDelta delta, IModelProxy proxy) {
delta.accept(new IModelDeltaVisitor() {
- public boolean visit(IModelDelta delta, int depth) {
+ @Override
+ public boolean visit(IModelDelta delta, int depth) {
if (delta.getElement() instanceof IDMVMContext &&
((IDMVMContext)delta.getElement()).getDMContext() instanceof IContainerDMContext &&
(delta.getFlags() & IModelDelta.EXPAND) != 0)
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java
index 8bb546446fc..8d37cc93b89 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java
@@ -83,7 +83,8 @@ public class VMTestBase {
final ServiceEventWaitor<?> eventWaitor[] = new ServiceEventWaitor<?>[1];
SessionStartedListener newSessionListener = new SessionStartedListener() {
- public void sessionStarted(DsfSession session) {
+ @Override
+ public void sessionStarted(DsfSession session) {
eventWaitor[0] = new ServiceEventWaitor<IStartedDMEvent>(session, IStartedDMEvent.class);
}
};
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java
index 2524a528de5..d4ab7852922 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java
@@ -33,7 +33,8 @@ public class DMContextsTest {
@Before public void startExecutor() throws ExecutionException, InterruptedException {
fExecutor = new TestDsfExecutor();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fSession = DsfSession.startSession(fExecutor, "DMContextsTest"); //$NON-NLS-1$
}}).get();
@@ -64,7 +65,8 @@ public class DMContextsTest {
DsfSession.endSession(fSession);
fSession = null;
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java
index 6352ab63b23..ba8d8c0ba6e 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java
@@ -35,7 +35,8 @@ public class EventTest {
@Before public void startServices() throws ExecutionException, InterruptedException {
fExecutor = new TestDsfExecutor();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fSession = DsfSession.startSession(fExecutor, "org.eclipse.cdt.tests.dsf"); //$NON-NLS-1$
}}).get();
@@ -43,7 +44,8 @@ public class EventTest {
fExecutor.execute(startupSeq);
startupSeq.get();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fTracker = new DsfServicesTracker(DsfTestPlugin.getBundleContext(), fSession.getId());
fService1 = fTracker.getService(Service1.class);
fService2 = fTracker.getService(Service2.class);
@@ -61,7 +63,8 @@ public class EventTest {
fExecutor.execute(shutdownSeq);
shutdownSeq.get();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fService1 = null;
fService2 = null;
fService3 = null;
@@ -121,7 +124,8 @@ public class EventTest {
// specifies a services filter when registering itself as a listener.
// The filter limits the listener to events originating from service 2.
fService1.dispatchEvent1();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -140,7 +144,8 @@ public class EventTest {
fService4.fEvent1RecipientNumber = 0;
fService2.dispatchEvent1();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -158,7 +163,8 @@ public class EventTest {
fService4.fEvent1RecipientNumber = 0;
fService3.dispatchEvent1();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -174,7 +180,8 @@ public class EventTest {
fService4.fEvent1RecipientNumber = 0;
fService4.dispatchEvent1();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -191,7 +198,8 @@ public class EventTest {
*/
@Test public void event2Test() throws ExecutionException, InterruptedException {
fService1.dispatchEvent2();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
assertEventNotReceivedByAnyService(1);
Assert.assertTrue(1 == fService1.fEvent2RecipientNumber);
Assert.assertTrue(2 == fService2.fEvent2RecipientNumber);
@@ -212,7 +220,8 @@ public class EventTest {
*/
@Test public void event3Test() throws ExecutionException, InterruptedException {
fService1.dispatchEvent3();
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
Assert.assertTrue(1 == fService1.fEvent1RecipientNumber || 2 == fService1.fEvent1RecipientNumber);
Assert.assertTrue(3 == fService2.fEvent1RecipientNumber || 4 == fService2.fEvent1RecipientNumber);
Assert.assertTrue(5 == fService3.fEvent1RecipientNumber || 6 == fService3.fEvent1RecipientNumber);
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
index 7adb3133031..fcf7665c1af 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
@@ -59,16 +59,20 @@ public class BasicTests extends CommandControlTestsBase {
List<CommandInfo> fRemovedCommands = new LinkedList<CommandInfo>();
List<CommandInfo> fSentCommands = new LinkedList<CommandInfo>();
- public void commandDone(ICommandToken token, ICommandResult result) {
+ @Override
+ public void commandDone(ICommandToken token, ICommandResult result) {
fDoneCommands.add(new CommandInfo(token.getCommand(), result));
}
- public void commandQueued(ICommandToken token) {
+ @Override
+ public void commandQueued(ICommandToken token) {
fQueuedCommands.add(new CommandInfo(token.getCommand(), null));
}
- public void commandRemoved(ICommandToken token) {
+ @Override
+ public void commandRemoved(ICommandToken token) {
fRemovedCommands.add(new CommandInfo(token.getCommand(), null));
}
- public void commandSent(ICommandToken token) {
+ @Override
+ public void commandSent(ICommandToken token) {
fSentCommands.add(new CommandInfo(token.getCommand(), null));
}
@@ -82,7 +86,8 @@ public class BasicTests extends CommandControlTestsBase {
final CommandListener listener = new CommandListener();
fExecutor.execute(new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fCommandControl.addCommandListener(listener);
}
});
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
index ecafabc5ec2..0a080996a26 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
@@ -76,7 +76,8 @@ public class CommandControlTestsBase {
fCommandControl = new PDACommandControl(fSession);
fCommandControl.addEventListener(new IEventListener() {
- public void eventReceived(Object output) {
+ @Override
+ public void eventReceived(Object output) {
fEventsQueue.add(output);
}
});
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java
index b99d6f86455..68616a9ff21 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java
@@ -35,7 +35,8 @@ public class ServiceTests {
}
@After public void shutdownExecutor() throws ExecutionException, InterruptedException {
- fExecutor.submit(new DsfRunnable() { public void run() {
+ fExecutor.submit(new DsfRunnable() { @Override
+ public void run() {
fExecutor.shutdown();
}}).get();
if (fExecutor.exceptionsCaught()) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java
index ae105165c4f..b31faccc1b6 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java
@@ -41,15 +41,18 @@ public class DummyFormattedValueService extends AbstractDsfService implements IF
return DsfTestPlugin.getBundleContext();
}
+ @Override
public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
rm.setData(AVAILABLE_FORMATS);
rm.done();
}
+ @Override
public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String formatId) {
return new FormattedValueDMContext(this, dmc, formatId);
}
+ @Override
public void getFormattedExpressionValue(FormattedValueDMContext dmc, DataRequestMonitor<FormattedValueDMData> rm) {
rm.setData(new FormattedValueDMData(dmc.getFormatID()));
rm.done();
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
index ca9030d95e8..4450da1a465 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
@@ -842,7 +842,8 @@ abstract public class FormattedValueTests extends TestCase implements IViewerUpd
fModel.validateData(
fViewer, TreePath.EMPTY,
new TestElementValidator() {
- public void validate(TestElement modelElement, TestElement viewerElement, TreePath viewerPath) {
+ @Override
+ public void validate(TestElement modelElement, TestElement viewerElement, TreePath viewerPath) {
ViewerLabel label = fViewer.getElementLabel(viewerPath, TestModelCachingVMProvider.COLUMN_ID);
assertEquals(modelElement.getID(), label.getText());
ElementFormatSetting elementFormat = null;
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java
index cb87bde7334..a57acc7344c 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java
@@ -54,6 +54,7 @@ public class FormattedValuesListener implements IFormattedValuesListener, IPrope
fCachedFormats.addAll(Arrays.asList(cachedFormats));
}
+ @Override
public void propertiesUpdatesStarted(IPropertiesUpdate[] updates) {
fPropertiesUpdates.addAll(Arrays.asList(updates));
List<FormattedValueDMContext> pending = new ArrayList<FormattedValueDMContext>(updates.length);
@@ -122,15 +123,18 @@ public class FormattedValuesListener implements IFormattedValuesListener, IPrope
return true;
}
+ @Override
public void propertiesUpdateCompleted(IPropertiesUpdate update) {}
+ @Override
public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {
Assert.assertFalse("Expected values with formats " + fCachedFormats + " to be cached.",
fCachedFormats.contains(formattedValueDmc.getFormatID()));
if (fProcessUpdatedFormattedValuesRunnable == null) {
fProcessUpdatedFormattedValuesRunnable = new DsfRunnable() {
- public void run() {
+ @Override
+ public void run() {
fProcessUpdatedFormattedValuesRunnable = null;
processFormattedValuesInProgress();
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java
index 79b1aa202ec..f59667e4e97 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java
@@ -36,6 +36,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
super(adapter, context, session);
}
+ @Override
public void getActiveFormat(IPresentationContext context, IVMNode node,
Object viewerInput, TreePath elementPath, DataRequestMonitor<String> rm) {
Object p = context.getProperty(myPersistId);
@@ -70,6 +71,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
rm.done();
}
+ @Override
public void setActiveFormat(IPresentationContext context, IVMNode[] node,
Object viewerInput, TreePath[] elementPath, String format) {
Object p = context.getProperty(myPersistId);
@@ -95,6 +97,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
}
}
+ @Override
public boolean supportFormat(IVMContext context) {
return true;
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java
index e6ec468cc85..56b0345e517 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java
@@ -42,6 +42,7 @@ public class TestElementVMContext extends AbstractVMContext implements IDMVMCont
return fElement;
}
+ @Override
public IDMContext getDMContext() {
return getElement();
}
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java
index 1f5db1d21ed..9d5dac702db 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java
@@ -177,7 +177,8 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
}
private static final IFormattedValuesListener NULL_LISTENER = new IFormattedValuesListener() {
- public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {}
+ @Override
+ public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {}
};
private TestElement fRoot;
@@ -583,11 +584,13 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
return null;
}
+ @Override
public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
rm.setData(new String[] { HEX_FORMAT, DECIMAL_FORMAT, OCTAL_FORMAT, BINARY_FORMAT, NATURAL_FORMAT });
rm.done();
}
+ @Override
public void getFormattedExpressionValue(FormattedValueDMContext dmc, DataRequestMonitor<FormattedValueDMData> rm) {
TestElement te = DMContexts.getAncestorOfType(dmc, TestElement.class);
rm.setData(new FormattedValueDMData( getFormattedValueText(te, dmc.getFormatID())));
@@ -595,6 +598,7 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
fListener.formattedValueUpdated(dmc);
}
+ @Override
public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String formatId) {
// Creates a context that can be used to retrieve a formatted value.
return new FormattedValueDMContext(this, dmc, formatId);
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java
index 5279e4afb79..9add2bde7e1 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java
@@ -36,32 +36,41 @@ public class TestModelCachingVMProvider extends AbstractDMVMProvider {
private static final String[] COLUMNS = new String[] { COLUMN_ID, COLUMN_FORMATTED_VALUE, COLUMN_DUMMY_VALUE };
private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
handleEvent(event);
}
};
private static IColumnPresentation COLUMN_PRESENTATION = new IColumnPresentation() {
- public void init(IPresentationContext context) {}
- public void dispose() {};
+ @Override
+ public void init(IPresentationContext context) {}
+ @Override
+ public void dispose() {};
- public String[] getAvailableColumns() {
+ @Override
+ public String[] getAvailableColumns() {
return COLUMNS;
};
- public String getHeader(String id) {
+ @Override
+ public String getHeader(String id) {
return id;
};
- public String getId() { return "ID"; }
+ @Override
+ public String getId() { return "ID"; }
- public ImageDescriptor getImageDescriptor(String id) {
+ @Override
+ public ImageDescriptor getImageDescriptor(String id) {
return null;
}
- public String[] getInitialColumns() {
+ @Override
+ public String[] getInitialColumns() {
return COLUMNS;
}
- public boolean isOptional() {
+ @Override
+ public boolean isOptional() {
return false;
}
};
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java
index 18119d10084..1e1b4e64c73 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java
@@ -109,6 +109,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
return fLabelProvider;
}
+ @Override
public void update(final ILabelUpdate[] updates) {
fLabelProvider.update(updates);
}
@@ -165,6 +166,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
}
+ @Override
public void update(final IPropertiesUpdate[] updates) {
fViewerUpdateListener.propertiesUpdatesStarted(updates);
if (fFormattedValuesListener != null) fFormattedValuesListener.propertiesUpdatesStarted(updates);
@@ -209,6 +211,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
* (non-Javadoc)
* @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#getDeltaFlags(java.lang.Object)
*/
+ @Override
public int getDeltaFlags(Object e) {
if ( e instanceof PropertyChangeEvent &&
((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE)
@@ -226,6 +229,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
return IModelDelta.NO_CHANGE;
}
+ @Override
public void buildDelta(Object e, VMDelta parent, int nodeOffset, RequestMonitor rm) {
if ( e instanceof PropertyChangeEvent &&
((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE)
@@ -244,10 +248,12 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
}
+ @Override
public boolean isDeltaEvent(Object rootObject, Object event) {
return getDeltaFlags(event) != IModelDelta.NO_CHANGE;
}
+ @Override
public void createRootDelta(Object rootObject, Object event, DataRequestMonitor<VMDelta> rm) {
int flags = IModelDelta.NO_CHANGE;
if ( event instanceof PropertyChangeEvent &&
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
index 24a67a91369..960554548a8 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
@@ -30,7 +30,8 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener
private final static Comparator<String> fStringComparator = new Comparator<String>() {
- public int compare(String s1, String s2) {
+ @Override
+ public int compare(String s1, String s2) {
int l1 = s1.length();
int l2 = s2.length();
int lmin = l1;
@@ -61,7 +62,8 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener
};
private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<TreePath>() {
- public int compare(TreePath p1, TreePath p2) {
+ @Override
+ public int compare(TreePath p1, TreePath p2) {
int l1 = p1.getSegmentCount();
int l2 = p2.getSegmentCount();
int lmin = l1;
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java
index cde46005a60..02a201322b8 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java
@@ -55,6 +55,7 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
}));
}
+ @Override
public void update(final ILabelUpdate[] updates) {
fLabelProvider.update(updates);
}
@@ -68,9 +69,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
}
+ @Override
public void update(final IHasChildrenUpdate[] updates) {
getTestProvider().getDsfExecutor().execute(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
for (IHasChildrenUpdate update : updates) {
if (update.getElement() instanceof TestElementVMContext) {
TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -82,9 +85,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
});
}
+ @Override
public void update(final IChildrenCountUpdate[] updates) {
getTestProvider().getDsfExecutor().execute(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
for (IChildrenCountUpdate update : updates) {
if (update.getElement() instanceof TestElementVMContext) {
TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -96,9 +101,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
});
}
+ @Override
public void update(final IChildrenUpdate[] updates) {
getTestProvider().getDsfExecutor().execute(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
for (IChildrenUpdate update : updates) {
if (update.getElement() instanceof TestElementVMContext) {
TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -110,9 +117,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
});
}
+ @Override
public void update(final IPropertiesUpdate[] updates) {
getTestProvider().getDsfExecutor().execute(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
for (IPropertiesUpdate update : updates) {
if (update.getElement() instanceof TestElementVMContext) {
TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -137,19 +146,23 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
return new TestElementVMContext(this, element);
}
+ @Override
public int getDeltaFlags(Object event) {
return 0;
}
+ @Override
public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor rm) {
rm.done();
}
+ @Override
public boolean isDeltaEvent(Object rootObject, Object event) {
return false;
}
+ @Override
public void createRootDelta(Object rootObject, Object event, DataRequestMonitor<VMDelta> rm) {
rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not implemented", null));
rm.done();
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java
index a6ed00a8d70..64263470e95 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java
@@ -27,6 +27,7 @@ class TestPersistable implements IPersistableElement, IAdaptable {
HashMap<String, String> map = new HashMap<String, String>();
+ @Override
public void saveState(IMemento memento) {
HashMap<String, String> clone = null;
synchronized (map) {
@@ -70,10 +71,12 @@ class TestPersistable implements IPersistableElement, IAdaptable {
}
}
+ @Override
public String getFactoryId() {
return TestPersistableFactory.factoryId;
}
+ @Override
public Object getAdapter(Class adapter) {
if (adapter.isInstance(this)) {
return this;
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java
index bcf685eac47..b873cb2df16 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java
@@ -21,6 +21,7 @@ public class TestPersistableFactory implements IElementFactory {
static String factoryId = "org.eclipse.cdt.tests.dsf.vm.testPersistableFactory";
+ @Override
public IAdaptable createElement(IMemento memento) {
TestPersistable x = new TestPersistable();
x.restore(memento);

Back to the top