diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-11 15:58:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-14 10:59:48 +0200 |
| commit | ac5954d7c540f34702033d7d951d1d16cb96730a (patch) | |
| tree | 310ba9698a10c74662de0714db683f932de32b0c /qadevOOo | |
| parent | 89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff) | |
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
Diffstat (limited to 'qadevOOo')
85 files changed, 44 insertions, 409 deletions
diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java index ba0ab703453b..4dbf07085e85 100644 --- a/qadevOOo/runner/base/java_complex.java +++ b/qadevOOo/runner/base/java_complex.java @@ -89,8 +89,6 @@ public class java_complex implements TestBase // and the office was killed. // In complex tests just use "ThreadTimeOut" as timout. - // param.put("TimeOut", new Integer(0)); - for (int i = 0; i < entries.length; i++) { 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); diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index 1e08fb8c20bc..3b73b335b596 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/qadevOOo/runner/graphical/BuildID.java @@ -57,7 +57,6 @@ public class BuildID sOfficePath = _sApp; } } - // GlobalLogWriter.get().println("Office path: " + sOfficePath); return sOfficePath; } @@ -75,7 +74,6 @@ public class BuildID if (aSOfficeFile.exists()) { String sOfficePath = FileHelper.getPath(_sOfficePath); - // ok. System.out.println("directory: " + sOfficePath); sBuildID = getBuildIDFromBootstrap(sOfficePath, _sIniSection); if (sBuildID.length() == 0) { @@ -87,7 +85,6 @@ public class BuildID GlobalLogWriter.println("soffice executable not found."); } -// int dummy = 0; return sBuildID; } diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 440e6273743a..64e5b1dfd651 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -130,7 +130,6 @@ public class FileHelper } - // makeDirectories("", "/tmp/a/b"); // creates all directories /tmp/a/b public static void makeDirectories(String first, String path) @@ -260,7 +259,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/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 326365adb832..2b6ecc33a02e 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -231,7 +231,7 @@ public class IniFile implements Enumeration<String> { continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[") ) { // TODO: due to the fact we would like to insert an empty line before new sections // TODO: we should check if we are in an empty line and if, go back one line. @@ -267,7 +267,7 @@ public class IniFile implements Enumeration<String> continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[")) { // found end. return j; diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 13db6222dbee..8d9e8c9ecd4a 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -422,7 +422,6 @@ public class MSOfficePostscriptCreator implements IOffice String sTmpPath = util.utils.getUsersTempDir(); String ls = System.getProperty("line.separator"); - // ArrayList aList = new ArrayList(); String sSaveViaWord = "saveViaWord.pl"; ArrayList<String> aList = searchLocalFile(sSaveViaWord); @@ -520,8 +519,6 @@ public class MSOfficePostscriptCreator implements IOffice File aFile = new File(sName); FileWriter out = new FileWriter(aFile); - // out.write( "eval 'exec perl -wS $0 ${1+\"$@\"}' " + ls ); - // out.write( " if 0; " + ls ); out.write("#BEGIN" + ls); out.write("#{" + ls); out.write("#" + ls); @@ -589,9 +586,6 @@ public class MSOfficePostscriptCreator implements IOffice out.write( "{" + ls); out.write( " print FILE \"name=$ARGV[0]\\n\";" + ls); out.write( " print FILE \"ExcelVersion=$sVersion\\n\";" + ls); -// out.write( " print FILE \"WordStartTime=$stopWordTime\\n\";" + ls); -// out.write( " print FILE \"WordLoadTime=$stopLoadWordTime\\n\";" + ls); -// out.write( " print FILE \"WordPrintTime=$stopPrintWordTime\\n\";" + ls); out.write( " close(FILE);" + ls); out.write( "}" + ls); out.close(); @@ -889,7 +883,6 @@ public class MSOfficePostscriptCreator implements IOffice GlobalLogWriter.println("Error: unknown root node: '" + sRootNodeName + "' please check the document. Try to use Word as default."); sType = "word"; // default } - // printNodesFromList( ndList ); } catch (java.lang.Exception e) { diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 126c3b78b20a..9b224b82120f 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -224,7 +224,6 @@ public class OpenOfficePostscriptCreator implements IOffice showProperty(ReadOnly); GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Load document"); - // GlobalLogWriter.flush(); XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop); diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 2d1d01497046..c33bfd7c54b3 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -330,7 +330,6 @@ public class OfficeProvider implements AppProvider final XMultiComponentFactory xLocalServiceManager = xcomponentcontext.getServiceManager(); // create a connector, so that it can contact the office -// XUnoUrlResolver urlResolver = UnoUrlResolver.create(xcomponentcontext); final Object xUrlResolver = xLocalServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", xcomponentcontext); final XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver); diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 35b32999cb4a..012a38fd0a47 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -380,7 +380,6 @@ public class ProcessHandler if (sOutputText.length() == memText.length()) { changedText = false; - // dbg("runCommand Could not detect changes in output stream!!!"); } hangcheck = 10; memText = this.getOutputText(); @@ -670,11 +669,6 @@ public class ProcessHandler log.println("Process has been destroyed!"); } } -// Removed as hung up in SDK test 'PathSettings' -// try { -// stdout.join(); -// stderr.join(); -// } catch (InterruptedException e) {} return isFinished(); } diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index b5b025932436..1b53d4a9a492 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -36,7 +36,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { /** - * @member m_sFileName name of the corrsponding file on disk + * @member m_sFileName name of the corresponding file on disk * @member m_xInStream the internal input stream for reading * @member m_xOutStream the internal input stream for writing * @member m_xSeek points at runtime to m_xInStream or m_xOutStream and make it seekable @@ -79,16 +79,12 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public StreamSimulator( String sFileName , boolean bInput , lib.TestParameters param ) throws com.sun.star.io.NotConnectedException { - ////m_aProtocol = new ComplexTestEnvironment(); m_sFileName = sFileName ; try { XSimpleFileAccess xHelper = UnoRuntime.queryInterface(XSimpleFileAccess.class, param.getMSF().createInstance("com.sun.star.ucb.SimpleFileAccess")); -/* com.sun.star.ucb.XSimpleFileAccess xHelper = (com.sun.star.ucb.XSimpleFileAccess)OfficeConnect.createRemoteInstance( - com.sun.star.ucb.XSimpleFileAccess.class, - "com.sun.star.ucb.SimpleFileAccess");*/ if (xHelper == null) throw new com.sun.star.io.NotConnectedException("ucb helper not available. Can't create streams."); @@ -110,7 +106,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch(com.sun.star.uno.Exception exUno) { - ////m_aProtocol.log("\tstream not open. throw NotConnectedException\n\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("Could not open the file."); } } @@ -136,13 +131,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readBytes(lData,nBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } return nRead; @@ -155,11 +150,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("readSomeBytes(lData["+lData.length+"]["+lData[0]+"],"+nMaxBytesToRead+")\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -168,20 +160,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treads "+nRead+" bytes\n\tOK\n}\n"); - - //if (nRead != nMaxBytesToRead) - //m_aProtocol.log("there are some missing bytes for reading!"); - return nRead; } @@ -191,11 +178,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("skipBytes("+nBytesToSkip+")\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -203,16 +187,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.skipBytes(nBytesToSkip); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -220,11 +202,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public int available() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException { - //m_aProtocol.log("available()\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -233,14 +212,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nAvailable = m_xInStream.available(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns "+nAvailable+" bytes\n\tOK\n}\n"); return nAvailable; } @@ -249,11 +227,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public void closeInput() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException { - //m_aProtocol.log("closeInput()\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -261,14 +236,12 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.closeInput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -282,11 +255,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("writeBytes(lData["+lData.length+"])\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -294,16 +264,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.writeBytes(lData); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -312,11 +280,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("flush()\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -324,15 +289,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.flush(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\tOK\n}\n"); } @@ -341,11 +305,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException { - //m_aProtocol.log("closeOutput()\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -353,16 +314,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.closeOutput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -375,11 +334,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public void seek( /*IN*/long nLocation ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.io.IOException { - //m_aProtocol.log("seek("+nLocation+")\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -387,25 +343,20 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xSeek.seek(nLocation); } - catch (com.sun.star.lang.IllegalArgumentException exArg ) { //m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw exArg; + catch (com.sun.star.lang.IllegalArgumentException exArg ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } public long getPosition() throws com.sun.star.io.IOException { - //m_aProtocol.log("getPosition()\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -414,12 +365,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nPos = m_xSeek.getPosition(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns pos="+nPos+"\n\tOK\n}\n"); return nPos; } @@ -427,11 +377,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public long getLength() throws com.sun.star.io.IOException { - //m_aProtocol.log("getLength()\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -440,12 +387,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nLen = m_xSeek.getLength(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns len="+nLen+"\n\tOK\n}\n"); return nLen; } } diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 1866b2646dac..a233e0f83f33 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -160,13 +160,6 @@ public class Parameters implements XPropertySet { throw new IllegalArgumentException( "Wrong key " + key + ", it should be of String type"); } - -/* Object value = params.get(key); - - if (!(value instanceof String)) { - throw new IllegalArgumentException( - "Wrong value " + value + ", it should be of String type"); - } */ } } diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index cb82c3b86763..3f50ccffb19c 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -231,10 +231,6 @@ public class RunnerService implements XJob, XServiceInfo, int startIndex = entry.indexOf("objdsc/") + 7; int endIndex = entry.lastIndexOf('/'); -/* int endIndex = entry.indexOf('.'); - module = entry.substring(startIndex, endIndex); - startIndex = 0; - endIndex = module.lastIndexOf('/'); */ module = entry.substring(startIndex, endIndex); // special cases @@ -249,14 +245,6 @@ public class RunnerService implements XJob, XServiceInfo, endIndex = object.lastIndexOf('.'); } } -/* else if (entry.indexOf("/xmloff/") != -1) { - endIndex = entry.indexOf(".csv"); - object = entry.substring(0, endIndex); - endIndex = entry.lastIndexOf('.'); - while (object.indexOf('.') != endIndex) { - object = object.substring(object.indexOf('.')+1); - } - } */ else { startIndex = 0; endIndex = entry.indexOf(".csv"); diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index a657a116f3d5..3f60e73b53ca 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -118,11 +118,4 @@ public class OutProducerFactory { return name.substring(0,1).toUpperCase() + name.substring(1); } -/* public static void main(String[] args) { - Hashtable p = new Hashtable(); - p.put("DataBaseOut", "yes"); - p.put("TestBase", "java_complex"); - p.put("Version", "srx645gggg"); - createDataBaseOutProducer(p); - } */ } diff --git a/qadevOOo/runner/util/compare/DocComparatorFactory.java b/qadevOOo/runner/util/compare/DocComparatorFactory.java index 368892071356..a6f216289292 100644 --- a/qadevOOo/runner/util/compare/DocComparatorFactory.java +++ b/qadevOOo/runner/util/compare/DocComparatorFactory.java @@ -33,15 +33,8 @@ public class DocComparatorFactory { return GraphicalComparator.getInstance(aParams); } -/* - else if (s.toLowerCase().equals("xml")) - { - return new XMLCompare.create(aParams); - } -*/ else if (s.toLowerCase().equals("pdf")) { - // return new PDFComparator.create(aParams); throw new IllegalArgumentException("PDF not implemented yet."); } else diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java index d061aae384ad..f385db27719e 100644 --- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java +++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java @@ -177,9 +177,6 @@ public class _XScrollBar extends MultiMethodTest { acc.getAccessibleContext()); Point location = aCom.getLocationOnScreen(); - //Point location = (Point) tEnv.getObjRelation("Location"); - //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); - //Point location = aCom.getLocationOnScreen(); try { Robot rob = new Robot(); rob.mouseMove(location.X + 50, location.Y + 75); diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java index e889fe4242bf..b8a2765627f3 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java @@ -168,9 +168,6 @@ public class _XSpinValue extends MultiMethodTest { acc.getAccessibleContext()); Point location = aCom.getLocationOnScreen(); - //Point location = (Point) tEnv.getObjRelation("Location"); - //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); - //Point location = aCom.getLocationOnScreen(); try { Robot rob = new Robot(); rob.mouseMove(location.X + 20, location.Y + 10); diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 7b000c059a2e..4b2a03f1c104 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -88,7 +88,6 @@ public class _XMultiPropertySet extends MultiMethodTest { */ public class MyChangeListener implements XPropertiesChangeListener { public void propertiesChange(PropertyChangeEvent[] e) { - //_log.println("Listener was called"); propertiesChanged = true; } public void disposing (EventObject obj) {} @@ -170,8 +169,6 @@ public class _XMultiPropertySet extends MultiMethodTest { // Change one of the property to be sure, that this event was cauched. - //Random rnd = new Random(); - //int idx = rnd.nextInt(testPropsAmount); for (int i=0; i<testPropsAmount;i++) { log.print("Trying to change property " + testPropsNames[i]); try { diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index b7c987d4e1d3..f3277e9da837 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -131,15 +131,12 @@ public class _XContainer extends MultiMethodTest { */ public class MyListener implements XContainerListener { public void elementInserted(ContainerEvent e) { - //_log.println("Element was inserted"); bElementInserted = true; } public void elementRemoved(ContainerEvent e) { - //_log.println("Element was removed"); bElementRemoved = true; } public void elementReplaced(ContainerEvent e) { - //_log.println("Element was replaced"); bElementReplaced = true; } public void disposing (EventObject obj) {} diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java index 4b6409845b0d..e2de9f6c5d00 100644 --- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java @@ -40,7 +40,6 @@ public class _XViewDataSupplier extends MultiMethodTest { public void _getViewData() { xAccess = oObj.getViewData(); -// util.dbg.printInterfaces(xAccess); if (xAccess != null) { setViewID(xAccess, myview); } diff --git a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java index feb8a8d8847a..a619b952f271 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java @@ -83,9 +83,7 @@ public class _LineShapeDescriptor extends MultiMethodTest { Object ValueToSet = null; try { - //waitForAllThreads(); gValue = oObj.getPropertyValue(name); - //waitForAllThreads(); if ( (name.equals("LineEnd")) || (name.equals("LineStart")) ) { if (gValue == null) gValue = newPoints(null); ValueToSet = newPoints( (Point[]) gValue); @@ -93,7 +91,6 @@ public class _LineShapeDescriptor extends MultiMethodTest { else { ValueToSet = ValueChanger.changePValue(gValue); } - //waitForAllThreads(); oObj.setPropertyValue(name,ValueToSet); sValue = oObj.getPropertyValue(name); diff --git a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java index 5e3049c73495..1ffc66ee2624 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java @@ -75,15 +75,12 @@ public class _ShapeDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = oObj.getPropertyValue(name); - //waitForAllThreads(); if (!ro) { ValueToSet = ValueChanger.changePValue(gValue); if ( name.equals("Style") ) { ValueToSet = newStyle(gValue); } - //waitForAllThreads(); oObj.setPropertyValue(name,ValueToSet); sValue = oObj.getPropertyValue(name); } diff --git a/qadevOOo/tests/java/ifc/drawing/_XShape.java b/qadevOOo/tests/java/ifc/drawing/_XShape.java index 64c4310eed5f..97e9b3611140 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShape.java @@ -132,7 +132,6 @@ public class _XShape extends MultiMethodTest { log.println("Expected: "+sNew.Height+";"+sNew.Width); log.println("Getting: "+gSize.Height+";"+gSize.Width); - //result &= util.ValueComparer.equalValue(sNew, gSize) ; //errors in calculation from points/twips less then 1 are acceptable result &= (sNew.Height-gSize.Height <= 2) && (sNew.Width-gSize.Width <= 2); diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 43f46d128be0..6be1bbbead7b 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -534,13 +534,5 @@ public class _XCalendar extends MultiMethodTest { tRes.tested("isValid()", res); } - /** - * Method returns locale for a given language and country. - * @param localeIndex index of needed locale. - */ -/* public Locale getLocale(int localeIndex) { - return new Locale(languages[localeIndex], countries[localeIndex], ""); - }*/ - } diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java index 8f454c7a2e75..2664c0422241 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java @@ -163,19 +163,6 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { res &= localres; } - -/* log.println("\tTrying to load 'dummy' algorithm"); - - boolean localres = !oObj.loadAlgorithm(locales[i], "dummy", - CollatorOptions.CollatorOptions_IGNORE_WIDTH); - - if (!localres) { - log.println("\t ... didn't work as expected - FAILED"); - } else { - log.println("\t ... worked - OK"); - } - - res &= localres;*/ } tRes.tested("loadAlgorithm()", res); diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java index 4ddeae4db611..6a8f402e741f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java @@ -68,11 +68,8 @@ public class _DatabaseImportDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = props[nr].Value; - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue(gValue); - //waitForAllThreads(); props[nr].Value=ValueToSet; sValue = props[nr].Value; diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java index 5afd917ca7fe..9b0ecd43c084 100644 --- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java +++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java @@ -113,12 +113,9 @@ public class _FunctionDescription extends MultiMethodTest { try { - //waitForAllThreads(); gValue = oObj.getPropertyValue( name ); - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue( gValue ); - //waitForAllThreads(); oObj.setPropertyValue( name, ValueToSet ); sValue = oObj.getPropertyValue( name ); diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java index 1bc0eaab69bb..83bfe72a665d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java @@ -69,7 +69,6 @@ public class _SheetSortDescriptor extends MultiMethodTest { } public void _SortAscending() { - //changeProp("SortAscending",3); log.println("Property 'SortAscending' is not part of the "+ "property array"); log.println("Available properties:"); @@ -98,14 +97,11 @@ public class _SheetSortDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = props[nr].Value; if ( name.equals("OutputPosition")) { gInt = ((CellAddress) gValue).Row; } - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue(gValue); - //waitForAllThreads(); props[nr].Value=ValueToSet; sValue = props[nr].Value; if ( name.equals("OutputPosition")) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java index 9fa571f48af6..dbcd70bdd543 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java @@ -342,7 +342,6 @@ public class _XDataPilotDescriptor extends MultiMethodTest { requiredMethod("getDataPilotFields()"); XIndexAccess IA = oObj.getPageFields(); boolean bResult = (IA != null); - // boolean bResult = CheckNames(IA, 4); tRes.tested("getPageFields()", bResult); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java index 5be2edee32ce..ea2eec6a845e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java @@ -103,7 +103,6 @@ public class _XSheetAuditing extends MultiMethodTest { public void _hidePrecedents() { requiredMethod("showPrecedents()"); -// requiredMethod("showPrecedents()"); oObj.hidePrecedents(address); tRes.tested("hidePrecedents()", hasRightAmountOfShapes(0)); } diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index 5a6114888f15..49370918ace9 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -352,7 +352,6 @@ public class _CharacterProperties extends MultiPropertyTest { Object ValueToSet = null; try { - //waitForAllThreads(); gValue = oProps.getPropertyValue(name); if ( (gValue == null) || (utils.isVoid(gValue)) ) { @@ -360,7 +359,6 @@ public class _CharacterProperties extends MultiPropertyTest { gValue = newVal; } - //waitForAllThreads(); if (name.equals("CharRotation")) { Short s1 = new Short((short) 0); Short s2 = new Short((short) 900); @@ -381,7 +379,6 @@ public class _CharacterProperties extends MultiPropertyTest { } } - //waitForAllThreads(); oProps.setPropertyValue(name,ValueToSet); sValue = get.getPropertyValue(name); if (sValue == null) { diff --git a/qadevOOo/tests/java/ifc/text/_XText.java b/qadevOOo/tests/java/ifc/text/_XText.java index c33505668670..b34374ac1167 100644 --- a/qadevOOo/tests/java/ifc/text/_XText.java +++ b/qadevOOo/tests/java/ifc/text/_XText.java @@ -78,8 +78,6 @@ public class _XText extends MultiMethodTest { } catch( com.sun.star.lang.IllegalArgumentException iaE ){ throw new StatusException("Couldn't insert textcontent",iaE); - //Status.failed(iaE.toString()); - //return; } // get indexaccess to the tablecollection @@ -144,7 +142,6 @@ public class _XText extends MultiMethodTest { log.println( "test for removeTextContent" ); try { oObj.removeTextContent( (XTextContent)oInt ); - //oObj.removeTextContent( (XTextContent)oInt ); } catch( com.sun.star.container.NoSuchElementException nseE ){ // Some exception.FAILED diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java index fd9cf81b7b36..9849f1f7f51c 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java @@ -221,8 +221,7 @@ public class _XContentProviderManager extends MultiMethodTest { ContentProviderInfo[] providersInfo = oObj.queryContentProviders(); for (int i = 0; i < providersInfo.length; i++) { - if (result.equals(providersInfo[i].ContentProvider) - /*&& myScheme.equals(providersInfo[i].Scheme)*/) { + if (result.equals(providersInfo[i].ContentProvider)) { found = true; break; } diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java index f913375d7e57..6a36526db9e6 100644 --- a/qadevOOo/tests/java/ifc/util/_XImportable.java +++ b/qadevOOo/tests/java/ifc/util/_XImportable.java @@ -54,7 +54,6 @@ public class _XImportable extends MultiMethodTest { log.print("Getting when calling createImportDescriptor(true) --"); - //printPropertyValue(descriptor); log.println("done"); log.print("Checking PropertyNames -- "); @@ -71,7 +70,6 @@ public class _XImportable extends MultiMethodTest { log.print("Getting when calling createImportDescriptor(false) -- "); - //printPropertyValue(descriptor); log.println("done"); log.print("Checking PropertyNames -- "); diff --git a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java index f1761ce755c1..b9a8f558ed4d 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java @@ -70,7 +70,6 @@ public class _XSearchDescriptor extends MultiMethodTest { cmpSearchStr = oObj.getSearchString(); if(!(cmpSearchStr.equals(oldSearchStr))){ bResult = true; } - //oObj.setSearchString(oldSearchStr); tRes.tested("setSearchString()", bResult); } diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java index 3efd4c3e9a40..cc00ae30940d 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintable.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java @@ -91,7 +91,6 @@ public class _XPrintable extends MultiMethodTest { tRes.tested("setPrinter()",false); } - //oObj.setPrinter(the_printer); the_printer = oObj.getPrinter() ; propIdx = 0 ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 17e90db4c1e7..ada48739a0ae 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -158,8 +158,6 @@ public class OQueryDesign extends TestCase { } UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); -// Frame = xMod.getCurrentController().getFrame(); - xFrame = DesktopTools.getCurrentFrame(xMSF); SOfficeFactory SOF = null; @@ -272,8 +270,6 @@ public class OQueryDesign extends TestCase { throw new StatusException("Could not set controller", e) ; } - //xCont.attachFrame(xFrame); - return UnoRuntime.queryInterface(XInitialization.class, oQueryDesign); } diff --git a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java index 1e02a2c8b2ae..9d38135367cc 100644 --- a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java +++ b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java @@ -81,7 +81,6 @@ public class Dynamic extends TestCase { tEnv.addObjRelation("ImplementationLoader", loader) ; String url = "servicename=com.sun.star.loader.SharedLibrary,link=mylink"; - //util.utils.getFullTestURL("solibrary.jar"); tEnv.addObjRelation("ImplementationUrl", url) ; tEnv.addObjRelation("ImplementationName", "com.sun.star.io.Pipe") ; diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index adca7192509b..954b4b8127e2 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -532,8 +532,6 @@ public class ODatabaseForm extends TestCase { // INSTANCEn : _XNameContainer; _XNameReplace log.println("adding INSTANCEn as obj relation to environment"); - //XComponent xComp = (XComponent) - // UnoRuntime.queryInterface(XComponent.class, xDrawDoc); String tc = (String) Param.get("THRCNT"); int THRCNT = 1; diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index d5d474f0f261..0212485f1eae 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -245,12 +245,6 @@ public class OGridControlModel extends GenericModelTest { }); -// HashSet exclude = new HashSet(); - -// exclude.add("FormatKey"); - -// tEnv.addObjRelation("XUpdateBroadcaster.Checker", -// new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } @@ -404,17 +398,11 @@ class OGridControlModelold extends TestCase { // adding relation for XNameContainer tEnv.addObjRelation("XNameContainer.AllowDuplicateNames", new Object()); - // OK tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component." + objName); - - // adding relation for XContainer tEnv.addObjRelation("INSTANCE", aControl3); tEnv.addObjRelation("INSTANCE2", aControl4); - //adding ObjRelation for XPersistObject - // OK tEnv.addObjRelation("PSEUDOPERSISTENT", new Boolean(true)); // OK - return tEnv; } // finish method getTestEnvironment } // finish class OGridControlModel diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java index 8bcf58dd2a07..50da47dbd208 100644 --- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java @@ -71,29 +71,6 @@ public class ControlMenuController extends TestCase { } -/* log.println("Creating instance..."); - - xTextDoc = WriterTools.createTextDoc(xMSF); - -/* XText xText = xTextDoc.getText(); - XTextCursor xTextCursor = xText.createTextCursor(); - - for (int i = 0; i < 11; i++) { - xText.insertString(xTextCursor, "A sample text and why not? ", false); - } - - XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, xTextDoc); - - // the supplier is available from the model - XUIConfigurationManagerSupplier xSupplier = - (XUIConfigurationManagerSupplier)UnoRuntime.queryInterface( - XUIConfigurationManagerSupplier.class, xModel); - - xManager = xSupplier.getUIConfigurationManager(); - - // just to make sure, it's the right one. - log.println("TestObject: " + util.utils.getImplName(xManager)); - tEnv = new TestEnvironment(xManager); */ log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 3ad6575386df..f23830ce6144 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -106,8 +106,6 @@ public class RegistryTypeDescriptionProvider extends TestCase { log.println("Service not available" ); } - //oObj = (XInterface) oInterface; - log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java index 7a035cd25e2a..dc66c1741b8b 100644 --- a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java @@ -101,8 +101,6 @@ public class RegistryTypeDescriptionProvider extends TestCase { log.println("Service not available" ); } - //oObj = (XInterface) oInterface; - log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 10ac369daa7c..4d2f1464745a 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -194,7 +194,6 @@ public class various extends TestCase { int idx = cncstr.indexOf("host=") + 5 ; // select the port -// curPort; //utils.getNextFreePort(basePort); log.println("Choose Port nr: " + curPort); connectString = "socket,host=" + diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index ee259f68a505..06e9eaca4a7c 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -186,7 +186,6 @@ public class various extends TestCase { int idx = cncstr.indexOf("host=") + 5 ; // select the port -// curPort; //utils.getNextFreePort(basePort); log.println("Choose Port nr: " + curPort); connectString = "socket,host=" + diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 8c477ebbe3cd..129504654821 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -87,8 +87,6 @@ public class ScAccessibleCsvCell extends TestCase { oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, true); - //util.dbg.printInterfaces(oObj); - XAccessibleContext cont = UnoRuntime.queryInterface(XAccessibleContext.class, oObj); String name = ""; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index 6ceae7c89b03..0dc1d8754ff5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -84,18 +84,6 @@ public class ScAccessibleCsvGrid extends TestCase { accAction = UnoRuntime.queryInterface(XAccessibleAction.class, oObj); - /*int count = accAction.getAccessibleActionCount(); - - for (int i = 0; i<count; i++) { - try { - System.out.println(i+": "+accAction.getAccessibleActionDescription(i)); - } catch (com.sun.star.lang.IndexOutOfBoundsException iae) {} - }*/ - - //util.dbg.printInterfaces(oObj); - - //AccessibilityTools.printAccessibleTree(log, xRoot); - oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 701067dcc145..917607dc29fc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -103,7 +103,6 @@ public class ScAccessibleCsvRuler extends TestCase { } - //util.dbg.printInterfaces(oObj); AccessibilityTools.printAccessibleTree(log, xRoot); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT, "Ruler", true); @@ -144,12 +143,6 @@ public class ScAccessibleCsvRuler extends TestCase { */ @Override protected void cleanup( TestParameters Param, PrintWriter log) { -/* log.println( " closing Dialog " ); - try { - accAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException iae) { - log.println("Couldn't close dialog"); - } */ } /** diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 44eae77ce32d..84cbd224402e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -278,7 +278,6 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index fc480b869092..17e0d1554f17 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -277,7 +277,6 @@ public class ScDataPilotFieldGroupObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 296cfe25b25c..46dec68f6496 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -277,7 +277,6 @@ public class ScDataPilotFieldGroupsObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index dade91ebdfde..5f953ad77129 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -170,10 +170,8 @@ public class ScDatabaseRangeObj extends TestCase { } - //CellRangeAddress aRange = new CellRangeAddress((short)0, 0, 0, 0, 13); CellRangeAddress aRange = null; - //dbRanges.addNewByName("dbRange", aRange); XNameAccess dbrNA = UnoRuntime.queryInterface( XNameAccess.class, dbRanges); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index a46139417843..579c5956dc42 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -187,9 +187,6 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); -// tEnv.addObjRelation("RECT", oRect); -// tEnv.addObjRelation("ADDR", oAddr); - return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 466b4374e06d..d6dd310dabf8 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -231,9 +231,6 @@ public class SdUnoPresView extends TestCase { tEnv.addObjRelation("FirstPage", oDrawPage); tEnv.addObjRelation("SecondPage", secondDrawPage); - //tEnv.addObjRelation("First", shape1); - //tEnv.addObjRelation("Second", shape2); - tEnv.addObjRelation("Pages", the_pages); //Adding ObjRelations for XController diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index 455be5adc371..55b6903c39ca 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -90,8 +90,6 @@ public class AccessibleControlShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, -// "Button"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index 2ddab77ed271..a75bd7ed03a8 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -93,8 +93,6 @@ public class AccessibleGraphicShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index ade6fa7c5f4f..0f371ebd4208 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -115,8 +115,6 @@ public class AccessibleOLEShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "OLEShape"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "OLEShape"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 7683a3ba500e..ee2fcd7f5974 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -89,17 +89,11 @@ public class AccessiblePageShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, -// "PageShape"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "PageShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); - //at.getAccessibleObjectForRole(xRoot, AccessibleRole.SCROLLBAR); - //final XAccessibleValue xAccVal = (XAccessibleValue) - // UnoRuntime.queryInterface - // (XAccessibleValue.class, at.SearchedContext) ; oPage = DrawTools.getDrawPage(xDrawDoc,0); final XPropertySet PageProps = UnoRuntime.queryInterface(XPropertySet.class, oPage); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 912705a6aa1d..20e5423baa30 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -105,15 +105,11 @@ public class AccessiblePresentationGraphicShape extends TestCase { } catch (com.sun.star.beans.UnknownPropertyException e) { } - //DrawTools.getShapes(DrawTools.getDrawPage(xDoc,0)).add(oShape); - new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index c9fe78910256..4f8b3878c161 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -92,8 +92,6 @@ public class AccessiblePresentationOLEShape extends TestCase { } - //DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { oShapeProps.setPropertyValue("IsEmptyPresentationObject", new Boolean(false)); @@ -121,8 +119,6 @@ public class AccessiblePresentationOLEShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "ImpressOLE"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressOLE"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 2bef30f86950..42c56abc0ece 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -108,8 +108,6 @@ public class AccessiblePresentationShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "ImpressHandout"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressHandout"); log.println("Implementation Name: "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 0bab2ea5db25..43a9edd97cd3 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -93,8 +93,6 @@ public class AccessibleShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "Rectangle"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Rectangle"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index 03f858bd8a8a..26cb0bcf291e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -207,10 +207,6 @@ public class SvxDrawPage extends TestCase { // adding relation for XMasterPageTarget - /*XMasterPagesSupplier oMPS = (XMasterPagesSupplier) - UnoRuntime.queryInterface(XMasterPagesSupplier.class, xDoc); - XDrawPages oGroup = oMPS.getMasterPages(); - tEnv.addObjRelation("MasterPageSupplier",oGroup); */ return tEnv; } // finish method getTestEnvironment } // finish class SvxDrawPage diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 8dfec5f4be84..2d4de811228b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -120,7 +120,6 @@ public class SvxShapeDimensioning extends TestCase { oObj = oShape ; - //SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index e10949afbb8c..e23897985fe2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -167,8 +167,6 @@ public class SvxShapeGroup extends TestCase { ShapeDsc sDsc = new ShapeDsc(5000,3500,7500,10000,"Rectangle"); log.println( "adding Shape as mod relation to environment" ); tEnv.addObjRelation("Shape", new InstCreator( xDrawDoc, sDsc)); - //tEnv.addObjRelation("DrawPage", oObj); - //tEnv.addObjRelation("MasterPageSupplier",oGroup); tEnv.addObjRelation("Style1",aStyle1); tEnv.addObjRelation("Style2",aStyle2); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index e2a3018d573e..97a5cd03c56c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -183,8 +183,6 @@ public class SvxShapePolyPolygon extends TestCase { try { // adding some shapes for testing. - //SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); - //oShape = SOF.createShape(xDrawDoc,6000,6000,5000,5000,"PolyPolygon"); XMultiServiceFactory xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xDrawDoc) ; XInterface oInst = (XInterface) xMSF.createInstance ("com.sun.star.drawing.PolyPolygonShape") ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index b5bebdbcd0a9..ca2b3c790abd 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -228,7 +228,6 @@ public class SvxShapePolyPolygonBezier extends TestCase { shapeProps.setPropertyValue("PolyPolygonBezier",coords); - //SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index b41875765fcc..1e989ecf5cbd 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -114,7 +114,6 @@ public class PageStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.PageStyle"); -// oMSF.createInstanceWithArguments("com.sun.star.style.PageStyle",new Object[]{oStyle}); oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java index a95ce939baf3..ec7d533d84ed 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java +++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java @@ -101,8 +101,6 @@ public class SwXChapterNumbering extends TestCase { e.printStackTrace(); } - //instance1[0].Value = new Short((short)5); - TestEnvironment tEnv = new TestEnvironment( oObj ); tEnv.addObjRelation("INSTANCE1", instance1); diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java index 1cca405298da..049519ce976e 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java @@ -122,9 +122,6 @@ public class XMLContentImporter extends TestCase { try { oInt = xMSF.createInstance ("com.sun.star.comp.Writer.XMLContentImporter") ; - //XImporter imp = (XImporter) UnoRuntime.queryInterface - // (XImporter.class, oInt) ; - //imp.setTargetDocument(xTextDoc) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index 39c142119b75..1c20d090d246 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -125,9 +125,6 @@ public class XMLMetaImporter extends TestCase { try { oInt = xMSF.createInstance ("com.sun.star.comp.Writer.XMLMetaImporter") ; - //XImporter imp = (XImporter) UnoRuntime.queryInterface - // (XImporter.class, oInt) ; - //imp.setTargetDocument(xTextDoc) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index b22dd6b98dd4..d6b547e7ce37 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -163,8 +163,6 @@ public class AccessibleEdit extends TestCase { tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { - // buttonAccComp.grabFocus(); - // acomp.grabFocus(); edText.setText("firing event ..."); edText.setText("firing event ... 2"); edText.setText("AccessibleEdit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index 46ff5cda834e..e7d780d83a3a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -125,7 +125,6 @@ public class AccessibleMenuItem extends TestCase { } - //oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENUITEM); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index 33b4b4c45051..84297114f950 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -101,8 +101,6 @@ public class Toolkit extends TestCase { try { win = cntrlr.getFrame().getContainerWindow(); - - //win = (XWindow) UnoRuntime.queryInterface(XWindow.class, ctrl) ; the_win = the_access.getControl(the_Model).getPeer(); oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index 9ad723e77751..8215d7f6d119 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -149,8 +149,6 @@ public class UnoTreeControl extends TestCase { aDialog.start(); -// xDialog.execute(); - } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index de74a68716a7..6f474395b1e0 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -165,12 +165,7 @@ public class XMLStylesImporter extends TestCase { logF.println("No ways to check styles import were not found."); logF.println(" TRUE returned."); return true ; -/* } catch (com.sun.star.uno.Exception e) { - logF.println("Exception occurred while checking filter :") ; - e.printStackTrace(logF) ; - return false ; - } -*/ } + } }) ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index a6ec9130dabf..a2009b40ffcc 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -136,7 +136,6 @@ public class XMLContentExporter extends TestCase { "com.sun.star.comp.Draw.XMLContentExporter", new Object[] {arg}); XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj); - //xEx.setSourceDocument(xDrawDoc); XDrawPagesSupplier supp = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc); XDrawPages set = supp.getDrawPages(); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index dbc6657fbce3..5a50e3cf769a 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -137,16 +137,6 @@ public class XMLSettingsExporter extends TestCase { xPropSet.setPropertyValue("IsLayerMode", new Boolean (NewDataValue)); -/* XViewDataSupplier xViewDataSupp = (XViewDataSupplier) - UnoRuntime.queryInterface(XViewDataSupplier.class, xImpressDoc); - XIndexAccess xViewData = xViewDataSupp.getViewData(); - PropertyValue[] xData = (PropertyValue[]) xViewData.getByIndex(0); - NewDataValue = ! ((Boolean) xData[1].Value).booleanValue(); - xData[1].Value = new Boolean(NewDataValue); - XIndexReplace xViewDataReplacable = (XIndexReplace) - UnoRuntime.queryInterface(XIndexReplace.class, xViewData); - xViewDataReplacable.replaceByIndex(0,xData); -*/ } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; |