summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/convwatch
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-11 15:58:09 +0200
committerNoel Grandin <noel@peralex.com>2014-08-14 10:59:48 +0200
commitac5954d7c540f34702033d7d951d1d16cb96730a (patch)
tree310ba9698a10c74662de0714db683f932de32b0c /qadevOOo/runner/convwatch
parent89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff)
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
Diffstat (limited to 'qadevOOo/runner/convwatch')
-rw-r--r--qadevOOo/runner/convwatch/ConvWatchStarter.java1
-rw-r--r--qadevOOo/runner/convwatch/DB.java1
-rw-r--r--qadevOOo/runner/convwatch/DBHelper.java1
-rw-r--r--qadevOOo/runner/convwatch/DocumentConverter.java3
-rw-r--r--qadevOOo/runner/convwatch/FileHelper.java37
-rw-r--r--qadevOOo/runner/convwatch/ImageHelper.java1
-rw-r--r--qadevOOo/runner/convwatch/IniFile.java4
-rw-r--r--qadevOOo/runner/convwatch/MSOfficePrint.java1
-rw-r--r--qadevOOo/runner/convwatch/OfficePrint.java1
9 files changed, 2 insertions, 48 deletions
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 1cd17991d1f9..2adce7504d97 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -301,7 +301,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
GlobalLogWriter.get().println("Set office watcher");
OfficeWatcher aWatcher = (OfficeWatcher)param.get("Watcher");
GlobalLogWriter.get().setWatcher(aWatcher);
- // initializeWatcher(param);
String sStatusRunThrough = "";
String sStatusMessage = "";
diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java
index 23f258e0bcbe..a743f8a4be7c 100644
--- a/qadevOOo/runner/convwatch/DB.java
+++ b/qadevOOo/runner/convwatch/DB.java
@@ -263,7 +263,6 @@ public class DB extends DBHelper
{
String sError = e.getMessage();
GlobalLogWriter.get().println("DB: Original SQL error: " + sError);
- // throw new ValueNotFoundException("Can't execute SQL: " + _sSQL);
}
return aResultList;
}
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index e6381f027ccf..6323582e2981 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -141,7 +141,6 @@ public class DBHelper
if (sPart.startsWith("db:"))
{
m_sDBName = sPart.substring(3);
- // GlobalLogWriter.get().println("DB: source version: " + m_sSourceVersion);
}
else if (sPart.startsWith("user:"))
{
diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java
index b088d9177f72..f449b578849f 100644
--- a/qadevOOo/runner/convwatch/DocumentConverter.java
+++ b/qadevOOo/runner/convwatch/DocumentConverter.java
@@ -141,9 +141,6 @@ public class DocumentConverter extends EnhancedComplexTestCase
// check if all need software is installed and accessible
checkEnvironment(mustInstalledSoftware());
- // test_removeFirstDirectorysAndBasenameFrom();
- // Get the MultiServiceFactory.
- // XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
GraphicalTestArguments aGTA = getGraphicalTestArguments();
if (aGTA == null)
{
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 3cf88eb267b4..18426526a724 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -120,42 +120,6 @@ public class FileHelper
return "";
}
-/*
- static ArrayList files = new ArrayList();
- public static Object[] traverse( String afileDirectory )
- {
-
- File fileDirectory = new File(afileDirectory);
- // Testing, if the file is a directory, and if so, it throws an exception
- if ( !fileDirectory.isDirectory() )
- {
- throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() );
- }
-
- // Getting all files and directories in the current directory
- File[] entries = fileDirectory.listFiles();
-
- // Iterating for each file and directory
- for ( int i = 0; i < entries.length; ++i )
- {
- // adding file to List
- try
- {
- // Composing the URL by replacing all backslashs
- String stringUrl = "file:///"
- + entries[ i ].getAbsolutePath().replace( '\\', '/' );
- files.add(stringUrl);
- }
- catch( Exception exception )
- {
- exception.printStackTrace();
- }
- }
- return files.toArray();
- }
-*/
-
- // makeDirectories("", "/tmp/a/b");
// creates all directories /tmp/a/b
public static void makeDirectories(String first, String path)
@@ -285,7 +249,6 @@ public class FileHelper
{
boolean bDebug = false;
String sTmpPath = util.utils.getUsersTempDir();
- //util.utils.getUsersTempDir();
String fs = System.getProperty("file.separator");
String sName = sTmpPath + fs + "DOC_COMPARATOR_DEBUG";
File aFile = new File(sName);
diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java
index 1a297704249a..914c70ef7a4f 100644
--- a/qadevOOo/runner/convwatch/ImageHelper.java
+++ b/qadevOOo/runner/convwatch/ImageHelper.java
@@ -94,7 +94,6 @@ class ImageHelper
"Cannot construct object with current Java version " +
javaVersion + ": " + ex.getMessage());
}
-// aImage = ImageIO.read(aFile);
return new ImageHelper(aImage);
}
}
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java
index dc3b55a50774..1e7795d4abd5 100644
--- a/qadevOOo/runner/convwatch/IniFile.java
+++ b/qadevOOo/runner/convwatch/IniFile.java
@@ -179,7 +179,7 @@ class IniFile
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("["))
{
// found end.
break;
@@ -212,7 +212,7 @@ class IniFile
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("["))
{
// found end.
return j;
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 90c0b93a3c52..7ccf7d0370f3 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -177,7 +177,6 @@ public class MSOfficePrint
String sOfficeType = getOfficeType(_sInputFile);
// special case, if xml we prefer word, but with DEFAULT_XML_FORMAT_APP=excel it's changeable.
- // if (_aGTA.getDefaultXMLFormatApp().toLowerCase().equals("excel"))
if (sOfficeType.equals("excel"))
{
aStartCommand = createExcelPrintHelper();
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index 83da79d511d6..9279f6457552 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -309,7 +309,6 @@ public class OfficePrint {
String _sOutputURL,
String _sPrintFileURL)
{
- // waitInSeconds(1);
boolean bBack = false;
XComponent aDoc = loadFromURL(_aGTA, _sInputURL);