From ac5954d7c540f34702033d7d951d1d16cb96730a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 11 Aug 2014 15:58:09 +0200 Subject: java: remove commented out code Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1 --- qadevOOo/runner/base/java_complex.java | 2 - qadevOOo/runner/convwatch/ConvWatchStarter.java | 1 - qadevOOo/runner/convwatch/DB.java | 1 - qadevOOo/runner/convwatch/DBHelper.java | 1 - qadevOOo/runner/convwatch/DocumentConverter.java | 3 - qadevOOo/runner/convwatch/FileHelper.java | 37 ------ qadevOOo/runner/convwatch/ImageHelper.java | 1 - qadevOOo/runner/convwatch/IniFile.java | 4 +- qadevOOo/runner/convwatch/MSOfficePrint.java | 1 - qadevOOo/runner/convwatch/OfficePrint.java | 1 - qadevOOo/runner/graphical/BuildID.java | 3 - qadevOOo/runner/graphical/FileHelper.java | 2 - qadevOOo/runner/graphical/IniFile.java | 4 +- .../graphical/MSOfficePostscriptCreator.java | 7 -- .../graphical/OpenOfficePostscriptCreator.java | 1 - qadevOOo/runner/helper/OfficeProvider.java | 1 - qadevOOo/runner/helper/ProcessHandler.java | 6 - qadevOOo/runner/helper/StreamSimulator.java | 130 ++++++--------------- qadevOOo/runner/lib/Parameters.java | 7 -- qadevOOo/runner/org/openoffice/RunnerService.java | 12 -- qadevOOo/runner/stats/OutProducerFactory.java | 7 -- .../runner/util/compare/DocComparatorFactory.java | 7 -- qadevOOo/tests/java/ifc/awt/_XScrollBar.java | 3 - qadevOOo/tests/java/ifc/awt/_XSpinValue.java | 3 - .../tests/java/ifc/beans/_XMultiPropertySet.java | 3 - qadevOOo/tests/java/ifc/container/_XContainer.java | 3 - .../java/ifc/document/_XViewDataSupplier.java | 1 - .../java/ifc/drawing/_LineShapeDescriptor.java | 3 - .../tests/java/ifc/drawing/_ShapeDescriptor.java | 3 - qadevOOo/tests/java/ifc/drawing/_XShape.java | 1 - qadevOOo/tests/java/ifc/i18n/_XCalendar.java | 8 -- .../ifc/i18n/_XExtendedIndexEntrySupplier.java | 13 --- .../java/ifc/sheet/_DatabaseImportDescriptor.java | 3 - .../tests/java/ifc/sheet/_FunctionDescription.java | 3 - .../tests/java/ifc/sheet/_SheetSortDescriptor.java | 4 - .../java/ifc/sheet/_XDataPilotDescriptor.java | 1 - qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java | 1 - .../tests/java/ifc/style/_CharacterProperties.java | 3 - qadevOOo/tests/java/ifc/text/_XText.java | 3 - .../java/ifc/ucb/_XContentProviderManager.java | 3 +- qadevOOo/tests/java/ifc/util/_XImportable.java | 2 - .../tests/java/ifc/util/_XSearchDescriptor.java | 1 - qadevOOo/tests/java/ifc/view/_XPrintable.java | 1 - .../tests/java/mod/_dbaccess/OQueryDesign.java | 4 - .../tests/java/mod/_dynamicloader/Dynamic.java | 1 - qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 2 - .../tests/java/mod/_forms/OGridControlModel.java | 12 -- .../tests/java/mod/_fwk/ControlMenuController.java | 23 ---- .../_rdbtdp/RegistryTypeDescriptionProvider.java | 2 - .../uno/RegistryTypeDescriptionProvider.java | 2 - .../tests/java/mod/_remotebridge/uno/various.java | 1 - qadevOOo/tests/java/mod/_remotebridge/various.java | 1 - .../tests/java/mod/_sc/ScAccessibleCsvCell.java | 2 - .../tests/java/mod/_sc/ScAccessibleCsvGrid.java | 12 -- .../tests/java/mod/_sc/ScAccessibleCsvRuler.java | 7 -- .../java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 1 - .../java/mod/_sc/ScDataPilotFieldGroupObj.java | 1 - .../java/mod/_sc/ScDataPilotFieldGroupsObj.java | 1 - .../tests/java/mod/_sc/ScDatabaseRangeObj.java | 2 - .../ScIndexEnumeration_TableChartsEnumeration.java | 3 - qadevOOo/tests/java/mod/_sd/SdUnoPresView.java | 3 - .../java/mod/_svx/AccessibleControlShape.java | 2 - .../java/mod/_svx/AccessibleGraphicShape.java | 2 - .../tests/java/mod/_svx/AccessibleOLEShape.java | 2 - .../tests/java/mod/_svx/AccessiblePageShape.java | 6 - .../_svx/AccessiblePresentationGraphicShape.java | 4 - .../mod/_svx/AccessiblePresentationOLEShape.java | 4 - .../java/mod/_svx/AccessiblePresentationShape.java | 2 - qadevOOo/tests/java/mod/_svx/AccessibleShape.java | 2 - qadevOOo/tests/java/mod/_svx/SvxDrawPage.java | 4 - .../tests/java/mod/_svx/SvxShapeDimensioning.java | 1 - qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java | 2 - .../tests/java/mod/_svx/SvxShapePolyPolygon.java | 2 - .../java/mod/_svx/SvxShapePolyPolygonBezier.java | 1 - qadevOOo/tests/java/mod/_sw/PageStyle.java | 1 - .../tests/java/mod/_sw/SwXChapterNumbering.java | 2 - .../tests/java/mod/_sw/XMLContentImporter.java | 3 - qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java | 3 - .../tests/java/mod/_toolkit/AccessibleEdit.java | 2 - .../java/mod/_toolkit/AccessibleMenuItem.java | 1 - qadevOOo/tests/java/mod/_toolkit/Toolkit.java | 2 - .../tests/java/mod/_toolkit/UnoTreeControl.java | 2 - .../java/mod/_xmloff/Chart/XMLStylesImporter.java | 7 +- .../java/mod/_xmloff/Draw/XMLContentExporter.java | 1 - .../mod/_xmloff/Impress/XMLSettingsExporter.java | 10 -- 85 files changed, 44 insertions(+), 409 deletions(-) (limited to 'qadevOOo') 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 { 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 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 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