java: remove commented out code

Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36

43 files changed, 0 insertions, 286 deletions

diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java
index a19f2cc5eb22..4776f2323cc0 100644
--- a/scripting/examples/java/MemoryUsage/MemoryUsage.java
+++ b/scripting/examples/java/MemoryUsage/MemoryUsage.java
@@ -41,7 +41,6 @@ import com.sun.star.script.provider.XScriptContext;
 
 public class MemoryUsage
 {
-    // public void updateMemoryUsage(XScriptContext ctxt, ActionEvent evt)
     public void updateMemoryUsage(XScriptContext ctxt)
         throws Exception
     {
diff --git a/scripting/examples/java/Newsgroup/MimeConfiguration.java b/scripting/examples/java/Newsgroup/MimeConfiguration.java
index d2cce9396c52..03e6c1b03116 100644
--- a/scripting/examples/java/Newsgroup/MimeConfiguration.java
+++ b/scripting/examples/java/Newsgroup/MimeConfiguration.java
@@ -78,7 +78,6 @@ public class MimeConfiguration
         {
                     if( ! new File( java.net.URLDecoder.decode( mailcapPath )  ).exists() )
                            {
-                //System.out.println( "URLDecoder: " + java.net.URLDecoder.decode( mailcapPath ) );
                 File mailcapFile = new File( mailcapPath );
                 FileWriter out = new FileWriter( mailcapFile );
                 String[] lines = getMailcapText();
@@ -90,7 +89,6 @@ public class MimeConfiguration
                     }
                     else
                     {
-                //System.out.println( "URLDecoder: " + java.net.URLDecoder.decode( mailcapPath ) );
                     }
 
 
@@ -140,7 +138,6 @@ public class MimeConfiguration
         {
                     if( ! new File( java.net.URLDecoder.decode( mimetypesPath )  ).exists() )
                            {
-                //System.out.println( "URLDecoder: " + java.net.URLDecoder.decode( mimetypesPath ) );
                 File mimetypesFile = new File( mimetypesPath );
                 FileWriter out = new FileWriter( mimetypesFile );
                 String[] lines = getMimeTypesText();
@@ -152,7 +149,6 @@ public class MimeConfiguration
                     }
                     else
                     {
-                //System.out.println( "URLDecoder: " + java.net.URLDecoder.decode( mimetypesPath ) );
                     }
 
             MimetypesFileTypeMap mimeTypes = new MimetypesFileTypeMap( mimetypesPath );
diff --git a/scripting/examples/java/Newsgroup/OfficeAttachment.java b/scripting/examples/java/Newsgroup/OfficeAttachment.java
index 327c3bdf1e89..c6b6fc9befab 100644
--- a/scripting/examples/java/Newsgroup/OfficeAttachment.java
+++ b/scripting/examples/java/Newsgroup/OfficeAttachment.java
@@ -98,50 +98,38 @@ public class OfficeAttachment
     public boolean createTempDocs()
     {
         String filenameURL = "file:///" + templocationURL +  "/" + attachmentName;
-        //String filenameSystem = templocationSystem + System.getProperty( "file.separator" ) + attachmentName;
-        //JOptionPane.showMessageDialog( null, "Filename URL " + filenameURL );
         try
         {
             if( isHtmlDoc )
             {
-                //JOptionPane.showMessageDialog( null, "Saving doc in HTML format" );
                 statusLine = "Saving doc in HTML format";
                 status.setStatus( 4, statusLine );
-                //System.out.print( "Saving attachment as " + filename + ".html..." );
                        PropertyValue[] propertyvalue_html = new PropertyValue[2];
                     propertyvalue_html[0] = new PropertyValue();
                         propertyvalue_html[0].Name = new String("Overwrite");
                     propertyvalue_html[0].Value = new Boolean(true);
                        propertyvalue_html[1] = new PropertyValue();
                     propertyvalue_html[1].Name = ("FilterName");
-//                  propertyvalue_html[1].Value = new String("scalc: HTML (StarCalc)");
                     propertyvalue_html[1].Value = new String("swriter: HTML (StarWriter)");
                 storedDoc.storeAsURL( filenameURL + ".html", propertyvalue_html);
 
                 File homedir = new File( templocationSystem );
-                //JOptionPane.showMessageDialog( null, "homedir (Java File): " + homedir.getPath() );
                 File homefiles[] = homedir.listFiles();
                 String file = "";
                 for(int i=0; i < homefiles.length; i++ )
                 {
                     if( homefiles[i].getName().equals( attachmentName + ".html" ) )
                     {
-                        //htmlFile = new File( homefiles[i].getAbsolutePath() );
-                        //JOptionPane.showMessageDialog( null, "Found HTML" );
                         file = homefiles[i].getAbsolutePath();
                     }
                 }
                 htmlFile = new File( file );
-                //htmlFile = new File( filename + ".html" );
-                //htmlFile = new File( storedDoc.getLocation() );
             }
 
             if( isOfficeDoc )
             {
-                //JOptionPane.showMessageDialog( null, "Saving doc in .sxw format" );
                 statusLine = "Saving doc in .sxw format";
                 status.setStatus( 4, statusLine );
-                //System.out.print( "Saving attachment as " + filename + ".sxw..." );
                 PropertyValue[] propertyvalue_sxw = new PropertyValue[2];
                     propertyvalue_sxw[0] = new PropertyValue();
                     propertyvalue_sxw[0].Name = new String("Overwrite");
@@ -153,8 +141,6 @@ public class OfficeAttachment
 
                 File homedir = new File( templocationSystem );
 
-                //JOptionPane.showMessageDialog( null, "homedir (Java File): " + homedir.getPath() );
-
                                 File homefiles[] = homedir.listFiles();
                 String file = "";
                                 for(int i=0; i < homefiles.length; i++ )
@@ -212,24 +198,17 @@ public class OfficeAttachment
         {
             if( isOfficeDoc && isHtmlDoc )
             {
-                //System.out.println( "Removing: " + htmlFile.getPath() + " " + officeFile.getPath() );
-                //System.out.println( "htmlfile " + htmlFile.exists() + " officeFile " + officeFile.exists() );
-                //JOptionPane.showMessageDialog( null, "Removing: " + htmlFile.getPath() + " " + officeFile.getPath() );
-                //JOptionPane.showMessageDialog( null, "htmlfile " + htmlFile.exists() + " officeFile " + officeFile.exists() );
                 htmlFile.delete();
                 officeFile.delete();
-                //JOptionPane.showMessageDialog( null, "htmlfile " + htmlFile.exists() + " officeFile " + officeFile.exists() );
             }
             else
             {
                 if( isOfficeDoc )
                                {
-                    //System.out.println( "Removing: " + officeFile.getPath() );
                     officeFile.delete();
                 }
                 else
                 {
-                    //System.out.println( "Removing: " + htmlFile.getPath() );
                     htmlFile.delete();
                 }
             }
diff --git a/scripting/examples/java/Newsgroup/PostNewsgroup.java b/scripting/examples/java/Newsgroup/PostNewsgroup.java
index 697b52a66a62..5f069b44dd19 100644
--- a/scripting/examples/java/Newsgroup/PostNewsgroup.java
+++ b/scripting/examples/java/Newsgroup/PostNewsgroup.java
@@ -321,7 +321,6 @@ public class PostNewsgroup extends JFrame
 
         if( subscribedNewsgroups == null )
         {
-            //System.out.println( "Couldn't find any subscibed newsgroups in .mozilla" );
             JOptionPane.showMessageDialog( window, "No subscribed newsgroups found in mozilla/netscape profile \nPlease enter newsgroup and host name",
                             "Newsgroups Information", JOptionPane.INFORMATION_MESSAGE );
         }
@@ -467,7 +466,6 @@ public class PostNewsgroup extends JFrame
                 Sender sender = new Sender( statusWindow, officeAttach, replyto, subject, comment, host, group );
                 if( !sender.sendMail() )
                 {
-                    //System.out.println( "Should end here (?)" );
                     statusWindow.enableCancelButton( true );
                     officeAttach.cleanUpOnError();
                     return false;
@@ -478,7 +476,6 @@ public class PostNewsgroup extends JFrame
             }
             else
             {
-                //System.out.println( "Non valid data" );
                 return false;
             }
             return true;
@@ -593,7 +590,6 @@ public class PostNewsgroup extends JFrame
         }
         if( newsgroupString.length() == 0 )
         {
-            //System.out.println( "Please enter a newsgroup name" );
             newsgroupComboBox.requestFocus();
             JOptionPane.showMessageDialog( window, "Please enter a newsgroup name", "Input Error", JOptionPane.ERROR_MESSAGE );
             return false;
@@ -604,7 +600,6 @@ public class PostNewsgroup extends JFrame
         String  hostString = hostTextField.getText();
                 if( hostString.length() == 0 )
                 {
-            //System.out.println( "Please enter a hostname" );
             hostTextField.requestFocus();
             JOptionPane.showMessageDialog( window, "Please enter a hostname", "Input Error", JOptionPane.ERROR_MESSAGE );
                         return false;
@@ -618,10 +613,8 @@ public class PostNewsgroup extends JFrame
         int atPos = replyString.indexOf( "@" );
         int dotPos = replyString.lastIndexOf( "." );
         int length = replyString.length();
-        //System.out.println( "length: " + length + "\n atPos: " + atPos + "\n dotPos: " + dotPos );
         if( length == 0 || atPos == -1 || dotPos == -1 || atPos < 2 || dotPos < atPos || dotPos + 2 == length || atPos + 2 == dotPos || atPos != replyString.lastIndexOf( "@" ) || replyString.indexOf(" ") != -1 )
         {
-            //System.out.println( "Please enter a valid reply to email address" );
             replyTextField.requestFocus();
             JOptionPane.showMessageDialog( window, "Please enter a valid reply to email address", "Input Error", JOptionPane.ERROR_MESSAGE );
             return false;
@@ -632,7 +625,6 @@ public class PostNewsgroup extends JFrame
         String subjectString = subjectTextField.getText();
         if( subjectString.length() == 0 )
         {
-            //System.out.println( "Please enter subject title" );
             subjectTextField.requestFocus();
             JOptionPane.showMessageDialog( window, "Please enter subject title", "Input Error", JOptionPane.ERROR_MESSAGE );
             return false;
diff --git a/scripting/examples/java/Newsgroup/Sender.java b/scripting/examples/java/Newsgroup/Sender.java
index 0efe27ca9931..efa3ed4c6753 100644
--- a/scripting/examples/java/Newsgroup/Sender.java
+++ b/scripting/examples/java/Newsgroup/Sender.java
@@ -91,7 +91,6 @@ public class Sender
             File attachs[] = attachments.getAttachments();
             for(int i=0; i < attachs.length; i++ )
             {
-                //System.out.println( "Adding file: " + attachs[i].getName() );
                 messageBodyPart = new MimeBodyPart();
                 DataSource filesource = new FileDataSource( attachs[i] );
                 messageBodyPart.setDataHandler( new DataHandler( filesource ));
diff --git a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
index cba9d62f59dc..e73ea3310eca 100644
--- a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
+++ b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
@@ -63,35 +63,28 @@ public class SubscribedNewsgroups {
         if( windows )
         {
             mozillaHome = System.getProperty( "user.home" ) + System.getProperty( "file.separator" ) + "Application Data" + System.getProperty( "file.separator" ) + "Mozilla" + System.getProperty( "file.separator" ) + "Profiles";
-            //System.out.println( "Windows mozilla path: " + mozillaHome );
         }
         else
         {
             mozillaHome = System.getProperty( "user.home" ) + System.getProperty( "file.separator" ) + ".mozilla";
-            //System.out.println( "Unix/Linux mozilla path: " + mozillaHome );
         }
         if( !new File( mozillaHome ).isDirectory() )
         {
-            //System.out.println("Could not find .mozilla directory");
             return null;
         }
-        //System.out.println(".mozilla directory found");
 
         // Get all the profiles belonging to the user
         File profiles[] = findProfiles( new File ( mozillaHome ) );
         if( profiles.length < 1 )
         {
-            //System.out.println("Could not find Profiles");
             return null;
         }
-        //System.out.println("Profiles found");
 
         // Get the News directory for each profile
         File allNewsDirs[] = new File[ profiles.length ];
         for( int i=0; i < profiles.length; i++ ) {
             File newsDir = findNewsDir( profiles[i] );
             allNewsDirs[i] = newsDir;
-            //System.out.println( "News is at: " + newsDir.getPath() );
         }
         // Check that at least one News directory exists and remove nulls
         boolean newsFound = false;
@@ -104,19 +97,15 @@ public class SubscribedNewsgroups {
         }
         if( !newsFound )
         {
-            //System.out.println("Could not find News directory");
             return null;
         }
-        //System.out.println("News directory found");
 
         // Get all the mailrc files for each News directory
         File allMailrcs[] = findMailrcFiles( allNewsDirs );
         if( allMailrcs == null )
         {
-            //System.out.println("Could not find mailrc files");
             return null;
         }
-        //System.out.println("mailrc files found");
 
         ArrayList<NewsGroup> subscribed = new ArrayList<NewsGroup>();
         // Get the newsgroups in each mailrc file
@@ -141,10 +130,8 @@ public class SubscribedNewsgroups {
         // Test that at least one subscribed newsgroup has been found
         if( allSubscribed.length < 1 )
         {
-            //System.out.println("Could not find Subscribed newsgroups ");
             return null;
         }
-        //System.out.println("Subscribed newsgroups found");
 
         return allSubscribed;
     }
@@ -236,16 +223,13 @@ public class SubscribedNewsgroups {
 
         for( int i=0; i < newsDirs.length; i++ )
         {
-            //System.out.println( "Finding mailrc for: " + newsDirs[i] );
             if( newsDirs[i] != null )
             {
                 File mailrcFiles[] = newsDirs[i].listFiles( new VersionFilter() );
                 if( mailrcFiles != null )
                 {
-                    //System.out.println( "Number found: " + mailrcFiles.length );
                     for( int j=0; j < mailrcFiles.length; j++ )
                     {
-                        //System.out.println( "This mailrc was found: " + mailrcFiles[j] );
                         allFiles.addElement( mailrcFiles[j] );
                     }
                 }
@@ -254,14 +238,10 @@ public class SubscribedNewsgroups {
         File allMailrcFiles[] = new File[ allFiles.size() ];
         allFiles.copyInto(allMailrcFiles);
 
-        //System.out.println( "number of mailrcs in total: " + allMailrcFiles.length );
-
         if( allMailrcFiles.length == 0 ) {
-            //System.out.println( "Returning null");
             return null;
         }
 
-        //System.out.println( "Returning an File array containing mailrcs");
         return allMailrcFiles;
     }
 
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 7552d2d2e9d5..9d0283234b24 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -54,7 +54,6 @@ public class ParcelBrowseNode extends PropertySet
     implements XBrowseNode, XInvocation
 {
     private ScriptProvider provider;
-    //private RootBrowseNode parent;
     private Collection<XBrowseNode> browsenodes;
     private ParcelContainer container;
     private Parcel parcel;
@@ -255,8 +254,6 @@ public class ParcelBrowseNode extends PropertySet
                 LogUtils.DEBUG( LogUtils.getTrace( e ) );
                 result = new Any(new Type(Boolean.class), Boolean.FALSE);
 
-                // throw new com.sun.star.reflection.InvocationTargetException(
-                //     "Error creating script: " + e.getMessage());
             }
         }
         else if (aFunctionName.equals("Deletable"))
@@ -275,9 +272,6 @@ public class ParcelBrowseNode extends PropertySet
             catch (Exception e)
             {
                 result =  new Any(new Type(Boolean.class), Boolean.FALSE);
-
-                // throw new com.sun.star.reflection.InvocationTargetException(
-                //     "Error deleting parcel: " + e.getMessage());
             }
         }
         else if (aFunctionName.equals("Renamable"))
@@ -327,9 +321,6 @@ public class ParcelBrowseNode extends PropertySet
             catch (Exception e)
             {
                 result =  new Any(new Type(Boolean.class), Boolean.FALSE);
-
-                // throw new com.sun.star.reflection.InvocationTargetException(
-                //     "Error renaming parcel: " + e.getMessage());
             }
         }
 
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 63a2d8d0ddc4..7c53fae52bbb 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -245,9 +245,6 @@ public class ProviderBrowseNode extends PropertySet
         LogUtils.DEBUG("ProviderBrowseNode[create] failed with: " + e );
                 LogUtils.DEBUG( LogUtils.getTrace( e ) );
                 result = new Any(new Type(Boolean.class), Boolean.FALSE);
-
-                // throw new com.sun.star.reflection.InvocationTargetException(
-                //     "Error creating script: " + e.getMessage());
             }
         }
         else {
diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index 8cafb62a0f51..df018f488f99 100644
--- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
@@ -18,7 +18,6 @@
 
 package com.sun.star.script.framework.container;
 
-import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
@@ -26,10 +25,6 @@ import java.io.ByteArrayInputStream;
 
 import java.util.ArrayList;
 
-// import javax.xml.parsers.DocumentBuilderFactory;
-// import javax.xml.parsers.DocumentBuilder;
-// import javax.xml.parsers.ParserConfigurationException;
-
 import org.w3c.dom.*;
 
 public class DeployedUnoPackagesDB {
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 026d1df834e5..6e3ba9fb4ce2 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -251,7 +251,6 @@ public class Parcel implements XNameContainer
             ScriptMetaData script = null;
             if ( ( script = (ScriptMetaData)getByName( Name ) ) != null )
             {
-//                if ( script.hasSource() )
                 {
                    if ( !script.removeSourceFile() )
                    {
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 4a28f30bbc3f..87ed54b0242e 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -35,9 +35,6 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-// import javax.xml.parsers.DocumentBuilderFactory;
-// import javax.xml.parsers.DocumentBuilder;
-// import javax.xml.parsers.ParserConfigurationException;
 
 public class ParcelDescriptor {
 
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index e592b028a921..3b1cd1db7aa1 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -211,7 +211,6 @@ public class UnoPkgContainer extends ParcelContainer
         DeployedUnoPackagesDB dp = null;
         try
         {
-//            String path = containerUrl.substring( 0, containerUrl.lastIndexOf("/") );
             String packagesUrl = PathUtils.make_url( extensionDb, "/Scripts/" + extensionRepository + "-extension-desc.xml" );
             LogUtils.DEBUG("getUnoPackagesDB() looking for existing db in " + packagesUrl );
             if ( m_xSFA.exists( packagesUrl ) )
@@ -270,7 +269,6 @@ public class UnoPkgContainer extends ParcelContainer
         OutputStream os = null;
         try
         {
-//            String path = containerUrl.substring( 0, containerUrl.lastIndexOf("/") );
             String packagesUrl = PathUtils.make_url( extensionDb, "/Scripts/" + extensionRepository + "-extension-desc.xml" );
             xos =  m_xSFA.openFileWrite( packagesUrl );
             XTruncate xTrc = UnoRuntime.queryInterface( XTruncate.class, xos );
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index f033ffdf1dd5..d19a772d2d7f 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -323,7 +323,6 @@ class ScriptImpl implements XScript
 
             raiseEditor( lineNum );
 
-            //String stackTrace = te.getScriptStackTrace();  // never seems to have any info??
             if ( usefulInfoIndex > -1 )
             {
                 message = message.substring( usefulInfoIndex + 2 );
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index ebf3d6e7fbac..aaf6abb5d2ae 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -79,8 +79,6 @@ public class ScriptSourceModel {
         throws Exception
     {
         Object result = null;
-        // Thread execThread = new Thread() {
-            // public void run() {
                 if ( cl != null )
                 {
                     // sets this threads class loader
@@ -118,9 +116,6 @@ public class ScriptSourceModel {
                 else {
                     result = interpreter.eval(getText());
                 }
-            // }
-        // };
-        // execThread.start();
         return result;
     }
     public void indicateErrorLine( int lineNum )
diff --git a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
index 73f82226b228..1d0fec35ce82 100644
--- a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
@@ -38,8 +38,6 @@ public class MethodPanel extends JPanel {
     private File basedir;
     private ArrayList<String> classpath;
 
-    // private JTable table;
-    // private MethodTableModel model;
     private JList list;
     private ScriptEntry[] values;
 
@@ -72,7 +70,6 @@ public class MethodPanel extends JPanel {
 
     private void initUI() {
         JLabel label = new JLabel("Available Methods:");
-        // table = new JTable(model);
         list = new JList(values);
 
         JScrollPane pane = new JScrollPane(list);
diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index 720aa482b139..a349ff51d60f 100644
--- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
@@ -60,7 +60,6 @@ public class Manifest {
             el = document.createElement("manifest:file-entry");
             el.setAttribute("manifest:media-type", type);
             el.setAttribute("manifest:full-path", entry);
-            // System.out.println("added: " + el.toString());
             root.appendChild(el);
         }
         catch (Exception e) {
@@ -91,7 +90,6 @@ public class Manifest {
             for (int i = 0; i < len; i++) {
                 el = (Element)nl.item(i);
                 if (el.getAttribute("manifest:full-path").startsWith(entry)) {
-                    // System.out.println("found: " + el.toString());
                     list.add(el);
                 }
             }
@@ -99,8 +97,6 @@ public class Manifest {
             Iterator iter = list.iterator();
             while (iter.hasNext())
                 root.removeChild((Element)iter.next());
-
-            // System.out.println("and after root is: " + root.toString());
         }
         catch (Exception e) {
             System.err.println("Error removing entry: " + e.getMessage());
@@ -115,7 +111,6 @@ public class Manifest {
             out = new ByteArrayOutputStream();
             write(out);
             result = new ByteArrayInputStream(out.toByteArray());
-            // result = replaceNewlines(out.toByteArray());
         }
         finally {
             if (out != null)
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index 2cb4099d4c65..e7da54240c71 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
@@ -143,7 +143,6 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup
 
                 if (result == true && target.isDirectory()) {
                     showNagDialog();
-                    // refreshOffice((String)versions.get(label));
                 }
             }
         });
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
index 634a5ed65591..00402b93409d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
@@ -90,8 +90,6 @@ public class ParcelDescriptorEditorSupport extends DataEditorSupport implements
      */
     private static class ParcelDescriptorEnv extends DataEditorSupport.Env {
 
-        //private static final long serialVersionUID = ...L;
-
         /** Create a new environment based on the data object.
          * @param obj the data object to edit
          */
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
index 663f2119ae6a..968173dcefc1 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
@@ -69,7 +69,6 @@ public class OfficeDocumentDataLoader extends UniFileLoader {
             jarFs.setJarFile(document);
         }
         catch (IOException e) {
-            // TopManager.getDefault().notify(new NotifyDescriptor.Exception(e, "asdf"));
             return null;
         }
         catch (Exception e) {
@@ -81,7 +80,6 @@ public class OfficeDocumentDataLoader extends UniFileLoader {
     protected SystemAction[] defaultActions() {
         return new SystemAction[] {
             SystemAction.get(OpenAction.class),
-            // SystemAction.get(MountDocumentAction.class),
             null,
             SystemAction.get(CutAction.class),
             SystemAction.get(CopyAction.class),
@@ -90,7 +88,6 @@ public class OfficeDocumentDataLoader extends UniFileLoader {
             SystemAction.get(DeleteAction.class),
             SystemAction.get(RenameAction.class),
             null,
-            // SystemAction.get(ToolsAction.class),
             SystemAction.get(PropertiesAction.class),
         };
     }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
index b41063ff5092..14e968668f71 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
@@ -57,17 +57,14 @@ public class ParcelDataLoader extends UniFileLoader {
 
     protected SystemAction[] defaultActions() {
         return new SystemAction[] {
-            // SystemAction.get(MountParcelAction.class),
             SystemAction.get(DeployParcelAction.class),
             null,
             SystemAction.get(CutAction.class),
             SystemAction.get(CopyAction.class),
-            // SystemAction.get(PasteAction.class),
             null,
             SystemAction.get(DeleteAction.class),
             SystemAction.get(RenameAction.class),
             null,
-            // SystemAction.get(ToolsAction.class),
             SystemAction.get(PropertiesAction.class),
         };
     }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
index 810a3f9ed48e..8f6083ae00d8 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
@@ -48,17 +48,12 @@ public class ParcelDescriptorDataLoader extends UniFileLoader {
     protected void initialize() {
         super.initialize();
 
-        // ExtensionList extensions = new ExtensionList();
-        // extensions.addMimeType("text/x-parcel+xml");
-        // extensions.addExtension("pml");
         getExtensions().addMimeType("text/x-parcel+xml");
-        // setExtensions(extensions);
     }
 
     protected SystemAction[] defaultActions() {
         return new SystemAction[] {
             SystemAction.get(OpenAction.class),
-            // SystemAction.get(GenerateParcelAction.class),
             null,
             SystemAction.get(CutAction.class),
             SystemAction.get(CopyAction.class),
@@ -67,9 +62,6 @@ public class ParcelDescriptorDataLoader extends UniFileLoader {
             SystemAction.get(DeleteAction.class),
             SystemAction.get(RenameAction.class),
             null,
-            // SystemAction.get(SaveAsTemplateAction.class),
-            // null,
-            // SystemAction.get(ToolsAction.class),
             SystemAction.get(PropertiesAction.class),
         };
     }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
index dbcb806adf34..cb03c0c8f35d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
@@ -126,18 +126,12 @@ public class ParcelFolder extends DataFolder {
                 sheet.put(props);
             }
 
-            // prop = createLocationProperty();
-            // props.put(prop);
-
             prop = createFilterProperty();
             props.put(prop);
 
             prop = createFilterProperty();
             props.put(prop);
 
-            // prop = createLanguageProperty();
-            // props.put(prop);
-
             prop = createClasspathProperty();
             props.put(prop);
 
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
index 3f0684655ac4..3b435fe5b17d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
@@ -68,25 +68,16 @@ public class ParcelFolderDataLoader extends UniFileLoader {
 
     protected SystemAction[] defaultActions() {
         return new SystemAction[] {
-            // SystemAction.get(OpenLocalExplorerAction.class),
-            // SystemAction.get(FindAction.class),
-            // null,
-            // SystemAction.get(FileSystemAction.class),
-            // null,
             SystemAction.get(CompileParcelAction.class),
             SystemAction.get(BuildParcelAction.class),
             SystemAction.get(ConfigureParcelAction.class),
             null,
             SystemAction.get(CutAction.class),
             SystemAction.get(CopyAction.class),
-            // SystemAction.get(PasteAction.class),
             null,
             SystemAction.get(DeleteAction.class),
             SystemAction.get(RenameAction.class),
             null,
-            // SystemAction.get(SaveAsTemplateAction.class),
-            // null,
-            // SystemAction.get(ToolsAction.class),
             SystemAction.get(PropertiesAction.class),
         };
     }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 1279ffe9e45a..1b0283e96678 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -34,8 +34,6 @@ import org.openoffice.idesupport.OfficeInstallation;
  */
 public class OfficeSettings extends SystemOption {
 
-    // private static final long serialVersionUID = ...;
-
     public static final String OFFICE_DIRECTORY = "OfficeDirectory";
     public static final String WARN_BEFORE_DOC_DEPLOY = "WarnBeforeDocDeploy";
     public static final String WARN_BEFORE_PARCEL_DELETE = "WarnBeforeParcelDelete";
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
index c5bb4acc2d88..de74e8b181d3 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
@@ -63,7 +63,6 @@ public class FrameworkJarChecker {
         }
 
         if(result == null) {
-            // warnBeforeMount();
             JarFileSystem newjfs = new JarFileSystem();
             try {
                 newjfs.setJarFile(unoilFile);
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
index 844bcf24cf88..bf22ecfc35d2 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
@@ -54,8 +54,6 @@ import org.openoffice.netbeans.modules.office.utils.PackageRemover;
 public class JavaScriptIterator implements TemplateWizard.Iterator {
 
 
-    // private static final long serialVersionUID = ...L;
-
     // You should define what panels you want to use here:
 
     protected WizardDescriptor.Panel[] createPanels() {
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
index 03a8a0bfe4cf..7fbcd34bfe97 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
@@ -55,8 +55,6 @@ import org.openoffice.netbeans.modules.office.filesystem.OpenOfficeDocFileSystem
 public class ParcelContentsIterator implements TemplateWizard.Iterator {
 
 
-    // private static final long serialVersionUID = ...L;
-
     // You should define what panels you want to use here:
 
     public static final String PROP_LANGUAGE =
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
index 65bb1b3ebb03..66fb0a29821a 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
@@ -85,9 +85,6 @@ public class SelectPathPanel implements WizardDescriptor.Panel /* .FinishPanel *
         // and uncomment the complicated stuff below.
     }
 
-    // public final void addChangeListener(ChangeListener l) {}
-    // public final void removeChangeListener(ChangeListener l) {}
-
     private final Set listeners = new HashSet(1); // Set<ChangeListener>
     public final void addChangeListener(ChangeListener l) {
         synchronized (listeners) {
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index 7999bcef7e06..d0858dfc4c72 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
@@ -111,20 +111,15 @@ public void run()
     XInterface oObj = null;
     try
     {
-        /* System.err.println("Name of the AccessibleContext:\n\t"+
-                                        xCon.getAccessibleName()); */
         int count = xCon.getAccessibleChildCount();
-        // System.err.println("Number of children: "+count);
         for (int i=0; i<count; i++) {
             XAccessible xAcc = xCon.getAccessibleChild(i);
             String name =
                     xAcc.getAccessibleContext().getAccessibleName();
-            // System.out.println("Child "+i+": "+ name);
             // check for button
             if ( name.equals( btnName ) && ( UnoRuntime.queryInterface(
                                     XButton.class, xAcc ) != null ) )
             {
-                // System.out.println("Child "+i+": "+ name);
                 oObj = xAcc.getAccessibleContext();
             }
             // check for checkbox
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 87d7dbbf38ae..9cc0a3429fe2 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -68,7 +68,6 @@ public class _XScriptInfoAccess extends MultiMethodTest {
 
         log.println(testdata.get("description"));
 
-        // try {
             log.println("In _XScriptInfoAccess.getScriptLogicalNames()");
             String[] logicalNames = oObj.getScriptLogicalNames();
 
@@ -84,11 +83,6 @@ public class _XScriptInfoAccess extends MultiMethodTest {
                     }
                 }
             }
-        // }
-        // catch (com.sun.star.uno.Exception e) {
-            // log.println("Caught UNO Exception :" + e);
-            // output = "com.sun.star.uno.Exception";
-        // }
 
         log.println("expected: " + expected + ", output: " + output);
         if (output.equals(expected))
diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java
index 17d1ad9ba88d..11f24e719f07 100644
--- a/scripting/workben/installer/FileUpdater.java
+++ b/scripting/workben/installer/FileUpdater.java
@@ -98,7 +98,6 @@ public class FileUpdater {
             FileWriter out = null;
             int count = 0;
 
-        //System.out.println("updateScriptXLC");
             try {
                 in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"script.xlc" );
 
@@ -128,7 +127,6 @@ public class FileUpdater {
                 out = new FileWriter( out_file );
 
                 //split the string into a string array with one line of xml in each element
-                //String[] xmlArray = xmlLine.split("\n");
         for(int i=0; i<count + 1; i++) {
                     out.write(xmlArray[i]+"\n");
                     if( ( xmlArray[i].indexOf( "<library:libraries xmlns:library" ) != -1 ) && ( xmlArray[i+1].indexOf( "ScriptBindingLibrary" ) == -1 ) ) {
@@ -169,7 +167,6 @@ public class FileUpdater {
             FileWriter out = null;
             int count = 0;
 
-            //System.out.println( "updateDialogXLC" );
             try {
                 in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"dialog.xlc" );
 
@@ -199,7 +196,6 @@ public class FileUpdater {
                 out = new FileWriter( out_file );
 
                 //split the string into a string array with one line of xml in each element
-                // String[] xmlArray = xmlLine.split("\n");
         for(int i=0; i<count + 1; i++) {
                     out.write(xmlArray[i]+"\n");
                     if( ( xmlArray[i].indexOf( "<library:libraries xmlns:library" ) != -1 ) && ( xmlArray[i+1].indexOf( "ScriptBindingLibrary" ) == -1 ) ) {
diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java
index 51646315d2b1..01c0cec23976 100644
--- a/scripting/workben/installer/Final.java
+++ b/scripting/workben/installer/Final.java
@@ -77,14 +77,12 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
             nav.enableBack(false);
             nav.enableCancel(false);
             ArrayList<?> locations = InstallWizard.getLocations();
-            //System.out.println("here "+locations.size());
             // Returned 1
             String progpath=null;
             String path=null;
             String classespath=null;
             for (int i =0;i<locations.size();i++){
                 path= (String)locations.get(i);
-            //InstallWizard.currentPath = path;
             xud = new XmlUpdater(path, statusLine,progressBar,InstallWizard.bNetworkInstall,InstallWizard.bBindingsInstall);
         xud.addInstallListener(this);
         InstallWizard.setInstallStarted(true);
@@ -111,9 +109,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
 
 
     public void installationComplete(InstallationEvent ev) {
-        //System.out.println("Detected installation complete");
     if( InstUtil.hasNetbeansInstallation() ) {
-        //System.out.println("Detected installation complete (IDE(s) detected)");
         nav.removeCancelListener(this);
         nav.setCancelListener(nav);
         nav.navCancel.setText("Finish");
@@ -122,7 +118,6 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
         xud = null;
     }
     else {
-        //System.out.println("Detected installation complete (No IDE(s) detected)");
         nav.removeCancelListener(this);
         nav.setCancelListener(nav);
         nav.navCancel.setText("Finish");
diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java
index eac052191731..8d0ecc1786a9 100644
--- a/scripting/workben/installer/IdeFinal.java
+++ b/scripting/workben/installer/IdeFinal.java
@@ -74,19 +74,14 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst
             nav.enableBack(false);
             nav.enableCancel(false);
             ArrayList<?> locations = InstallWizard.getLocations();
-            //System.out.println("here "+locations.size());
             // Returned 1
             String path=null;
             for (int i =0;i<locations.size();i++){
                 path= (String)locations.get(i);
 
-            //InstallWizard.currentPath = path;
             ideupdater = new IdeUpdater( path, statusLine, progressBar );
         ideupdater.addInstallListener(this);
         InstallWizard.setInstallStarted(true);
-        //InstallWizard.setPatchedTypes(false);
-        //InstallWizard.setPatchedJava(false);
-        //InstallWizard.setPatchedRDB(false);
         ideupdater.start();
             }
         }
@@ -107,9 +102,6 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst
 
 
     public void installationComplete(InstallationEvent ev) {
-        //System.out.println("Detected installation complete");
-    //if( InstUtil.hasNetbeansInstallation() || InstUtil.hasJeditInstallation() ) {
-        //System.out.println("Detected installation complete (IDE(s) detected)");
         nav.removeCancelListener(this);
         nav.setCancelListener(nav);
         nav.navCancel.setText("Finish");
@@ -122,7 +114,6 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst
     private javax.swing.JLabel statusLine;
     private InstallWizard wizard;
     private NavPanel nav;
-    //private XmlUpdater xud;
     private IdeUpdater ideupdater;
     // End of variables declaration//GEN-END:variables
 
diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java
index a90ccb13a73e..20aa5501ebc7 100644
--- a/scripting/workben/installer/IdeVersion.java
+++ b/scripting/workben/installer/IdeVersion.java
@@ -63,34 +63,15 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta
                 System.out.println("It got here1");
                 String path = null;
                 if ( (path = netbeansProps.getProperty(key) ) != null ) {
-                    //System.out.println( "n="+n+" v="+v + " Netbeans " + " key=" + key + " path=" + path );
                     ideProps.put(key, path);
                 }
             }
         }
         }
-                //System.out.println("*** About to look for jedit install");
-        /*
-        if(jeditProps!=null)
-        {
-            for( int j = 0; j < jeditProps.size(); j++ ) {
-                for( int v = 0; v < InstUtil.versions.length; v++ ) {
-                System.out.println("j: " +j+" v: " +v);
-                    String key = InstUtil.versions[v];
-                    String path = null;
-                    if ((path = jeditProps.getProperty(key)) != null) {
-                        //System.out.println( "j="+j+" v="+v + " jEdit " + " key=" + key + " path=" + path );
-                        ideProps.put(key, path);
-                    }
-                }
-            }
-        }
-        */
         props = ideProps;
     }
         catch (IOException eIO) {
             System.err.println("Failed to parse .netbeans/ide.log");
-        //JOptionPane.showMessageDialog(this, "There was a problem reading from the NetBeans ide.log file.", "Parse Error", JOptionPane.ERROR_MESSAGE);
         }
         catch (Exception e) {
             System.err.println("Exception thrown in initComponents");
@@ -101,7 +82,6 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta
     if (tableModel.getRowCount() == 0)
     {
             JOptionPane.showMessageDialog(this, "No compatible IDEs were found.", "Invalid versions", JOptionPane.ERROR_MESSAGE);
-            //wizard.exitForm(null);
     }
 
         tableModel.addTableModelListener(this);
@@ -182,8 +162,6 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta
             if (((Boolean)list.get(0)).booleanValue() == true)
                 InstallWizard.storeLocation((String)list.get(2));
         }
-
-        //System.out.println(wizard.getLocations());
     }
 
 
@@ -271,7 +249,6 @@ class MyTableModelIDE extends AbstractTableModel {
 
     MyTableModelIDE (Properties properties, String [] validVersions) {
         data = new ArrayList<ArrayList<Object>>();
-        //System.out.println(properties);
 
         int len = validVersions.length;
         for (int i = 0; i < len; i++) {
diff --git a/scripting/workben/installer/IdeWelcome.java b/scripting/workben/installer/IdeWelcome.java
index 542b98e8353d..014daf54f75b 100644
--- a/scripting/workben/installer/IdeWelcome.java
+++ b/scripting/workben/installer/IdeWelcome.java
@@ -41,7 +41,6 @@ public class IdeWelcome extends javax.swing.JPanel implements ActionListener {
         setLayout(new java.awt.BorderLayout());
 
         welcomePanel.setLayout(new java.awt.BorderLayout());
-        //area.setHorizontalAlignment(javax.swing.JTextField.CENTER);
         area.setEditable(false);
         area.setLineWrap(true);
         area.setText("\n Click Next to include Scripting Framework support for IDEs.");
@@ -49,9 +48,6 @@ public class IdeWelcome extends javax.swing.JPanel implements ActionListener {
     if( InstUtil.hasNetbeansInstallation() ) {
         area.append("\n \tA version of Netbeans has been detected. \n");
     }
-    //if( InstUtil.hasJeditInstallation() ) {
-    //  area.append("\n \tA version of jEdit has been detected.");
-    //}
 
         welcomePanel.add(area, java.awt.BorderLayout.CENTER);
         add(welcomePanel, java.awt.BorderLayout.CENTER);
@@ -59,9 +55,6 @@ public class IdeWelcome extends javax.swing.JPanel implements ActionListener {
         nav.setNextListener(this);
         add(nav, java.awt.BorderLayout.SOUTH);
 
-        //Banner br = new Banner();
-        //add(br, java.awt.BorderLayout.WEST);
-
     }//GEN-END:initComponents
 
     public java.awt.Dimension getPreferredSize() {
diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java
index 9d12e38d75ae..4e8563c722ea 100644
--- a/scripting/workben/installer/InstUtil.java
+++ b/scripting/workben/installer/InstUtil.java
@@ -176,11 +176,6 @@ public class InstUtil {
 
     public static Properties getJeditLocation() throws IOException {
 
-    /*if( !hasJeditInstallation() ) {
-        System.out.println( "No Jedit found (line195 InstUtil");
-        return null;
-    }*/
-
     Properties results = new Properties();
 
     StringBuffer str = new StringBuffer();
@@ -190,7 +185,6 @@ public class InstUtil {
 
         String os = System.getProperty("os.name");
         thePath.append(".jedit");
-    //System.out.println( ".jedit path " + thePath );
 
     File jeditLogFile = new File( thePath.toString() + File.separator + "activity.log" );
     if( jeditLogFile.exists() ) {
@@ -220,17 +214,9 @@ public class InstUtil {
         s.trim();
         if( s.indexOf( "IDE Install" ) != -1 ) {
             int pathStart = s.indexOf( "=" ) + 2;
-            //System.out.println( "pathStart " + pathStart );
             installPath = s.substring( pathStart, s.length() );
-            //System.out.println( "installPath 1" + installPath );
             int pathEnd = installPath.indexOf( ";");
-            //System.out.println( "pathEnd " + pathEnd );
             installPath = installPath.substring( 0, pathEnd ) +File.separator;
-            //System.out.println( "pathStart " + pathStart );
-            //int pathEnd = s.indexOf( ";");
-            //System.out.println( "pathEnd " + pathEnd );
-            //System.out.println( "s is " + s + " and " + s.length() + " long" );
-            //installPath = s.substring( pathStart, pathEnd - 1 );
             installPath.trim();
             break;
         }
@@ -240,9 +226,6 @@ public class InstUtil {
         catch( IOException ioe ) {
         System.out.println( "Error reading Netbeans location information" );
             }
-        //catch( FileNotFoundException fnfe ) {
-        //System.out.println( "NetBeans ide.log FileNotFoundException" );
-        //}
 
         return installPath;
     }
@@ -259,20 +242,9 @@ public class InstUtil {
         s.trim();
         if( s.indexOf( "jEdit home directory is" ) != -1 ) {
             int pathStart = new String( "[message] jEdit: jEdit home directory is " ).length();
-            //System.out.println( "pathStart " + pathStart );
             installPath = s.substring( pathStart, s.length() ) +File.separator;
             System.out.println( "installPath 1" + installPath );
-            //int pathEnd = installPath.indexOf( ";");
-            //System.out.println( "pathEnd " + pathEnd );
-            //installPath = installPath.substring( 0, pathEnd ) +File.separator;
-            //System.out.println( "pathStart " + pathStart );
-            //int pathEnd = s.indexOf( ";");
-            //System.out.println( "pathEnd " + pathEnd );
-            //System.out.println( "s is " + s + " and " + s.length() + " long" );
-            //installPath = s.substring( pathStart, pathEnd - 1 );
             installPath.trim();
-            //System.out.println( "installPath 2 " + installPath );
-            //break;
             jeditDetails[0] = installPath;
         }
         if( s.indexOf( "jEdit: jEdit version" ) != -1 ) {
@@ -289,9 +261,6 @@ public class InstUtil {
         catch( IOException ioe ) {
         System.out.println( "Error reading Jedit location information" );
             }
-        //catch( FileNotFoundException fnfe ) {
-        //System.out.println( "Jedit activity.log FileNotFoundException" );
-        //}
         return jeditDetails;
     }
 
@@ -335,12 +304,10 @@ public class InstUtil {
 
         for (String s = reader.readLine(); s != null; s = reader.readLine()) {
             s.trim();
-            //System.out.println(s);
             if (s.length() == 0)
                 continue;
             if (s.charAt(0) == '[') {
                 sectionName = s.substring(1, s.length() - 1);
-                //System.out.println(sectionName);
                 continue;
             }
             if ((sectionName != null) && sectionName.equalsIgnoreCase("Versions")) {
@@ -351,14 +318,8 @@ public class InstUtil {
         String [] parts = new String[2];
         parts[0] = officeName;
         parts[1] = instPath + File.separator;
-        //System.out.println( "InstUtil officeName " + officeName );
-        //System.out.println( "InstUtil instPath " + instPath );
 
-        //String [] parts = s.split("=");
                 if (parts.length == 2) {
-                    //ver.version = parts[0].trim();
-                    //File f = new File(parts[1].trim());
-            //results.put(parts[0].trim(), f.getPath());
             try {
                         URL url = new URL("file://" + parts[1].trim());
             String opSys =System.getProperty("os.name");
@@ -382,23 +343,11 @@ public class InstUtil {
                 results.put( parts[0].trim(), windowsPath );
             }
             else {
-                //System.err.println( " InstUtil URLDecoder " + URLDecoder.decode(url.getPath()) );
                 results.put(parts[0].trim(), URLDecoder.decode(url.getPath()));
             }
-                        //File f = new File(url);
-
-            //.sversion: OpenOffice.org 643=file:///scriptdev/neil/ScriptFrameOpenoffice1.0.1
-            // parts = Installation name. f.getPath = Installation path
-                        //results.put(parts[0].trim(), f.getPath());
-
-                        //results.put(parts[0].trim(), URLDecoder.decode(url.getPath()));
-            //results.put( parts[0].trim(), windowsPath );
-
                     }
                     catch (MalformedURLException eSyntax) {
-                        //throw new IOException("Error while reading version information");
             results.put(parts[0].trim(), parts[1].trim());
-            //System.out.println(parts[0].trim() + " : " + parts[1].trim());
             System.err.println("GotHereException");
                     }
                 }
diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java
index 096b873b8c4f..1134fc4ad237 100644
--- a/scripting/workben/installer/InstallWizard.java
+++ b/scripting/workben/installer/InstallWizard.java
@@ -229,7 +229,6 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
     public static void main(String args[]) {
         String officePath = null;
         String netbeansPath = null;
-        //String jeditPath = null;
         int i = 0;
 
         while (i < args.length) {
@@ -245,12 +244,9 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
                 bNetworkInstall = true;
             if (args[i].equals("-bindings"))
                 bBindingsInstall = true;
-            //if (args[i].equals("-jedit"))
-            //    jeditPath = args[++i];
             i++;
         }
 
-        //if (officePath == null && netbeansPath == null && jeditPath == null)
         if (officePath == null && netbeansPath == null)
             new InstallWizard().show();
 
@@ -281,11 +277,6 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
             IdeUpdater ideup = new IdeUpdater(netbeansPath, label, progressbar);
             ideup.run();
         }
-
-        //if (jeditPath != null) {
-        //    IdeUpdater ideup = new IdeUpdater(jeditPath, label, progressbar);
-        //    ideup.run();
-        //}
     }
 
     private static void printUsage() {
@@ -296,7 +287,6 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
         System.err.println("\t[-bindings]");
         System.err.println("\n\n-net indicates that this is the network part of a network install.");
         System.err.println("-bindings will only install the menu & key bindings in user/config/soffice.cfg.");
-        //System.err.println("\t[-jedit <path_to_jedit_installation]");
     }
 
     public static synchronized boolean isPatchedTypes()
diff --git a/scripting/workben/installer/LogStream.java b/scripting/workben/installer/LogStream.java
index 55cc00539860..e8cb77031a23 100644
--- a/scripting/workben/installer/LogStream.java
+++ b/scripting/workben/installer/LogStream.java
@@ -25,7 +25,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
 
-//import java.io.PrintWriter;
 public class LogStream extends PrintStream
 {
     static final private DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z: ");
diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java
index e2d7ceabc9af..420ba61e177e 100644
--- a/scripting/workben/installer/Register.java
+++ b/scripting/workben/installer/Register.java
@@ -125,17 +125,6 @@ public class Register{
                 }
         }
 
-            // if ( !regSingletons( path, progpath, opSys, statusLabel ) )
-        // {
-            //     return false;
-            // }
-            // updating ProtocolHandler
-            /* statusLabel.setText("Updating ProtocolHandler...");
-            if(!FileUpdater.updateProtocolHandler(path, statusLabel)) {
-            statusLabel.setText("Updating ProtocolHandler failed, please view SFrameworkInstall.log");
-            return false;
-        } */
-
             // updating StarBasic libraries
             statusLabel.setText("Updating StarBasic libraries...");
             if(!FileUpdater.updateScriptXLC(path, statusLabel)) {
diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java
index 35823163148e..1f2a84644662 100644
--- a/scripting/workben/installer/Version.java
+++ b/scripting/workben/installer/Version.java
@@ -215,8 +215,6 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table
             if (((Boolean)list.get(0)).booleanValue() == true)
                 InstallWizard.storeLocation((String)list.get(2));
         }
-
-        //System.out.println(wizard.getLocations());
     }
 
 
@@ -233,9 +231,6 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table
     private InstallWizard wizard;
     private MyTableModel tableModel;
     private NavPanel nav;
-    //private static final String [] versions = {"StarOffice 6.0", "OpenOffice.org 1.0","OpenOffice.org 1.0.1","OpenOffice.org 642","OpenOffice.org 643","StarOffice 6.1"};
-    //private static final String [] versions = {"OpenOffice.org 643"};
-    //private static final String [] versions = {"OpenOffice.org 643", "StarOffice 6.1"};
     private static final String [] versions = {"StarOffice 6.1", "OpenOffice.org 1.1Beta", "OpenOffice.org 644", "OpenOffice.org 1.1"};
     // End of variables declaration//GEN-END:variables
 
diff --git a/scripting/workben/installer/Welcome.java b/scripting/workben/installer/Welcome.java
index 9a5cf4790acd..b9f1bca1ab59 100644
--- a/scripting/workben/installer/Welcome.java
+++ b/scripting/workben/installer/Welcome.java
@@ -155,7 +155,6 @@ public class Welcome extends javax.swing.JPanel implements ActionListener {
     private javax.swing.JPanel welcomePanel;
     private javax.swing.JTextArea area;
     private InstallWizard wizard;
-    //private static final String [] versions = {"OpenOffice.org 643", "StarOffice 6.1"};
     private static final String [] versions = { "StarOffice 6.1" };
     private boolean nextButtonEnable = true;
 
diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java
index 7dfe5eca37e1..384f90a088ad 100644
--- a/scripting/workben/installer/XmlUpdater.java
+++ b/scripting/workben/installer/XmlUpdater.java
@@ -152,30 +152,18 @@ public class XmlUpdater extends Thread {
 
     public void run() {
 
-        //InputSource            isource;
-        //DocumentBuilderFactory builderFactory;
-        //DocumentBuilder        builder = null;
-
         internalThread = Thread.currentThread();
 
-        //System.out.println("\n\n\n\nFileName: "+installPath);
         classesPath= installPath.concat(File.separator+"program"+File.separator+"classes"+File.separator);
 
         String progpath=installPath;
         progpath= progpath.concat(File.separator+"program"+File.separator);
-        //System.out.println("Office progpath" + progpath );
-        //System.out.println("\nModifying Installation "+installPath);
 
         String starBasicPath=installPath;
         starBasicPath= starBasicPath.concat(File.separator+"share"+File.separator+"basic"+File.separator+"ScriptBindingLibrary"+File.separator);
-        //System.out.println( "Office StarBasic path: " + starBasicPath );
 
         String regSchemaOfficePath=installPath;
         regSchemaOfficePath= regSchemaOfficePath.concat(File.separator+"share"+File.separator+"registry"+File.separator+"schema"+File.separator+"org"+File.separator+"openoffice"+File.separator+"Office"+File.separator);
-        //System.out.println( "Office schema path: " + regSchemaOfficePath );
-
-        // Get the NetBeans installation
-        //String netbeansPath=
 
         progressBar.setString("Unzipping Required Files");
         ZipData zd = new ZipData("SFrameworkInstall.jar");
@@ -184,7 +172,6 @@ public class XmlUpdater extends Thread {
         if( (!netInstall) || bindingsInstall) {
             String configPath=installPath;
             configPath= configPath.concat(File.separator+"user"+File.separator+"config"+File.separator+"soffice.cfg"+File.separator);
-            //System.out.println( "Office configuration path: " + configPath );
             String manifestPath=configPath + "META-INF" + File.separator;
 
             //Adding <Office>/user/config/soffice.cfg/
diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java
index 0da82a410b28..2985e3e0c3ff 100644
--- a/scripting/workben/mod/_scripting/Dispatch.java
+++ b/scripting/workben/mod/_scripting/Dispatch.java
@@ -41,7 +41,6 @@ import com.sun.star.util.XURLTransformer;
 
 
 public class Dispatch extends TestCase {
-    //private String scriptURL = "script://MemoryUtils.MemUsage";
     private String scriptURL = "script://HighlightText.showForm";
     public void initialize( TestParameters tParam, PrintWriter log ) {
     }