diff options
Diffstat (limited to 'qadevOOo/runner')
19 files changed, 38 insertions, 38 deletions
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index 7187ec5f52a3..588814ea7d90 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -149,7 +149,7 @@ public class ConvWatch throw new ConvWatchCancelException("createPostscriptStartCheck: Printed file " + sAbsolutePrintFile + " does not exist."); } - if (bAbsoluteReferenceFile == false) + if (!bAbsoluteReferenceFile) { // copy AbsolutePrintFile to AbsoluteReferenceFile String sDestinationFile = sAbsolutePrintFile; // URLHelper.getSystemPathFromFileURL(...) @@ -170,7 +170,7 @@ public class ConvWatch a.setOutputPath( _sOutputPath ); a.setReferenceFile( sReferenceFile ); a.setPostScriptFile(sPostScriptFile ); - if (_aGTA.printAllPages() == true) + if (_aGTA.printAllPages()) { a.setMaxPages(9999); } @@ -365,7 +365,7 @@ public class ConvWatch createINIStatus_DiffDiff(aDiffDiffList, "DiffDiff_", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID()); - if (bFoundAOldDiff == false) + if (!bFoundAOldDiff) { throw new ConvWatchCancelException("No old difference file found." ); } diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index 2adce7504d97..a6953157e8c2 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -109,7 +109,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase m_sOutputPath = sOUT; } - if (bQuit == true) + if (bQuit) { assure("Must quit", false); } diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index ee338d3e09d5..26cd831a7042 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -98,7 +98,7 @@ public class DirectoryHelper { if ( aDirEntries[ i ].isDirectory() ) { - if (m_bRecursiveIsAllowed == true) + if (m_bRecursiveIsAllowed) { // Recursive call for the new directory traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter ); diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index f449b578849f..5a6f02461a4e 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -110,7 +110,7 @@ public class DocumentConverter extends EnhancedComplexTestCase m_sReferencePath = sREF; } - if (bQuit == true) + if (bQuit) { assure("Must quit, Parameter problems.", false); } diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 9c23baf7ad9a..76684052dcf0 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -252,7 +252,7 @@ public class FileHelper File aFile = new File(sName); if (aFile.exists()) { - if (m_bDebugTextShown == false) + if (!m_bDebugTextShown) { GlobalLogWriter.get().println("Found file: " + sName); GlobalLogWriter.get().println("Activate debug mode."); diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index a6f506e318fb..d52add3fb27c 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -590,7 +590,7 @@ public class GraphicalTestArguments public boolean restartOffice() { - if (m_bResuseOffice == false) + if (!m_bResuseOffice) { return true; } diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 7ccf7d0370f3..92dc05ed82ac 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -197,7 +197,7 @@ public class MSOfficePrint throw new ConvWatchCancelException/*WrongSuffixException*/("No Mircosoft Office document format found."); } - if (aStartCommand.isEmpty() == false) + if (!aStartCommand.isEmpty()) { String sPrinterName = m_sPrinterName; if (sPrinterName == null) @@ -278,7 +278,7 @@ public class MSOfficePrint String sPrintViaWord = "printViaWord.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaWord); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -410,7 +410,7 @@ public class MSOfficePrint String sSaveViaWord = "saveViaWord.pl"; ArrayList<String> aList = searchLocalFile(sSaveViaWord); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -492,7 +492,7 @@ public class MSOfficePrint String sPrintViaExcel = "printViaExcel.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaExcel); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -587,7 +587,7 @@ public class MSOfficePrint String sSaveViaExcel = "saveViaExcel.pl"; ArrayList<String> aList = searchLocalFile(sSaveViaExcel); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -677,7 +677,7 @@ public class MSOfficePrint String sPrintViaPowerPoint = "printViaPowerPoint.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 9cbb1325a530..38273ecf9c4e 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -532,7 +532,7 @@ public class OfficePrint { aPrintProps.add(Arg); showProperty(Arg); - if (_aGTA.printAllPages() == false) + if (!_aGTA.printAllPages()) { String sPages = ""; if (_aGTA.getMaxPages() > 0) @@ -603,7 +603,7 @@ public class OfficePrint { bBack = false; } - if (bFailed == true) + if (bFailed) { GlobalLogWriter.get().println("convwatch.OfficePrint: FAILED"); } @@ -645,7 +645,7 @@ public class OfficePrint { String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename); String sAbsolutePrintFilename = sOutputPath + fs + sPrintFilename + ".prn"; - if (FileHelper.exists(sAbsolutePrintFilename) && _aGTA.getOverwrite() == false) + if (FileHelper.exists(sAbsolutePrintFilename) && !_aGTA.getOverwrite()) { GlobalLogWriter.get().println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); return true; @@ -693,7 +693,7 @@ public class OfficePrint { String sPrintFileURL; String sAbsolutePrintFilename = sOutputPath + fs + sPrintFilename + ".prn"; - if (FileHelper.exists(sAbsolutePrintFilename) && _aGTA.getOverwrite() == false) + if (FileHelper.exists(sAbsolutePrintFilename) && !_aGTA.getOverwrite()) { GlobalLogWriter.get().println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); return true; @@ -1084,7 +1084,7 @@ public class OfficePrint { GlobalLogWriter.get().println("Service from FilterName '" + sServiceName + "' is not supported by loaded document."); bServiceFailed = true; } - if (bServiceFailed == true) + if (bServiceFailed) { GlobalLogWriter.get().println("Please check '" + PropertyName.DOC_CONVERTER_EXPORT_FILTER_NAME + "' in the property file."); return; @@ -1130,7 +1130,7 @@ public class OfficePrint { sOutputFile += sInputFileBasename; } - if (FileHelper.exists(sOutputFile) && _aGTA.getOverwrite() == false) + if (FileHelper.exists(sOutputFile) && !_aGTA.getOverwrite()) { GlobalLogWriter.get().println("File already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); return; diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index 8b8e31d063e6..0fa57a8fd015 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -109,7 +109,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase m_sReferencePath = sREF; } - if (bQuit == true) + if (bQuit) { assure("Must quit, Parameter problems.", false); } @@ -197,7 +197,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase // first do a check if the reference not already exist, this is a big speedup, due to the fact, // we don't need to start a new office. GraphicalTestArguments aGTA = getGraphicalTestArguments(); - if (GraphicalDifferenceCheck.isReferenceExists(_sInputPath, _sReferencePath, aGTA) == false) + if (!GraphicalDifferenceCheck.isReferenceExists(_sInputPath, _sReferencePath, aGTA)) { // start a fresh Office OfficeProvider aProvider = null; diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index 2acb91154ae8..6ba7e6cdfdd6 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -99,7 +99,7 @@ public class DirectoryHelper { if ( aDirEntries[ i ].isDirectory() ) { - if (m_bRecursiveIsAllowed == true) + if (m_bRecursiveIsAllowed) { // Recursive call for the new directory traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter ); diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 78551e6f446b..ac4780021234 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -263,7 +263,7 @@ public class FileHelper File aFile = new File(sName); if (aFile.exists()) { - if (m_bDebugTextShown == false) + if (!m_bDebugTextShown) { GlobalLogWriter.println("Found file: " + sName); GlobalLogWriter.println("Activate debug mode."); diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 2e2da218580e..c94cfb8b4fa4 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -359,7 +359,7 @@ public class IniFile implements Enumeration<String> // TODO: make private private void store() { - if (m_bListContainUnsavedChanges == false) + if (!m_bListContainUnsavedChanges) { // nothing has changed, so no need to store return; diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 1d3081af6794..aeebf6927588 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -211,7 +211,7 @@ public class MSOfficePostscriptCreator implements IOffice throw new WrongSuffixException("No Mircosoft Office document format found."); } - if (aStartCommand.isEmpty() == false) + if (!aStartCommand.isEmpty()) { String sPrinterName = m_sPrinterName; if (sPrinterName == null) @@ -290,7 +290,7 @@ public class MSOfficePostscriptCreator implements IOffice String sPrintViaWord = "printViaWord.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaWord); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -421,7 +421,7 @@ public class MSOfficePostscriptCreator implements IOffice String sPrintViaExcel = "printViaExcel.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaExcel); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } @@ -519,7 +519,7 @@ public class MSOfficePostscriptCreator implements IOffice String sPrintViaPowerPoint = "printViaPowerPoint.pl"; ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint); - if (aList.isEmpty() == false) + if (!aList.isEmpty()) { return aList; } diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index bca3b38efb15..7dc60e8cac71 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -490,7 +490,7 @@ public class OpenOfficePostscriptCreator implements IOffice // generate pages string - if (_aGTA.printAllPages() == false) + if (!_aGTA.printAllPages()) { String sPages = ""; if (_aGTA.getMaxPages() > 0) @@ -561,7 +561,7 @@ public class OpenOfficePostscriptCreator implements IOffice bBack = false; } - if (bFailed == true) + if (bFailed) { GlobalLogWriter.println("convwatch.OfficePrint: FAILED"); } diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 418c06a6b3d1..042b2ea8b137 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -357,7 +357,7 @@ public class ParameterHelper { // boolean bCreateSmallPictures = true; boolean bNoSmallPictures = m_aCurrentParams.getBool( PropertyName.NO_SMALL_PICTURES); - if (bNoSmallPictures == true) + if (bNoSmallPictures) { return false; } diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 1f0643d2fc9f..6b21841b1802 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -702,7 +702,7 @@ public class OfficeProvider implements AppProvider String command = (String) param.get(util.PropertyName.APP_EXECUTION_COMMAND); String connectionString; - if (param.getBool(util.PropertyName.USE_PIPE_CONNECTION) == true) + if (param.getBool(util.PropertyName.USE_PIPE_CONNECTION)) { // This is the default behaviour connectionString = (String) param.get(util.PropertyName.PIPE_CONNECTION_STRING); diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 49e4814257a7..2554d16e0704 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -660,7 +660,7 @@ public class ProcessHandler } } - if (bKillProcessAfterTimeout == true) + if (bKillProcessAfterTimeout) { if (!isFinished) { diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java index 60bebf87ee0e..4ca5605761d8 100644 --- a/qadevOOo/runner/helper/URLHelper.java +++ b/qadevOOo/runner/helper/URLHelper.java @@ -64,8 +64,8 @@ public class URLHelper // => correct this problem first, otherwise office can't use these URL's if( (sFileURL != null ) && - (sFileURL.startsWith("file:/") == true ) && - (sFileURL.startsWith("file://") == false) + sFileURL.startsWith("file:/") && + !sFileURL.startsWith("file://") ) { StringBuffer sWorkBuffer = new StringBuffer(sFileURL); diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java index ff33c8c1442e..c42fb807f1fb 100644 --- a/qadevOOo/runner/util/RegistryTools.java +++ b/qadevOOo/runner/util/RegistryTools.java @@ -203,8 +203,8 @@ public class RegistryTools { return false ; } else { - if (compareKeyTrees(tree1.openKey(keyName), - tree2.openKey(keyName), true) == false) return false ; + if (!compareKeyTrees(tree1.openKey(keyName), + tree2.openKey(keyName), true)) return false ; } } } catch (InvalidRegistryException e) { |