diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
index d2d5fb4c3070a37ad6f998bba8b58c406ca42d2a..bc6d498b9fac06ff82ef64b3202b925d087d601a 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
@@ -17,52 +17,71 @@ import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
 
-public class CommandOptionParser
-{
-  private String delimiter = "-";
+/**
+ * This is a helper class used to parse the command line options into a
+ * map where each option can be returned or all options.
+ */
+public class CommandOptionParser {
+  
+  // Delimiter string
+  private static final String delimiter = "-"; //$NON-NLS-1$
+  
+  // Map of options
   private Map options;
 
-  public CommandOptionParser(String[] args)
-  {
+  /**
+   * Default constructor
+   * @param args String[]
+   */
+  public CommandOptionParser(String[] args) {
     parse(args);
   }
 
-  public Map getOptions()
-  {
+  /**
+   * @return Map of all command line options and values
+   */
+  public Map getOptions() {
     return options;
   }
 
-  public Collection getOption(String key)
-  {
+  /**
+   * Return the command line values for the specified command line key.
+   * 
+   * @param key String
+   * @return Collection of values
+   */
+  public Collection getOption(String key) {
     return (Collection)options.get(key);
   }
 
-  public String getOptionAsString(String key)
-  {
+  /**
+   * Get command line value as a string for specified option key.
+   * 
+   * @param key String
+   * @return String command line value
+   */
+  public String getOptionAsString(String key) {
     Collection c = getOption(key);
     if (c.isEmpty())
       return null;
-    else
-      return (String)c.iterator().next();
+    return (String) c.iterator().next();
   }
 
-  private void parse(String[] args)
-  {
+  /**
+   * Parse the string array of command line options and values into a map.
+   * 
+   * @param args String[]
+   */
+  private void parse(String[] args) {
     options = new HashMap();
     String option = null;
-    for (int i = 0; i < args.length; i++)
-    {
-      if (args[i] != null)
-      {
-        if (args[i].startsWith(delimiter))
-        {
+    for (int i = 0; i < args.length; i++) {
+      if (args[i] != null) {
+        if (args[i].startsWith(delimiter)) {
           option = args[i].substring(1);
           options.put(option, new ArrayList(1));
-        }
-        else if (option != null)
-        {
+        } else if (option != null)
           ((List)options.get(option)).add(args[i]);
-        }
       }
     }
   }
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
index cd477865de4e226ddc58b8de6ff1e9893fa1b273..ca5fd67c47016f298bc71af3fcb355b20d8d8301 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IFragmentXML.java
@@ -15,7 +15,7 @@ import org.eclipse.wtp.releng.tools.component.internal.PluginXML;
 
 public interface IFragmentXML extends IPluginXML
 {
-  public static final String CONST_FRAGMENT_XML = "fragment.xml";
+  public static final String CONST_FRAGMENT_XML = "fragment.xml"; //$NON-NLS-1$
 
   /**
    * Answers the parent plugin of this fragment
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
index 027b59dcff28a156151e794bd32084953f42e0a8..d3c6d2c42b98b4971a94caaceb688ba5b04a6cdf 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/ILibrary.java
@@ -15,7 +15,7 @@ import java.util.Map;
 
 public interface ILibrary
 {
-  public static final String EXT_CLASS = "class";
+  public static final String EXT_CLASS = "class"; //$NON-NLS-1$
   /**
    * Answers a mapping of (qualified) type names to <code>Type</code> objects
    * which are found in this library.
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
index d6f62cc5af5e35bf0ee694ee82cc59dd7cc949d1..7df22615ca3dbbfd03e87b861d145b8760e8d1de 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IPluginXML.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 public interface IPluginXML
 {
-  public static final String CONST_PLUGIN_XML = "plugin.xml";
+  public static final String CONST_PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
 
   /**
    * Answers the libraries that are declared in this plugin.