summaryrefslogtreecommitdiffstats
path: root/qadevOOo/runner/helper
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 09:54:58 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:50 +0200
commit0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 (patch)
tree3d441110176e37c1a6ba2d15a3653d5023863075 /qadevOOo/runner/helper
parentjava: remove unused fields (diff)
downloadcore-0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897.tar.gz
core-0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897.zip
java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
Diffstat (limited to 'qadevOOo/runner/helper')
-rw-r--r--qadevOOo/runner/helper/APIDescGetter.java9
-rw-r--r--qadevOOo/runner/helper/FileTools.java24
-rw-r--r--qadevOOo/runner/helper/ObjectInspectorModelImpl.java1
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java1
-rw-r--r--qadevOOo/runner/helper/OfficeWatcher.java7
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java11
-rw-r--r--qadevOOo/runner/helper/StreamSimulator.java14
-rw-r--r--qadevOOo/runner/helper/URLHelper.java1
8 files changed, 0 insertions, 68 deletions
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index f8e124cfe20a..a7c97dc37b17 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -285,8 +285,6 @@ public class APIDescGetter extends DescGetter
continue;
}
// TODO Probleme here
- // int nFirstSemicolon = line.indexOf(";");
- // int nLastSemicolon = line.lastIndexOf(";");
String ifc_name = ""; // = line.substring(line.indexOf(";") + 2, line.lastIndexOf(";") - 1);
String meth_name = ""; // = line.substring(line.lastIndexOf(";") + 2, line.length() - 1);
@@ -309,9 +307,6 @@ public class APIDescGetter extends DescGetter
meth_name = StringHelper.removeQuoteIfExists(aToken.nextToken());
}
- // String ifc_name = line.substring(line.indexOf(";") + 2, line.lastIndexOf(";") - 1);
- // String meth_name = line.substring(line.lastIndexOf(";") + 2, line.length() - 1);
-
DescEntry methDesc = createDescEntry(meth_name, ifc_name, parent);
if (!ifc_name.equals(old_ifc_name))
@@ -579,10 +574,6 @@ public class APIDescGetter extends DescGetter
String entry = e.nextElement().toString();
-// if (debug) {
-// System.out.println("### Read from connetion: " + entry);
-// }
-
if ((entry.lastIndexOf(sStartModule) != -1) &&
entry.endsWith(sEndsWithCSVName))
{
diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/runner/helper/FileTools.java
index 8ce58e29f53a..8a859183ebf6 100644
--- a/qadevOOo/runner/helper/FileTools.java
+++ b/qadevOOo/runner/helper/FileTools.java
@@ -102,34 +102,10 @@ public class FileTools {
*/
public static boolean deleteDir(File dir) {
- // if (! cleanDir(dir)) return false;
-
// The directory is now empty so delete it
- // return dir.delete();
return cleanDir(dir);
}
- /**
- * Deletes all files and subdirectories under dir.
- * Returns true if all deletions were successful.
- * If a deletion fails, the method continues to delete rest of the files.
- * @return Returns true if all deletions were successful, else false.
- * @param dir the directory to clean from content
- */
- // public static boolean cleanDir(File dir){
-
- // boolean success = true;
- // if (dir.isDirectory()){
- // File [] theFiles = dir.listFiles();
-
- // if (theFiles.length != 0 )
- // for (int i = 0; i < theFiles.length; i++){
- // success &= theFiles[i].delete();
- // }
- // }
- // return success;
- // }
-
public static boolean cleanDir(File dir)
{
if (dir.isDirectory())
diff --git a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java
index 3626a0dabeee..b40888102438 100644
--- a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java
+++ b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java
@@ -59,7 +59,6 @@ public class ObjectInspectorModelImpl implements XObjectInspectorModel{
inCat =(CategoryMem == category)? ++inCat: 1;
CategoryMem = category;
- //System.out.println("Category" + category + "Number" + inCat);
m_Categories[n].ProgrammaticName = "Category" + category;
m_Categories[n].UIName = "Category" + category + "Number" + inCat;
m_Categories[n].HelpURL = "h:" + n;
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 3f45e02894ce..a208c1e09e7d 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -17,7 +17,6 @@
*/
package helper;
-//import com.sun.star.bridge.UnoUrlResolver;
import com.sun.star.beans.XFastPropertySet;
import com.sun.star.bridge.XUnoUrlResolver;
import com.sun.star.container.XEnumeration;
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index b7381b6657db..a45b4343b18e 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -91,13 +91,6 @@ public class OfficeWatcher extends Thread implements share.Watcher {
final ProcessHandler pHdl = new ProcessHandler(sKillCommand);
pHdl.executeSynchronously();
-// dbg("---> Output of killoffice:");
-// dbg(pHdl.getOutputText());
-// dbg("<--- Output of killoffice");
-// dbg("---> Error output of killoffice:");
-// dbg(pHdl.getErrorText());
-// dbg("<--- Error output of killoffice");
-
}
}
ph.kill();
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index bc7f4293654b..5c477447381f 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -390,10 +390,6 @@ public class ProcessHandler
int hangcheck = 10;
while (!this.isFinished() && changedText)
{
- // dbg("runCommand: waiting " + mTimeOut / 1000 + " seconds while command execution is ongoing... " + count);
- // shortWait(mTimeOut);
- // shortWait(2000); // wait 2 seconds.
- //waitFor(mTimeOut);
waitFor(2000, false); // wait but don't kill
if (ow != null)
@@ -513,8 +509,6 @@ public class ProcessHandler
*/
public static long getSystemTime()
{
- // Calendar cal = new GregorianCalendar();
- // final long nTime = cal.getTimeInMillis();
final long nTime = System.currentTimeMillis();
return nTime;
}
@@ -561,7 +555,6 @@ public class ProcessHandler
for (int i = 0; i < cmdLineArray.length; i++)
{
log.println(cmdLineArray[i]);
- // log.print(" ");
}
showEnvVars();
log.println("");
@@ -605,9 +598,6 @@ public class ProcessHandler
stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
stdIn = new PrintStream(m_aProcess.getOutputStream());
- // int nExitValue = m_aProcess.exitValue();
- // int dummy = 0;
-
dbg("execute: flush io-streams");
flushInput();
@@ -828,7 +818,6 @@ public class ProcessHandler
}
catch (Exception e)
{
- //System.out.println("No ExitValue available");
}
return exitValue;
diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java
index ee5f4f06b481..4352ca8eaf49 100644
--- a/qadevOOo/runner/helper/StreamSimulator.java
+++ b/qadevOOo/runner/helper/StreamSimulator.java
@@ -51,7 +51,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
private com.sun.star.io.XOutputStream m_xOutStream ;
private com.sun.star.io.XSeekable m_xSeek ;
- //public ComplexTestEnvironment //m_aProtocol ;
public boolean m_bInWasUsed ;
public boolean m_bOutWasUsed ;
@@ -118,12 +117,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
}
}
-/* public void finalize()
- {
- ////m_aProtocol.log("finalize was called. Please check if it was right or not.\n");
- } */
-
-
/**
* following methods simulates the XInputStream.
* The notice all actions inside the internal protocol
@@ -135,12 +128,10 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.BufferSizeExceededException,
com.sun.star.io.IOException
{
- //m_aProtocol.log("readBytes(lData["+lData.length+"]["+lData[0]+"],"+nBytesToRead+")\n{\n");
m_bInWasUsed = true;
if (m_xInStream == null)
{
- //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\n\tfailed\n}\n");
throw new com.sun.star.io.NotConnectedException("stream not open");
}
@@ -158,11 +149,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime;
}
- //m_aProtocol.log("\treads "+nRead+" bytes\n\tOK\n}\n");
-
- //if (nRead != nBytesToRead)
- //m_aProtocol.log("there are some missing bytes for reading!\n");
-
return nRead;
}
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index 58a481b3f421..9bb6f7d9deaa 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -140,7 +140,6 @@ public class URLHelper
int index = sFileURL.indexOf(sBaseURL);
String sURL = sFileURL.substring(0,index) + sServerURL +
sFileURL.substring(index+sBaseURL.length());
- //String sURL = sFileURL.replaceFirst(sBaseURL,sServerURL);
return sURL;
}