[nobug] remove Javadoc warnings and NLS manifest + plugin.xml

7 files changed, 63 insertions, 40 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);
 	}