diff options
12 files changed, 134 insertions, 77 deletions
diff --git a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index af515714a..7263b7ce8 100644 --- a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Example Debug Core Plug-in +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, @@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.core, org.apache.ant;bundle-version="1.7.0";resolution:=optional Eclipse-LazyStart: true -Export-Package: org.eclipse.debug.examples.core.midi.launcher, - org.eclipse.debug.examples.core.pda, - org.eclipse.debug.examples.core.pda.breakpoints, - org.eclipse.debug.examples.core.pda.launcher, - org.eclipse.debug.examples.core.pda.model, - org.eclipse.debug.examples.core.pda.protocol, - org.eclipse.debug.examples.core.pda.sourcelookup +Export-Package: org.eclipse.debug.examples.core.midi.launcher;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda.breakpoints;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda.launcher;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda.model;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda.protocol;x-friends:="org.eclipse.debug.examples.ui", + org.eclipse.debug.examples.core.pda.sourcelookup;x-friends:="org.eclipse.debug.examples.ui" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.debug.examples.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.debug.examples.core/OSGI-INF/l10n/bundle.properties new file mode 100644 index 000000000..2a7f501da --- /dev/null +++ b/org.eclipse.debug.examples.core/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2011 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +Bundle-Name = Example Debug Core Plug-in +variable.description = Path to Perl executable in the local file system +pda.launchConfigurationType.name = PDA Application +midi.launchConfigurationType.name = MIDI Sequence +sourceLocator.name = PDA Source Locator +line.breakpoints.name = PDA Line Breakpoints +watchpoints.name = PDA Watchpoints +line.breakpoint.marker.name = PDA Line Breakpoint Marker +watchpoint.marker.name = PDA Watchpoint Marker +logicalStructureType.description = Words
\ No newline at end of file diff --git a/org.eclipse.debug.examples.core/build.properties b/org.eclipse.debug.examples.core/build.properties index ebe0689d6..1733f7a39 100644 --- a/org.eclipse.debug.examples.core/build.properties +++ b/org.eclipse.debug.examples.core/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2011 IBM Corporation and others. # All rights reserved. This program and 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,5 +18,7 @@ bin.includes = plugin.xml,\ about.html,\ .,\ readme.html,\ - samples/ + samples/,\ + OSGI-INF/l10n/bundle.properties,\ + OSGI-INF/ src.includes = about.html diff --git a/org.eclipse.debug.examples.core/plugin.xml b/org.eclipse.debug.examples.core/plugin.xml index dadb0fe8f..9e4bc4990 100644 --- a/org.eclipse.debug.examples.core/plugin.xml +++ b/org.eclipse.debug.examples.core/plugin.xml @@ -14,7 +14,7 @@ <extension point="org.eclipse.core.variables.valueVariables"> <variable - description="Path to Perl executable in the local file system" + description="%variable.description" name="perlExecutable" initialValue="c:\perl\bin\perl.exe"/> </extension> @@ -26,7 +26,7 @@ sourceLocatorId="pda.sourceLocator" delegate="org.eclipse.debug.examples.core.pda.launcher.PDALaunchDelegate" sourcePathComputerId="pda.sourcePathComputer" - name="PDA Application" + name="%pda.launchConfigurationType.name" id="pda.launchType" modes="run, debug"/> </extension> @@ -36,7 +36,7 @@ point="org.eclipse.debug.core.launchConfigurationTypes"> <launchConfigurationType delegate="org.eclipse.debug.examples.core.midi.launcher.MidiLaunchDelegate" - name="MIDI Sequence" + name="%midi.launchConfigurationType.name" id="midi.launchType" modes="run, debug"/> </extension> @@ -47,7 +47,7 @@ point="org.eclipse.debug.core.sourceLocators"> <sourceLocator class="org.eclipse.debug.examples.core.pda.sourcelookup.PDASourceLookupDirector" - name="PDA Source Locator" + name="%sourceLocator.name" id="pda.sourceLocator"/> </extension> <extension @@ -64,25 +64,25 @@ point="org.eclipse.debug.core.breakpoints"> <breakpoint class="org.eclipse.debug.examples.core.pda.breakpoints.PDALineBreakpoint" - name="PDA Line Breakpoints" + name="%line.breakpoints.name" markerType="org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint" id="pda.lineBreakpoint"/> <breakpoint class="org.eclipse.debug.examples.core.pda.breakpoints.PDAWatchpoint" - name="PDA Watchpoints" + name="%watchpoints.name" markerType="org.eclipse.debug.examples.core.pda.markerType.watchpoint" id="pda.watchpoint"/> </extension> <extension id="pda.markerType.lineBreakpoint" - name="PDA Line Breakpoint Marker" + name="%line.breakpoint.marker.name" point="org.eclipse.core.resources.markers"> <super type="org.eclipse.debug.core.lineBreakpointMarker"/> <persistent value="true"/> </extension> <extension id="pda.markerType.watchpoint" - name="PDA Watchpoint Marker" + name="%watchpoint.marker.name" point="org.eclipse.core.resources.markers"> <super type="org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"/> <persistent value="true"/> @@ -95,7 +95,7 @@ point="org.eclipse.debug.core.logicalStructureTypes"> <logicalStructureType class="org.eclipse.debug.examples.core.pda.model.WordStructureDelegate" - description="Words" + description="%logicalStructureType.description" id="pda.wordStructure" modelIdentifier="pda.debugModel"/> </extension> diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java index be74eb78a..2fe236a43 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,18 +11,19 @@ *******************************************************************************/ package org.eclipse.debug.examples.core.pda; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; /** - * The main plugin class to be used in the desktop. + * The main plug-in class to be used in the desktop. */ public class DebugCorePlugin extends Plugin { //The shared instance. @@ -42,9 +43,9 @@ public class DebugCorePlugin extends Plugin { */ public static final String VARIALBE_PERL_EXECUTABLE = "perlExecutable"; /** - * Launch configuration attribute key. Value is a path to a perl + * Launch configuration attribute key. Value is a path to a Perl * program. The path is a string representing a full path - * to a perl program in the workspace. + * to a Perl program in the workspace. */ public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; @@ -118,13 +119,12 @@ public class DebugCorePlugin extends Plugin { /** * Return a <code>java.io.File</code> object that corresponds to the specified - * <code>IPath</code> in the plugin directory, or <code>null</code> if none. + * <code>IPath</code> in the plug-in directory, or <code>null</code> if none. */ public static File getFileInPlugin(IPath path) { try { - URL installURL = - new URL(getDefault().getDescriptor().getInstallURL(), path.toString()); - URL localURL = Platform.asLocalURL(installURL); + URL installURL = getDefault().getBundle().getEntry(path.toString()); + URL localURL = FileLocator.toFileURL(installURL); return new File(localURL.getFile()); } catch (IOException ioe) { return null; diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java index cebc2091f..7d43a1848 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2011 IBM Corporation and others. * All rights reserved. This program and 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,7 +38,7 @@ import org.eclipse.debug.examples.core.pda.model.PDADebugTarget; /** - * Launches PDA program on a PDA interpretter written in Perl + * Launches PDA program on a PDA interpreter written in Perl */ public class PDALaunchDelegate extends LaunchConfigurationDelegate { /* (non-Javadoc) @@ -118,7 +118,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { * @throws CoreException */ private void abort(String message, Throwable e) throws CoreException { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, message, e)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 0, message, e)); } /** diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java index 822f5faf4..616578131 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2011 IBM Corporation and others. * All rights reserved. This program and 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,8 +72,9 @@ public class PDAMemoryBlock extends PDADebugElement implements IMemoryBlock { */ public void setValue(long offset, byte[] bytes) throws DebugException { int i = 0; - while (offset < fBytes.length && i < bytes.length) { - fBytes[(int)offset++] = bytes[i++]; + long off = offset; + while (off < fBytes.length && i < bytes.length) { + fBytes[(int)off++] = bytes[i++]; } fireChangeEvent(DebugEvent.CONTENT); } diff --git a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF index 4c0b1ba38..a6f793240 100644 --- a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Example Debug UI Plug-in +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Bundle-Activator: org.eclipse.debug.examples.ui.pda.DebugUIPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, @@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.examples.core, org.eclipse.core.expressions Eclipse-LazyStart: true -Export-Package: org.eclipse.debug.examples.ui.midi.adapters, - org.eclipse.debug.examples.ui.midi.detailpanes, - org.eclipse.debug.examples.ui.midi.launcher, - org.eclipse.debug.examples.ui.pda, - org.eclipse.debug.examples.ui.pda.adapters, - org.eclipse.debug.examples.ui.pda.breakpoints, - org.eclipse.debug.examples.ui.pda.editor, - org.eclipse.debug.examples.ui.pda.launcher, - org.eclipse.debug.examples.ui.pda.presentation, - org.eclipse.debug.examples.ui.pda.views +Export-Package: org.eclipse.debug.examples.ui.midi.adapters;x-internal:=true, + org.eclipse.debug.examples.ui.midi.detailpanes;x-internal:=true, + org.eclipse.debug.examples.ui.midi.launcher;x-internal:=true, + org.eclipse.debug.examples.ui.pda;x-internal:=true, + org.eclipse.debug.examples.ui.pda.adapters;x-internal:=true, + org.eclipse.debug.examples.ui.pda.breakpoints;x-internal:=true, + org.eclipse.debug.examples.ui.pda.editor;x-internal:=true, + org.eclipse.debug.examples.ui.pda.launcher;x-internal:=true, + org.eclipse.debug.examples.ui.pda.presentation;x-internal:=true, + org.eclipse.debug.examples.ui.pda.views;x-internal:=true Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.debug.examples.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.debug.examples.ui/OSGI-INF/l10n/bundle.properties new file mode 100644 index 000000000..16354c5b9 --- /dev/null +++ b/org.eclipse.debug.examples.ui/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,32 @@ +############################################################################### +# Copyright (c) 2011 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +Bundle-Name = Example Debug UI Plug-in +pda.launchConfigurationTabGroup.description = Specify and launch a PDA program +midi.launchConfigurationTabGroup.description = Play a MIDI file +pda.shortcut.label = PDA Application +midi.shortcut.description = Plays a standard MIDI file +midi.shortcut.label = MIDI File +pda.editor.name = PDA Editor +notused.action.label = Not Used +data.stack.view.name = PDA Data Stack +checkbox.view.name = Checkbox View +context.description = Debugging PDA Programs +context.name = Debugging PDA Programs +toggle.bp.action.label = Toggle Breakpoint +run.to.line.action.label = Run to Line +pop.frame.action.label = Pop Frame +add.memoryblock.action.label = Add Memory Block +push.command.name = Push +pop.command.name = Pop +push.command.label = Push +pop.command.label = Pop +push.command.label2 = Push +pop.command.label2 = Pop
\ No newline at end of file diff --git a/org.eclipse.debug.examples.ui/build.properties b/org.eclipse.debug.examples.ui/build.properties index b18c60771..82c144508 100644 --- a/org.eclipse.debug.examples.ui/build.properties +++ b/org.eclipse.debug.examples.ui/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2011 IBM Corporation and others. # All rights reserved. This program and 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,6 +15,8 @@ bin.includes = plugin.xml,\ about.html,\ META-INF/,\ .,\ - icons/ + icons/,\ + OSGI-INF/l10n/bundle.properties,\ + OSGI-INF/ src.includes = about.html,\ icons/ diff --git a/org.eclipse.debug.examples.ui/plugin.xml b/org.eclipse.debug.examples.ui/plugin.xml index 96f52f139..f773254fd 100644 --- a/org.eclipse.debug.examples.ui/plugin.xml +++ b/org.eclipse.debug.examples.ui/plugin.xml @@ -18,12 +18,12 @@ point="org.eclipse.debug.ui.launchConfigurationTabGroups"> <launchConfigurationTabGroup class="org.eclipse.debug.examples.ui.pda.launcher.PDATabGroup" - description="Specify and launch a PDA program" + description="%pda.launchConfigurationTabGroup.description" id="pda.tabGroup" type="pda.launchType"/> <launchConfigurationTabGroup class="org.eclipse.debug.examples.ui.midi.launcher.MidiTabGroup" - description="Play a MIDI file" + description="%midi.launchConfigurationTabGroup.description" id="midi.tabGroup" type="midi.launchType"/> </extension> @@ -41,7 +41,7 @@ <extension point="org.eclipse.debug.ui.launchShortcuts"> <shortcut - label="PDA Application" + label="%pda.shortcut.label" icon="icons/full/obj16/pda.gif" class="org.eclipse.debug.examples.ui.pda.launcher.PDALaunchShortcut" modes="run, debug" @@ -65,10 +65,10 @@ </shortcut> <shortcut class="org.eclipse.debug.examples.ui.midi.launcher.MidiLaunchShortcut" - description="Plays a standard MIDI file" + description="%midi.shortcut.description" icon="icons/full/obj16/note.gif" id="midi.launchShortcut" - label="MIDI File" + label="%midi.shortcut.label" modes="run, debug"> <contextualLaunch> <enablement> @@ -102,7 +102,7 @@ class="org.eclipse.debug.examples.ui.pda.editor.PDAEditor" icon="icons/full/obj16/pda.gif" default="true" - name="PDA Editor" + name="%pda.editor.name" id="pda.editor" extensions="pda"/> </extension> @@ -112,7 +112,7 @@ targetID="pda.editor" id="pda.rulerActions"> <action - label="Not Used" + label="%notused.action.label" class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate" style="push" actionID="RulerDoubleClick" @@ -124,12 +124,12 @@ <view icon="icons/full/obj16/pda.gif" class="org.eclipse.debug.examples.ui.pda.views.DataStackView" - name="PDA Data Stack" + name="%data.stack.view.name" id="pda.dataStackView"/> <view class="org.eclipse.debug.examples.ui.pda.views.CheckboxView" id="org.eclipse.debug.examples.ui.checkboxView" - name="Checkbox View" + name="%checkbox.view.name" restorable="true"> </view> </extension> @@ -148,8 +148,8 @@ point="org.eclipse.ui.contexts"> <context parentId="org.eclipse.debug.ui.debugging" - description="Debugging PDA Programs" - name="Debugging PDA Programs" + description="%context.description" + name="%context.name" id="pda.debugging"/> </extension> <extension @@ -171,7 +171,7 @@ targetID="pda.editor.rulerMenu" id="pda.editor.rulerActions"> <action - label="Toggle Breakpoint" + label="%toggle.bp.action.label" class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate" menubarPath="debug" id="pda.editor.ruler.toggleBreakpointAction"/> @@ -180,7 +180,7 @@ targetID="pda.editor.contextMenu" id="pda.editor.menuActions"> <action - label="Run to Line" + label="%run.to.line.action.label" definitionId="org.eclipse.debug.ui.commands.RunToLine" class="org.eclipse.debug.ui.actions.RunToLineActionDelegate" menubarPath="additions" @@ -195,7 +195,7 @@ <action class="org.eclipse.debug.examples.ui.pda.editor.PopFrameActionDelegate" id="pda.dropToFrame" - label="Pop Frame"/> + label="%pop.frame.action.label"/> </objectContribution> <objectContribution adaptable="false" @@ -204,7 +204,7 @@ <action class="org.eclipse.debug.examples.ui.pda.adapters.AddPDAMemoryBlockAction" id="pda.addMemoryBlock" - label="Add Memory Block"> + label="%add.memoryblock.action.label"> </action> </objectContribution> <!--#endif --> @@ -366,11 +366,11 @@ point="org.eclipse.ui.commands"> <command id="org.eclipse.debug.examples.ui.pushCommand" - name="Push"> + name="%push.command.name"> </command> <command id="org.eclipse.debug.examples.ui.popCommand" - name="Pop"> + name="%pop.command.name"> </command> </extension> <extension @@ -436,14 +436,14 @@ commandId="org.eclipse.debug.examples.ui.pushCommand" disabledIcon="icons/full/dlcl16/push.gif" icon="icons/full/elcl16/push.gif" - label="Push" + label="%push.command.label" style="push"> </command> <command commandId="org.eclipse.debug.examples.ui.popCommand" disabledIcon="icons/full/dlcl16/pop.gif" icon="icons/full/elcl16/pop.gif" - label="Pop" + label="%pop.command.label" style="push"> </command> </menuContribution> @@ -453,14 +453,14 @@ commandId="org.eclipse.debug.examples.ui.pushCommand" disabledIcon="icons/full/dlcl16/push.gif" icon="icons/full/elcl16/push.gif" - label="Push" + label="%push.command.label2" style="push"> </command> <command commandId="org.eclipse.debug.examples.ui.popCommand" disabledIcon="icons/full/dlcl16/pop.gif" icon="icons/full/elcl16/pop.gif" - label="Pop" + label="%pop.command.label2" style="push"> </command> </menuContribution> diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java index f7bc12359..119274b41 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java @@ -98,14 +98,14 @@ public class PDAThreadEventHandler extends DebugEventHandler { protected ModelDelta addTarget(ModelDelta delta, IThread thread) { ILaunch launch = thread.getLaunch(); Object[] children = launch.getChildren(); - delta = delta.addNode(launch, indexOf(getLaunchManager().getLaunches(), launch), IModelDelta.NO_CHANGE, children.length); + ModelDelta newdelta = delta.addNode(launch, indexOf(getLaunchManager().getLaunches(), launch), IModelDelta.NO_CHANGE, children.length); IDebugTarget debugTarget = thread.getDebugTarget(); int numFrames = -1; try { numFrames = thread.getStackFrames().length; } catch (DebugException e) { } - return delta.addNode(debugTarget, indexOf(children, debugTarget), IModelDelta.NO_CHANGE, numFrames); + return newdelta.addNode(debugTarget, indexOf(children, debugTarget), IModelDelta.NO_CHANGE, numFrames); } private void fireDeltaAndClearTopFrame(IThread thread, int flags) { |