[Libreoffice-commits] .: xmerge/source

[Thomas Arnhold]

 xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java |    8 --------
 xmerge/source/palmtests/qa/comparator/XmlWrapper.java       |    9 ---------
 2 files changed, 17 deletions(-)

New commits:
commit 841792dddf91302c3c4d888f2f3d00f3d683964d
Author: Luke Petrolekas <luke.petrolekas at gmail.com>
Date:   Sat Feb 12 18:55:25 2011 +0100

    Easy hack: Remove more commented out code

diff --git a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java
index 19299ba..005db01 100644
--- a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java
+++ b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java
@@ -25,12 +25,6 @@
  *
  ************************************************************************/
 
-/*
- * SimplePdbCompare.java
- *
- * Created on September 21, 2001, 10:23 AM
- */
-
 /**
  *
  * @author  mh101528
@@ -80,13 +74,11 @@ public final class SimplePdbCompare {
 
         if (pdb1.equals(pdb2)) 
         {
-            //writeToLog("PDB " + pdbname1 + "  and PDB " + pdbname2 + " are equal");
             System.out.println("PDB " + pdbname1 + "  and PDB " + pdbname2 + " are equal");
             return true;
         } 
         else 
         {
-            //writeToLog("PDB " + pdbname1 + "  and PDB " + pdbname2 + " are not equal");
             System.out.println("PDB " + pdbname1 + "  and PDB " + pdbname2 + " are not equal");
             return false;
         }
diff --git a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java
index 3ac4856..3512479 100644
--- a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java
+++ b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java
@@ -36,9 +36,7 @@ public class XmlWrapper
         System.out.println("args.length is " + args.length);
         if (args.length < 2) {
             System.out.println("Usage: java XmlWrapper [<zipfile1> <zipfile2>].");
-            //return;
              System.exit(-1);
-            
         }
 
         XmlWrapper w = new XmlWrapper();
@@ -47,7 +45,6 @@ public class XmlWrapper
          currdirfp = new File(".");
         } catch (Exception fx) {
          System.out.println("Could not get File instance for current directory \n");
-         //return;
          System.exit(-1);
         }
 
@@ -60,7 +57,6 @@ public class XmlWrapper
         } catch (Exception tx) {
          System.out.println("Could not create TempFile ");
          System.out.println("Exception: " + tx.toString());
-         //return;
          System.exit(-1);
         }
 
@@ -76,14 +72,12 @@ public class XmlWrapper
          System.out.println("Exception: file is not a ZIP file: " + args[0]);
          f1.delete();
          f2.delete();
-         //return;
          System.exit(-1);
         } catch (Exception e) {
          System.out.println("Exception: Could not extract XML from " + args[0]);
          System.out.println("Exception: " + e.toString());
          f1.delete();
          f2.delete();
-         //return;
          System.exit(-1);
         }
 
@@ -96,7 +90,6 @@ public class XmlWrapper
          System.out.println("Exception: file is not a ZIP file: " + args[0]);
          f1.delete();
          f2.delete();
-         //return;
          System.exit(-1);
         } catch (Exception ex) {
          System.out.println(ex.getMessage());
@@ -104,7 +97,6 @@ public class XmlWrapper
          System.out.println("Exception: " + ex.toString());
          f1.delete();
          f2.delete();
-         //return;
          System.exit(-1);
         }
 
@@ -126,7 +118,6 @@ public class XmlWrapper
          System.out.println("Exception: " + ex.toString());
          f1.delete();
          f2.delete();
-         //return;
          System.exit(-1);
         }