From 664ef4c42fb0cf2e50b32ec16dd575a64b608a26 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 4 May 2011 09:42:36 +0000 Subject: [PATCH] Bug 341465: doInitialize() must be private to allow each version of the service to get properly initialized. --- .../src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java | 2 +- .../src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java | 2 +- .../org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java index 85a624d1afc..9fb36202af2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java @@ -138,7 +138,7 @@ public class GDBBackend extends AbstractDsfService implements IGDBBackend { }); } - public void doInitialize(final RequestMonitor requestMonitor) { + private void doInitialize(final RequestMonitor requestMonitor) { final Sequence.Step[] initializeSteps = new Sequence.Step[] { new GDBProcessStep(InitializationShutdownStep.Direction.INITIALIZING), diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java index c553f572eb2..621cd227945 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java @@ -121,7 +121,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { }); } - public void doInitialize(final RequestMonitor requestMonitor) { + private void doInitialize(final RequestMonitor requestMonitor) { fMIBackend = getServicesTracker().getService(IGDBBackend.class); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java index 8251b9af723..f8e050c4363 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java @@ -125,7 +125,7 @@ public class GDBControl_7_0 extends AbstractMIControl implements IGDBControl { }); } - public void doInitialize(final RequestMonitor requestMonitor) { + private void doInitialize(final RequestMonitor requestMonitor) { fMIBackend = getServicesTracker().getService(IGDBBackend.class); // getId uses the MIBackend service, which is why we must wait until we