diff options
Diffstat (limited to 'qadevOOo/runner')
52 files changed, 61 insertions, 209 deletions
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index d3864d997be9..30ba0fa05bd9 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -172,8 +172,7 @@ public class java_fat implements TestBase continue; } - final String sObjectName = tCase.getObjectName(); - // System.out.println(sObjectName + " recreated "); + tCase.getObjectName(); for (int j = 0; j < entry.SubEntryCount; j++) { diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 24b96d165192..081c72dedebb 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -64,9 +64,9 @@ public class java_fat_service implements TestBase { return false; } - String conStr = (String) param.get("ConnectionString"); + param.get("ConnectionString"); - XMultiServiceFactory msf = (XMultiServiceFactory)param.getMSF(); + param.getMSF(); for (int l=0;l<entries.length;l++) { @@ -217,7 +217,7 @@ public class java_fat_service implements TestBase { protected TestEnvironment getEnv(DescEntry entry, TestParameters param) { DynamicClassLoader dcl = new DynamicClassLoader(); log = (LogWriter)dcl.getInstance((String)param.get("LogWriter")); - XMultiServiceFactory msf = (XMultiServiceFactory)param.getMSF(); + param.getMSF(); TestCase tCase = null; diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 551775ad47f7..c0779f589d05 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -66,8 +66,6 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } catch (java.lang.NoSuchMethodException e) { - // simply ignore - int dummy = 0; m_bBeforeCalled = true; } catch (java.lang.IllegalAccessException e) diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index e9a81c93bcb6..c3290fc47713 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -160,10 +160,7 @@ class BorderRemover Method getWriterMIMETypesMethod = imageIOClass.getDeclaredMethod("getWriterMIMETypes", new Class[]{ }); // GlobalLogWriter.get().println("Hello World: get Methode"); - Object aObj = getWriterMIMETypesMethod.invoke(imageIOClass, new Object[]{ }); - String[] types = (String[])aObj; - // GlobalLogWriter.get().println("Hello World: types: " + Arrays.asList(types) ); - + getWriterMIMETypesMethod.invoke(imageIOClass, new Object[]{ }); Method writeMethod = imageIOClass.getDeclaredMethod("write", new Class[]{ java.awt.image.RenderedImage.class, java.lang.String.class, java.io.File.class}); diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java index f1e3b46a7443..bca1d869ac02 100644 --- a/qadevOOo/runner/convwatch/BuildID.java +++ b/qadevOOo/runner/convwatch/BuildID.java @@ -74,7 +74,6 @@ public class BuildID GlobalLogWriter.get().println("soffice executable not found."); } - int dummy = 0; return sBuildID; } diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index a846e4b739fc..b117d5749803 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -131,8 +131,7 @@ public class ConvWatch String sInputFile = FileHelper.getBasename(_sAbsoluteInputFile); // System.out.println("InputFile: " + sInputFile); - String sInputFileNoSuffix = FileHelper.getNameNoSuffix(sInputFile); - // System.out.println("BasenameNoSuffix: " + sInputFileNoSuffix); + FileHelper.getNameNoSuffix(sInputFile); String sAbsoluteOutputFile = _sOutputPath + fs + sInputFile; @@ -219,8 +218,7 @@ public class ConvWatch // This creates a status for exact on document static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID) { - // Status - String fs = System.getProperty("file.separator"); + System.getProperty("file.separator"); String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); // String sHTMLFile = _sFilenamePrefix + sNameNoSuffix + ".html"; @@ -290,8 +288,7 @@ public class ConvWatch static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID) { - // Status - String fs = System.getProperty("file.separator"); + System.getProperty("file.separator"); String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; @@ -357,8 +354,7 @@ public class ConvWatch _aGTA.setBorderMove(TriState.FALSE); StatusHelper[] aList = a.createPostscriptStartCheck(_aGTA, _sOutputPath, _sAbsoluteInputFile, _sAbsoluteReferenceFile); - // Status - boolean bResultIsOk = createINIStatus(aList, "", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID(), _aGTA.getRefBuildID()); + createINIStatus(aList, "", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID(), _aGTA.getRefBuildID()); StatusHelper[] aDiffDiffList = new StatusHelper[aList.length]; diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 57d831c0b7a7..c4f68e76c502 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -46,7 +46,6 @@ public class DB extends DBHelper private String m_sSourceVersion; private String m_sDestinationVersion; private String m_sDocumentPool; - private String m_sEnvironment; private String m_sDocID; private String m_sDBDistinct; @@ -154,7 +153,7 @@ public class DB extends DBHelper private void fillVariables(String _sInfo) { fillDBConnection(_sInfo); - m_sEnvironment = getEnvironment(); + getEnvironment(); StringTokenizer aTokenizer = new StringTokenizer(_sInfo,",",false); while (aTokenizer.hasMoreTokens()) @@ -257,7 +256,6 @@ public class DB extends DBHelper public ArrayList<String> QuerySQL(Connection _aCon, String _sSQL) { java.sql.Statement oStmt = null; - Connection oCon = null; ArrayList<String> aResultList = new ArrayList<String>(); try { @@ -278,9 +276,6 @@ public class DB extends DBHelper StringBuffer aResult = new StringBuffer(); try { - Object aObj = null; - - aResult.append("sqlresult: "); for (int i=1;i<=nColumnCount;i++) { diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index be86e77317d3..9dc9b253a8de 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -201,7 +201,6 @@ public class DBHelper throws ValueNotFoundException { Statement oStmt = null; - Connection oCon = null; int nValue = 0; try { diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index fce3456b57a8..32cbbca8f8ee 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -81,15 +81,12 @@ public class DocumentConverter extends EnhancedComplexTestCase // The test method itself. private String m_sInputPath = ""; private String m_sReferencePath = ""; - private boolean m_bIncludeSubdirectories = true; - void initMember() { // MUST PARAMETER // INPUT_PATH ---------- String sINPATH = (String)param.get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); boolean bQuit = false; - String sError = ""; if (sINPATH == null || sINPATH.length() == 0) { log.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); @@ -161,7 +158,7 @@ public class DocumentConverter extends EnhancedComplexTestCase { String fs = System.getProperty("file.separator"); - String sRemovePath = aInputPath.getAbsolutePath(); + aInputPath.getAbsolutePath(); // a whole directory FileFilter aFileFilter = FileHelper.getFileFilter(); diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java index e169d9fb84ee..3257d13f0f56 100644 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java @@ -40,10 +40,9 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase void checkExistance(String _sScriptFile, String _sName) { - boolean bBackValue = false; // Process testshl = Runtime.getRuntime().exec(scriptFile); ProcessHandler aHandler = new ProcessHandler(_sScriptFile); - bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); TimeHelper.waitInSeconds(1, "wait after ProcessHandler.executeSynchronously()"); StringBuffer aBuffer = new StringBuffer(); diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 44855f3b6f19..202f3d7712a7 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -271,12 +271,9 @@ public class FileHelper public static void test_removeFirstDirectorysAndBasenameFrom() { - String a = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c"); - // assure("", a.equals("d/e")); - String b = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/"); - // assure("", b.equals("d/e")); - String c = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c"); - // assure("", c.equals("a/b/c/d/e")); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c"); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/"); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c"); } diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 89dd8daaa81e..d3bda9944d9e 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -373,11 +373,11 @@ public class FilenameHelper System.out.println("URL: " + d.getFileURL()); System.out.println("Filename: " + d.getFilename()); - OriginalReferenceFilename a = new OriginalReferenceFilename("/dir1/dir2/", "name",".ext"); - OriginalReferenceFilename a1 = new OriginalReferenceFilename("/dir1/dir2","name.ext",""); - OriginalReferenceFilename a2 = new OriginalReferenceFilename("/dir1/dir2","/name.ext",""); - OriginalReferenceFilename a3 = new OriginalReferenceFilename("/dir1/dir2","/name",".ext"); - OriginalReferenceFilename a4 = new OriginalReferenceFilename("/dir1/dir2","name","ext"); + new OriginalReferenceFilename("/dir1/dir2/", "name",".ext"); + new OriginalReferenceFilename("/dir1/dir2","name.ext",""); + new OriginalReferenceFilename("/dir1/dir2","/name.ext",""); + new OriginalReferenceFilename("/dir1/dir2","/name",".ext"); + new OriginalReferenceFilename("/dir1/dir2","name","ext"); // OriginalReferenceFilename b = new OriginalReferenceFilename("c:/dir1/dir2/name.ext"); diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java index 64d5fa244acf..7bf52fd11dad 100644 --- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java +++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java @@ -66,8 +66,7 @@ public class GraphicalDifferenceCheck { String fs = System.getProperty("file.separator"); - String sRemovePath = aInputPath.getAbsolutePath(); - // a whole directory + aInputPath.getAbsolutePath(); Object[] aList = DirectoryHelper.traverse(_sInputPath, FileHelper.getFileFilter(), _aGTA.includeSubDirectories()); for (int i=0;i<aList.length;i++) diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 8b08c8e21601..e64189531f95 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -246,7 +246,7 @@ class IniFile int nEqual = sLine.indexOf("="); if (nEqual >= 0) { - String sKey = sLine.substring(0, nEqual).trim(); + sLine.substring(0, nEqual).trim(); String sValue = sLine.substring(nEqual + 1).trim(); return sValue; } diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 87fbdd4136c8..92b781d4d2c6 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -270,7 +270,7 @@ public class MSOfficePrint ProcessHandler aHandler = new ProcessHandler(aList); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); } catch (IndexOutOfBoundsException e) { diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 0863bedba0e6..2f579c95474d 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -857,8 +857,6 @@ public class OfficePrint { String _sPrintFileURL) throws ConvWatchCancelException { boolean bBack = false; - String sPrintFileURL = null; - // check if given file is a picture, then do nothing String sDocumentSuffix = FileHelper.getSuffix(_sInputFileURL); if (sDocumentSuffix.toLowerCase().endsWith(".png") || @@ -1004,7 +1002,6 @@ public class OfficePrint { } Object[] aElements = null; - String[] aExtensions; try { aElements = (Object[]) aNameAccess.getByName(_sFilterName); @@ -1082,7 +1079,6 @@ public class OfficePrint { } Object[] aElements = null; - String[] aExtensions; try { aElements = (Object[]) aNameAccess.getByName(_sFilterName); @@ -1262,13 +1258,6 @@ public class OfficePrint { String sFilterName = _aGTA.getExportFilterName(); - // check how many Properties should initialize - int nPropertyCount = 0; - // if (sFilterName != null && sFilterName.length() > 0) - // { - // nPropertyCount ++; - // } - // initialize PropertyArray // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ]; // int nPropertyIndex = 0; diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 5c0602eff25c..73e2bd536047 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -61,7 +61,7 @@ public class PRNCompare // System.out.println(_sCommand); ProcessHandler aHandler = new ProcessHandler(_sCommand); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); String sText = aHandler.getOutputText(); @@ -223,14 +223,12 @@ public class PRNCompare String sJPGFilename = getJPEGName(_sOutputPath, _sSourceFile, sGS_PageOutput); String sOriginalFile = _sSourcePath + fs + _sSourceFile; - String sCommand; String sGS = "gs"; if (OSHelper.isWindows()) { sGS = "gswin32c.exe"; } - sCommand = sGS + " -dNOPROMPT -dBATCH -sDEVICE=jpeg -r" + String.valueOf(_nResolutionInDPI) + " -dNOPAUSE -sOutputFile=" + StringHelper.doubleQuoteIfNeed(sJPGFilename) + " " + StringHelper.doubleQuoteIfNeed(sOriginalFile); String[] sCommandArray = { sGS, @@ -252,7 +250,7 @@ public class PRNCompare // System.out.println("done"); ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); // TODO: return a real filename, due to the fact we don't know how much files are created, maybe better to return a list @@ -566,7 +564,7 @@ public class PRNCompare }; ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); String sBack = aHandler.getOutputText(); GlobalLogWriter.get().println("'" + sBack + "'"); @@ -610,7 +608,7 @@ public class PRNCompare _sDiffGfx }; ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); String sBack = aHandler.getOutputText(); GlobalLogWriter.get().println("'" + sBack + "'"); diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index a1954f66df38..c4253c2ef6cf 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -25,8 +25,6 @@ import java.lang.Double; public class PerformanceContainer /* extends *//* implements */ { - private long m_nStartTime; - /* simple helper functions to start/stop a timer, to know how long a process need in milliseconds */ @@ -36,7 +34,6 @@ public class PerformanceContainer /* extends *//* implements */ { } public void setStartTime(long _nStartTime) { - m_nStartTime = _nStartTime; } /* diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index cace28992111..bf110ebba3ed 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -39,7 +39,6 @@ class CountNotWhite extends CountPixel public void count(int pixel) { - int alpha = (pixel >> 24) & 0xff; int red = (pixel >> 16) & 0xff; int green = (pixel >> 8) & 0xff; int blue = (pixel ) & 0xff; @@ -63,7 +62,6 @@ class CountNotBlack extends CountPixel public void count(int pixel) { - int alpha = (pixel >> 24) & 0xff; int red = (pixel >> 16) & 0xff; int green = (pixel >> 8) & 0xff; int blue = (pixel ) & 0xff; @@ -99,11 +97,6 @@ class graphics_stuff public static void handlesinglepixel(int x, int y, int pixel) { - int alpha = (pixel >> 24) & 0xff; - int red = (pixel >> 16) & 0xff; - int green = (pixel >> 8) & 0xff; - int blue = (pixel ) & 0xff; - // Deal with the pixel as necessary... } public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter) diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index d3cf71afc5e3..7d99383f903b 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -81,15 +81,12 @@ public class ReferenceBuilder extends EnhancedComplexTestCase // The test method itself. private String m_sInputPath = ""; private String m_sReferencePath = ""; - private boolean m_bIncludeSubdirectories = true; - void initMember() { // MUST PARAMETER // INPUT_PATH ---------- String sINPATH = (String)param.get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); boolean bQuit = false; - String sError = ""; if (sINPATH == null || sINPATH.length() == 0) { log.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); @@ -165,7 +162,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase { String fs = System.getProperty("file.separator"); - String sRemovePath = aInputPath.getAbsolutePath(); + aInputPath.getAbsolutePath(); // a whole directory FileFilter aFileFilter = FileHelper.getFileFilter(); diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 3220fc95004d..a70bbc58176f 100644 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -263,9 +263,6 @@ public class ReportDesignerTest extends ComplexTestCase { private static String m_sSourceName; private static String m_sDestinationName; - private static final int WRITER = 1; - private static final int CALC = 2; - /** * This is the main test Function of current ReportDesignerTest */ @@ -466,15 +463,11 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("DBConnection: " + sDBConnection); DB.init(sDBConnection); - // String sFixRefSubDirectory = "ReportDesign_qa_complex_" + getFileFormat(_nType); - String sFixRefSubDirectory = "ReportDesignFixRef"; - String sSourceVersion = m_sSourceVersion; // String sSourceVersion = sFixRefSubDirectory; String sSourceName = m_sSourceName; // String sSourceCreatorType = "fixref"; String sSourceCreatorType = ""; - String sDestinationVersion = m_sDestinationVersion; // if (sDestinationVersion.length() == 0) // { // sDestinationVersion = m_sUPDMinor; diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index 52c09e7ffb5c..3654e42cd270 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -348,9 +348,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) IniFile aIniFile = new IniFile(_aParam.getInputPath()); while (aIniFile.hasMoreElements()) { - String sSection = aIniFile.nextElement(); -// TODO: not supported yet. - // callEveryPictureInIniFile(aIniFile, sSection, _aParam); + aIniFile.nextElement(); } } else @@ -410,12 +408,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) { // TODO: auslagern in eine function, die ein Interface annimmt. String sInputPath = _aParam.getInputPath(); - File aInputPath = new File(sInputPath); -// if (!aInputPath.exists()) -// { -// GlobalLogWriter.println("Error, InputPath or File in InputPath doesn't exists. Please check: '" + sInputPath + "'"); -// assure("Error, InputPath or File in InputPath doesn't exists. Please check: '" + sInputPath + "'", false); -// } + new File(sInputPath); // call for a single ini file if (sInputPath.toLowerCase().endsWith(".ini") ) diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 733e827dc275..f551cffc1da8 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -302,12 +302,9 @@ public class FileHelper public static void test_removeFirstDirectorysAndBasenameFrom() { - String a = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c"); - // assure("", a.equals("d/e")); - String b = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/"); - // assure("", b.equals("d/e")); - String c = removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c"); - // assure("", c.equals("a/b/c/d/e")); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c"); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/a/b/c/"); + removeFirstDirectorysAndBasenameFrom("/a/b/c/d/e/f.g", "/b/c"); } @@ -608,8 +605,7 @@ public class FileHelper // OLD INFO FILE - // String fs = System.getProperty("file.separator"); - String ls = System.getProperty("line.separator"); + System.getProperty("line.separator"); String sInfoFilename = FileHelper.appendPath(sFileDir, sNameNoSuffix + ".info"); File aInfoFile = new File(sInfoFilename); diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 46173e4fb4ed..1c1c807c5220 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -311,7 +311,7 @@ public class IniFile implements Enumeration<String> int nEqual = sLine.indexOf("="); if (nEqual >= 0) { - String sKey = sLine.substring(0, nEqual).trim(); + sLine.substring(0, nEqual).trim(); String sValue = sLine.substring(nEqual + 1).trim(); return sValue; } diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index 4f53e8c2a270..c8620cb2482d 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -698,7 +698,7 @@ public class JPEGComparator extends EnhancedComplexTestCase }; ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); int nExitCode = aHandler.getExitCode(); if (nExitCode != 0) { @@ -754,8 +754,8 @@ public class JPEGComparator extends EnhancedComplexTestCase _sDiffGfx }; ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); - int nExitCode = aHandler.getExitCode(); + aHandler.executeSynchronously(); + aHandler.getExitCode(); String sBack = aHandler.getOutputText(); GlobalLogWriter.println("'" + sBack + "'"); diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index 26ffeb31535e..45e90ae041d0 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -109,7 +109,6 @@ public class JPEGCreator extends EnhancedComplexTestCase return; } - int nPages = 0; if (_sJPEGSchema.length() > 0) { // TODO: if there doesn't exists a '%04d' in the schema we will return 9999 which is a little bit wrong here. @@ -119,8 +118,6 @@ public class JPEGCreator extends EnhancedComplexTestCase if (FileHelper.exists(sJPEGFilename)) { convertToNearSameFileWithWidth340(sJPEGFilename); - // m_aFileList.add(sNewJPEGFilename); // as long as the files exist, fill the array - nPages ++; } else { @@ -196,8 +193,8 @@ private static void convertToWidth340(String _sFrom, String _To) _To }; ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); - int nExitCode = aHandler.getExitCode(); + aHandler.executeSynchronously(); + aHandler.getExitCode(); String sBack = aHandler.getOutputText(); if (sBack.length() > 0) diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index bbd73f7eca4c..7763a681e864 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -353,7 +353,7 @@ public class MSOfficePostscriptCreator implements IOffice ProcessHandler aHandler = new ProcessHandler(aList); - boolean bBackValue = aHandler.executeSynchronously(); + aHandler.executeSynchronously(); } catch (IndexOutOfBoundsException e) { diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java index 7d5d99831207..86bba445b643 100644 --- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java +++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java @@ -132,7 +132,6 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance } - private OfficeProvider m_aProvider = null; private XMultiServiceFactory m_xMultiServiceFactory = null; private XMultiServiceFactory getMultiServiceFactory() { @@ -165,20 +164,10 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // TimeHelper.waitInSeconds(2, "Give close Office some time."); // } - private String m_sMailAddress = null; - private String m_sParentDistinct = null; // private String m_sUPDMinor; // private String m_sCWS_WORK_STAMP; - private static String m_sSourceVersion; - private static String m_sDestinationVersion; - private static String m_sSourceName; - private static String m_sDestinationName; - - private static final int WRITER = 1; - private static final int CALC = 2; - /** * This is the main test Function of current ReportDesignerTest * @param _sDocument @@ -322,26 +311,9 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // TODO: DB // DB.init(sDBConnection); - // String sFixRefSubDirectory = "ReportDesign_qa_complex_" + getFileFormat(_nType); - String sFixRefSubDirectory = "ReportDesignFixRef"; - - String sSourceVersion = m_sSourceVersion; - // String sSourceVersion = sFixRefSubDirectory; - String sSourceName = m_sSourceName; - // String sSourceCreatorType = "fixref"; - String sSourceCreatorType = ""; - String sDestinationVersion = m_sDestinationVersion; - // if (sDestinationVersion.length() == 0) - // { - // sDestinationVersion = m_sUPDMinor; - // } - String sDestinationName = m_sDestinationName; - String sDestinationCreatorType = ""; - String sDocumentPoolDir = getOutputPath(/*_nType*/); - String sDocumentPoolName = getDocumentPoolName(/*_nType*/); - String sSpecial = ""; - -// TODO: DB + getOutputPath(/*_nType*/); + getDocumentPoolName(/*_nType*/); + // TODO: DB // DB.insertinto_documentcompare(sSourceVersion, sSourceName, sSourceCreatorType, // m_sDestinationVersion, sDestinationName, sDestinationCreatorType, // sDocumentPoolDir, sDocumentPoolName, m_sMailAddress, diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index d209d9f89c8b..154594ad8c67 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -969,7 +969,6 @@ public class OpenOfficePostscriptCreator implements IOffice } Object[] aElements = null; - String[] aExtensions; try { aElements = (Object[]) aNameAccess.getByName(_sFilterName); @@ -1047,7 +1046,6 @@ public class OpenOfficePostscriptCreator implements IOffice } Object[] aElements = null; - String[] aExtensions; try { aElements = (Object[]) aNameAccess.getByName(_sFilterName); @@ -1227,13 +1225,6 @@ public class OpenOfficePostscriptCreator implements IOffice String sFilterName = _aGTA.getExportFilterName(); - // check how many Properties should initialize - int nPropertyCount = 0; - // if (sFilterName != null && sFilterName.length() > 0) - // { - // nPropertyCount ++; - // } - // initialize PropertyArray // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ]; // int nPropertyIndex = 0; @@ -1400,14 +1391,11 @@ public class OpenOfficePostscriptCreator implements IOffice } } - private boolean m_bStoreFile; public void disallowStore() { - m_bStoreFile = false; } public void allowStore() { - m_bStoreFile = true; } public boolean isStoreAllowed() { diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java index 7f7ff5c2e3e9..c5d2bb1ae462 100644 --- a/qadevOOo/runner/graphical/PerformanceContainer.java +++ b/qadevOOo/runner/graphical/PerformanceContainer.java @@ -29,8 +29,6 @@ import java.io.RandomAccessFile; public class PerformanceContainer /* extends *//* implements */ { - private long m_nStartTime; - /* simple helper functions to start/stop a timer, to know how long a process need in milliseconds */ @@ -40,7 +38,6 @@ public class PerformanceContainer /* extends *//* implements */ { } public void setStartTime(long _nStartTime) { - m_nStartTime = _nStartTime; } /* diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java index c64134fc3eed..e85e5c7746cb 100644 --- a/qadevOOo/runner/graphical/TimeHelper.java +++ b/qadevOOo/runner/graphical/TimeHelper.java @@ -43,14 +43,11 @@ public class TimeHelper private int m_nMilliSeconds; private long m_nRealMilliSeconds; - private boolean m_bIsStopped = false; - public TimeHelper() {} public void start() { - m_bIsStopped = false; Calendar cal = Calendar.getInstance(); m_nSeconds = cal.get(Calendar.SECOND); m_nMilliSeconds = cal.get(Calendar.MILLISECOND); @@ -58,7 +55,6 @@ public class TimeHelper public void stop() { Calendar cal = Calendar.getInstance(); - m_bIsStopped = true; int nSeconds = cal.get(Calendar.SECOND); m_nSeconds = nSeconds - m_nSeconds; if (m_nSeconds < 0) diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index fb7a12a188c6..19f5b9037a2e 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -288,7 +288,6 @@ public class APIDescGetter extends DescGetter // int nFirstSemicolon = line.indexOf(";"); // int nLastSemicolon = line.lastIndexOf(";"); - String unknown; String ifc_name = ""; // = line.substring(line.indexOf(";") + 2, line.lastIndexOf(";") - 1); String meth_name = ""; // = line.substring(line.lastIndexOf(";") + 2, line.length() - 1); StringTokenizer aToken = new StringTokenizer(line, ";"); @@ -299,7 +298,7 @@ public class APIDescGetter extends DescGetter } if (aToken.hasMoreTokens()) { - unknown = StringHelper.removeQuoteIfExists(aToken.nextToken()); + StringHelper.removeQuoteIfExists(aToken.nextToken()); } if (aToken.hasMoreTokens()) { @@ -735,7 +734,7 @@ public class APIDescGetter extends DescGetter ArrayList<String> namesList = new ArrayList<String>(); StringTokenizer st = new StringTokenizer(job, ","); - for (int i = 0; st.hasMoreTokens(); i++) + for (; st.hasMoreTokens();) { String token = st.nextToken(); @@ -753,7 +752,7 @@ public class APIDescGetter extends DescGetter ArrayList<String> namesList = new ArrayList<String>(); StringTokenizer st = new StringTokenizer(job, ","); - for (int i = 0; st.hasMoreTokens(); i++) + for (; st.hasMoreTokens();) { namesList.add(st.nextToken()); } diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java index 36c80db2cead..bbef1cff9646 100644 --- a/qadevOOo/runner/helper/ConfigHelper.java +++ b/qadevOOo/runner/helper/ConfigHelper.java @@ -226,7 +226,7 @@ public class ConfigHelper XNameReplace xChildAccess = null; try { - Object xChild=xSetCont.getByName(groupName); + xSetCont.getByName(groupName); xChildAccess = UnoRuntime.queryInterface( XNameReplace.class,xSetCont); } catch(com.sun.star.container.NoSuchElementException e) { diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java index 1619a8146c88..6d3b4eb7c50c 100644 --- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java +++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java @@ -34,7 +34,6 @@ import util.utils; public class CwsDataExchangeImpl implements CwsDataExchange { - private final String cwsName; private final TestParameters param; private final LogWriter log; private final BuildEnvTools bet; @@ -42,7 +41,6 @@ public class CwsDataExchangeImpl implements CwsDataExchange public CwsDataExchangeImpl(String cwsName, TestParameters param, LogWriter log) throws ParameterNotFoundException { - this.cwsName = cwsName; this.param = param; this.log = log; this.bet = new BuildEnvTools(param, log); diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index e05b9d5f4c2d..233d6d7ee594 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -378,7 +378,6 @@ public class ProcessHandler { boolean changedText = true; - int count = 0; String memText = ""; this.executeAsynchronously(); @@ -396,7 +395,6 @@ public class ProcessHandler int hangcheck = 10; while (!this.isFinished() && changedText) { - count++; // dbg("runCommand: waiting " + mTimeOut / 1000 + " seconds while command execution is ongoing... " + count); // shortWait(mTimeOut); // shortWait(2000); // wait 2 seconds. diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java index b96a903a4def..f2921906ca0a 100644 --- a/qadevOOo/runner/helper/StringHelper.java +++ b/qadevOOo/runner/helper/StringHelper.java @@ -37,7 +37,6 @@ public class StringHelper public static String removeSurroundQuoteIfExists(String _sPath) { String sNewPath = _sPath; - boolean bRemoveQuotes = false; if ( (_sPath.startsWith("\"") && _sPath.endsWith("\"")) || (_sPath.startsWith("'") && _sPath.endsWith("'")) diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index 59ac51edd880..ec63699f8cbb 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -70,9 +70,7 @@ public class UnoProvider implements AppProvider { * @return True, if bootstrapping worked. */ public boolean disposeManager(TestParameters param) { - XMultiServiceFactory xMSF = - (XMultiServiceFactory)param.remove("ServiceManager"); - xMSF = null; + param.remove("ServiceManager"); System.gc(); try { Thread.sleep(1000); diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index e2c695671a73..9756ccebfee8 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -153,7 +153,7 @@ public class MultiMethodTest // For normal test we must not be a "ifc.qadevooo._SelfTest" if (! ("ifc.qadevooo._SelfTest").equals(entry.entryName)) { - String ifcName = getInterfaceName(); + getInterfaceName(); // System.out.println("checking : " + ifcName); System.out.print("checking: [" + entry.longName + "]"); @@ -181,8 +181,7 @@ public class MultiMethodTest } System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]"); - // quering the tested interface from the tested object - XInterface tCase = tEnv.getTestObject(); + tEnv.getTestObject(); Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject()); if (oObj == null) diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 403f9cb4037f..5935fb697c81 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -288,7 +288,6 @@ public class MultiPropertyTest extends MultiMethodTest } Property prop = info.getPropertyByName(propName); - short attr = prop.Attributes; boolean readOnly = (prop.Attributes & PropertyAttribute.READONLY) != 0; boolean maybeVoid = (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0; //check get-set methods diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java index 22d8b62199a0..1a629ed2538a 100644 --- a/qadevOOo/runner/share/DescGetter.java +++ b/qadevOOo/runner/share/DescGetter.java @@ -173,7 +173,7 @@ public abstract class DescGetter ArrayList<String> namesList = new ArrayList<String>(); StringTokenizer st = new StringTokenizer(job, ","); - for (int i = 0; st.hasMoreTokens(); i++) + for (; st.hasMoreTokens();) { String token = st.nextToken(); diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 98e699cef28b..f54d2e5f2d8d 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -58,8 +58,6 @@ public class DBTools { private XMultiServiceFactory xMSF = null ; private XNamingService dbContext = null ; - private PrintWriter m_log = null; - //JDBC driver public final static String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver"; @@ -268,8 +266,6 @@ public class DBTools { public DBTools(XMultiServiceFactory xMSF, PrintWriter _logger ) { this.xMSF = xMSF ; - this.m_log = _logger; - try { Object cont = xMSF.createInstance("com.sun.star.sdb.DatabaseContext") ; diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index 791052ffa768..771d5a55eeb1 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -139,7 +139,7 @@ public class DesktopTools public static Object[] getAllOpenDocuments(XMultiServiceFactory xMSF) { ArrayList<XComponent> components = new ArrayList<XComponent>(); - XDesktop xDesktop = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XDesktop.class, createDesktop(xMSF)); XEnumeration allComp = getAllComponents(xMSF); @@ -441,8 +441,7 @@ public class DesktopTools ConfigHelper aConfig = new ConfigHelper(xMSF, "org.openoffice.Office.Views", false); - // Is node "5539" (slot-id for navigator) available? If not, insert it - XNameReplace x5539 = aConfig.getOrInsertGroup("Windows", "5539"); + aConfig.getOrInsertGroup("Windows", "5539"); aConfig.updateGroupProperty( "Windows", "5539", "WindowState", "952,180,244,349;1;0,0,0,0;"); diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index e1c8fc7b0dd4..8f69fe710eae 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -34,9 +34,6 @@ public class FrameDsc extends InstDescr { private int height = 2000; private int width = 2000; private String name = null; - private int autoheigth = 0; - private int anchorType = 0;// bound at paragraph - final String ifcName = "com.sun.star.text.XTextFrame"; final String service = "com.sun.star.text.TextFrame"; diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index 684b93479dd8..2f131a263fea 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -55,8 +55,6 @@ public class InstCreator implements XInstCreator { public XInterface createInstance() { XInterface xIfc = null; - Object xObj = null; - xIfc = iDsc.createInstance( xMSF ); return xIfc; diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index df8b0ddfcf64..1ac29a23bdc9 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -609,7 +609,7 @@ public class SOfficeFactory { // query for XServiceInfo public Object queryXServiceInfo(Object oObj) { if (oObj != null) { - XServiceInfo oInfo = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XServiceInfo.class, oObj); System.out.println("!!!! XServiceInfo n.a. !!!! "); } else { diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index 779d1a861831..4c8f394ffcc7 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -443,8 +443,7 @@ public class UITools { try{ XInterface xNumericField =mAT.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); - //util.dbg.printInterfaces(xNumericField); - XAccessibleEditableText oValue = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XAccessibleEditableText.class, xNumericField); setString(xNumericField, cValue); @@ -480,7 +479,6 @@ public class UITools { try{ int beginIndex = 0; int endIndex = 0; - boolean startFound = false; // find the first numeric character in stringVal for(int i = 0; i < stringVal.length(); i++){ int numVal = Character.getNumericValue(stringVal.charAt(i)); @@ -702,7 +700,7 @@ public class UITools { utils.getImplName(xAcc)); if (aComp != null) { - Point location = aComp.getLocationOnScreen(); + aComp.getLocationOnScreen(); String bounds = "(" + aComp.getBounds().X + "," + aComp.getBounds().Y + ")" + " (" + aComp.getBounds().Width + "," + @@ -734,7 +732,7 @@ public class UITools { utils.getImplName(xAcc)); if (aComp != null) { - Point location = aComp.getLocationOnScreen(); + aComp.getLocationOnScreen(); String bounds = "(" + aComp.getBounds().X + "," + aComp.getBounds().Y + ")" + " (" + aComp.getBounds().Width + "," + diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java index d4535bc6fde7..e9f9fa9d1473 100644 --- a/qadevOOo/runner/util/ValueComparer.java +++ b/qadevOOo/runner/util/ValueComparer.java @@ -98,7 +98,7 @@ public class ValueComparer { if((op1.getClass().getComponentType() == op2.getClass().getComponentType()) && (Array.getLength(op1) == Array.getLength(op2))) { - Class<?> zClass = op1.getClass().getComponentType(); + op1.getClass().getComponentType(); for(int i = 0; i < Array.getLength(op1); ++ i) result = result & compareObjects(Array.get(op1, i), Array.get(op2, i)); diff --git a/qadevOOo/runner/util/WaitUnreachable.java b/qadevOOo/runner/util/WaitUnreachable.java index 56046397e123..e2aa6ee28d5c 100644 --- a/qadevOOo/runner/util/WaitUnreachable.java +++ b/qadevOOo/runner/util/WaitUnreachable.java @@ -80,7 +80,6 @@ public final class WaitUnreachable { while (queue.poll() == null) { System.gc(); System.runFinalization(); - byte[] dummy = new byte[1024]; } } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 2e53cc993be6..9bac81515731 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -282,7 +282,6 @@ public class XMLTools { tagStack = new ArrayList<String>() ; wellFormed = true ; noOtherErrors = true ; - PrintWriter log = null ; printXMLData = false ; } diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java index b045d50f0110..f67ad90485e1 100644 --- a/qadevOOo/runner/util/db/DatabaseDocument.java +++ b/qadevOOo/runner/util/db/DatabaseDocument.java @@ -34,7 +34,6 @@ public class DatabaseDocument { protected DatabaseDocument( final XMultiServiceFactory _orb, final DataSource _dataSource ) { - m_orb = _orb; m_dataSource = _dataSource; XDocumentDataSource docDataSource = UnoRuntime.queryInterface( @@ -74,7 +73,6 @@ public class DatabaseDocument m_storeDoc.storeAsURL( _url, new PropertyValue[] { } ); } - private XMultiServiceFactory m_orb; private DataSource m_dataSource; private XOfficeDatabaseDocument m_databaseDocument; private XModel m_model; diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java index a97d6b12b4c2..6b8f26a4c281 100644 --- a/qadevOOo/runner/util/dbg.java +++ b/qadevOOo/runner/util/dbg.java @@ -164,7 +164,7 @@ public class dbg { PrintWriter out) { try { XPropertySetInfo PSI = PS.getPropertySetInfo(); - Property[] props = PSI.getProperties(); + PSI.getProperties(); Property prop = PSI.getPropertyByName(name); out.println("Property name is " + prop.Name); out.println("Property handle is " + prop.Handle); diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index c584db16eaa0..8e9f4fa7a2f4 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -313,7 +313,6 @@ public class utils { public static void setOfficeSettingsValue(XMultiServiceFactory msf, String setting, String value) { - String settingPath = null; try { Object settings = msf.createInstance("com.sun.star.comp.framework.PathSettings"); XPropertySet pthSettings = null; @@ -661,9 +660,7 @@ public class utils { continue; } try { - // now trying to establish a client-socket - // fails if there is no server on any connectable machine - Socket sock = new Socket("localhost", port); + new Socket("localhost", port); System.out.println(" -> socket: occupied port: " + port); } catch (IOException e) { System.out.println(" -> free port"); |