diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-27 16:22:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:01 +0200 |
| commit | b707a707aae71f3e05dc096d8de14d2509e2b62f (patch) | |
| tree | ea82bdb32f10a89fdd8c3c64596a179602c84466 /qadevOOo | |
| parent | 8cd0fc50aa895d5c1588623a7675dd5679752379 (diff) | |
Java cleanup - remove unused local variables
Change-Id: Ied9c8635cde96d2d00d66a68cd8387799455c2ec
Diffstat (limited to 'qadevOOo')
166 files changed, 235 insertions, 640 deletions
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java index 1a39aed43518..23b3e357f335 100644 --- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java +++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java @@ -63,7 +63,7 @@ public class Skeleton // get multiservicefactory ----------------------------------------- final XMultiServiceFactory xMsf = getMSF(); - SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); + SOfficeFactory.getFactory(xMsf); // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties. param = new TestParameters(); 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"); diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 8b1092149182..dd4328f8d56f 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -63,7 +63,6 @@ public class CheckModuleAPI extends ComplexTestCase private static String mSRC_ROOT = null; private static boolean mIsInitialized = false; private final static boolean mContinue = true; - private static boolean mDebug = false; private static BuildEnvTools bet = null; /** @@ -94,9 +93,6 @@ public class CheckModuleAPI extends ComplexTestCase } mSRC_ROOT = bet.getSrcRoot(); - - mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE); - } } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java index 8a4fcfb32c44..3ae9b9413e7a 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java @@ -274,7 +274,7 @@ public class _XAccessibleContext extends MultiMethodTest { * Has <b> OK </b> status if the set is not null. */ public void _getAccessibleRelationSet() { - XAccessibleRelationSet set = oObj.getAccessibleRelationSet(); + oObj.getAccessibleRelationSet(); tRes.tested("getAccessibleRelationSet()", true); } diff --git a/qadevOOo/tests/java/ifc/awt/_XControl.java b/qadevOOo/tests/java/ifc/awt/_XControl.java index d217afda9377..bf3a08d7c2e4 100644 --- a/qadevOOo/tests/java/ifc/awt/_XControl.java +++ b/qadevOOo/tests/java/ifc/awt/_XControl.java @@ -195,7 +195,7 @@ public class _XControl extends MultiMethodTest { * and no exceptions were thrown. <p> */ public void _isTransparent() { - boolean isT = oObj.isTransparent(); + oObj.isTransparent(); tRes.tested("isTransparent()",true ); } diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java index b57511b4ad3c..75669d264438 100644 --- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java +++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java @@ -141,7 +141,6 @@ public class _XImageProducer extends MultiMethodTest { public void _startProduction() { requiredMethod("addConsumer()") ; - boolean result = true ; oObj.startProduction() ; try { diff --git a/qadevOOo/tests/java/ifc/awt/_XTabController.java b/qadevOOo/tests/java/ifc/awt/_XTabController.java index 17b183b3bd21..7c169d04ef12 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTabController.java +++ b/qadevOOo/tests/java/ifc/awt/_XTabController.java @@ -75,7 +75,7 @@ public class _XTabController extends MultiMethodTest { */ public void _getModel() { requiredMethod("setModel()"); - XTabControllerModel setModel = oObj.getModel(); + oObj.getModel(); tRes.tested("getModel()", Status.skipped(true)); } @@ -101,9 +101,8 @@ public class _XTabController extends MultiMethodTest { */ public void _getContainer() { requiredMethod( "setContainer()"); - XControlContainer setContainer = oObj.getContainer(); - XControlContainer relContainer = (XControlContainer ) - tEnv.getObjRelation("CONTAINER"); + oObj.getContainer(); + tEnv.getObjRelation("CONTAINER"); tRes.tested("getContainer()", Status.skipped(true) ); } @@ -112,7 +111,7 @@ public class _XTabController extends MultiMethodTest { * Has <b> OK </b> status if returned sequence is not null.<p> */ public void _getControls() { - XControl[] aControl = oObj.getControls(); + oObj.getControls(); tRes.tested("getControls()", Status.skipped(true) ); } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java index c8235e97ca8d..2aeed1a7bc6a 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java @@ -45,8 +45,6 @@ public class _XMutableTreeNode extends MultiMethodTest { public XMutableTreeNode oObj = null; - private int mCount = 0; - private XMutableTreeNodeCreator nodeCreator = null; public static interface XMutableTreeNodeCreator{ diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index 37699ec90010..e91bada6781a 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -61,8 +61,6 @@ public class _XTreeControl extends MultiMethodTest { public XTreeControl oObj = null; - private XMutableTreeNode mNewNode = null; - private XMutableTreeNode mXNode = null; XTreeExpansionListener mTreeExpansionListener1 = new TreeExpansionListenerImpl1(); diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java index cee6d766672e..cee52fcc520a 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java @@ -43,8 +43,6 @@ public class _XTreeDataModel extends MultiMethodTest { public XTreeDataModel oObj = null; - private XMutableTreeNode mNewNode = null; - XTreeDataModelListener mListener1 = new myEventListener1(); XTreeDataModelListener mListener2 = new myEventListener2(); @@ -126,7 +124,7 @@ public class _XTreeDataModel extends MultiMethodTest { public void _getRoot() { boolean bOK = true; - XTreeNode root = oObj.getRoot(); + oObj.getRoot(); tRes.tested("getRoot()", bOK); diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 49c4c9d6d12d..128e5e255fc0 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -70,8 +70,6 @@ public class _XMultiPropertySet extends MultiMethodTest { private XPropertySetInfo propertySetInfo = null; private String [] testPropsNames = null; private int testPropsAmount = 0; - private PrintWriter _log = null; - private Object[] values = null; private Set<String> exclProps = null; @@ -80,8 +78,6 @@ public class _XMultiPropertySet extends MultiMethodTest { * Initializes some fields. */ public void before() { - _log = log; - exclProps = (Set<String>) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps"); if (exclProps == null) exclProps = new HashSet<String>(0); } @@ -165,7 +161,6 @@ public class _XMultiPropertySet extends MultiMethodTest { requiredMethod("getPropertyValues()"); - boolean result = true ; // Creating listener oObj.addPropertiesChangeListener(testPropsNames, PClistener); @@ -186,7 +181,6 @@ public class _XMultiPropertySet extends MultiMethodTest { propertiesChanged = false; oObj.setPropertyValues(testPropsNames, gValues); waitAMoment() ; - result &= propertiesChanged ; log.println(" ... done"); } catch (com.sun.star.beans.PropertyVetoException e) { log.println("Exception occurred while trying to change "+ diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java index b58e9e0d18ad..f12d84abdc2a 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java @@ -54,7 +54,7 @@ public class _XPropertyWithState extends MultiMethodTest { public void _getDefaultAsProperty() { try{ - XInterface defaultState = (XInterface) oObj.getDefaultAsProperty(); + oObj.getDefaultAsProperty(); } catch (com.sun.star.lang.WrappedTargetException e){ e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java index 656135806752..9ecb306b4bb4 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java @@ -79,7 +79,7 @@ public class _XBackend extends MultiMethodTest { } try { - XUpdateHandler aHandler = oObj.getUpdateHandler( + oObj.getUpdateHandler( "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java index d54bbe76af33..b4fb0be0bd9a 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java @@ -35,7 +35,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { boolean res = true; try { - XLayer aLayer = oObj.getLayer("", ""); + oObj.getLayer("", ""); log.println("Exception expected -- FAILED"); res = false; } catch (com.sun.star.configuration.backend.BackendAccessException e) { @@ -124,7 +124,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { boolean res = true; try { - XUpdatableLayer aLayer = oObj.getUpdatableLayer(""); + oObj.getUpdatableLayer(""); log.println("Exception expected -- FAILED"); res = false; } catch (com.sun.star.configuration.backend.BackendAccessException e) { @@ -164,7 +164,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { boolean res = true; try { - String UpdateLayerID = oObj.getUpdateLayerId( + oObj.getUpdateLayerId( "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); @@ -210,7 +210,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { boolean res = true; try { - String[] LayerIDs = oObj.listLayerIds( + oObj.listLayerIds( "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java index 1e04a42c9a7c..4297c6c9f1dc 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java @@ -39,7 +39,7 @@ public class _XSingleLayerStratum extends MultiMethodTest { boolean res = true; try { - XLayer aLayer = oObj.getLayer("", ""); + oObj.getLayer("", ""); log.println("Exception expected -- FAILED"); res = false; } catch (com.sun.star.configuration.backend.BackendAccessException e) { @@ -74,7 +74,7 @@ public class _XSingleLayerStratum extends MultiMethodTest { boolean res = true; try { - XUpdatableLayer aLayer = oObj.getUpdatableLayer(""); + oObj.getUpdatableLayer(""); log.println("Exception expected -- FAILED"); res = false; } catch (com.sun.star.configuration.backend.BackendAccessException e) { diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index dd69bbdc0b99..9d718155c4a4 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -69,7 +69,6 @@ public class _XContainer extends MultiMethodTest { private boolean bElementInserted = false; private boolean bElementRemoved = false; private boolean bElementReplaced = false; - private PrintWriter _log = null; private XNameContainer NC = null ; private XControlContainer CC = null ; private XNamingService NV = null ; @@ -84,8 +83,6 @@ public class _XContainer extends MultiMethodTest { * object doesn't implement <code>XNameContainer</code> interface. */ public void before() throws StatusException { - _log = log; - // do this test with a different object Object altObj = tEnv.getObjRelation("XContainer.AlternateObject"); if (altObj != null) { diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java index 4b9ece7fbd38..2d7659bfb244 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java +++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java @@ -101,7 +101,7 @@ public class _XContainerQuery extends MultiMethodTest { while (subSet.hasMoreElements()) { try{ - Object element = subSet.nextElement(); + subSet.nextElement(); } catch (com.sun.star.container.NoSuchElementException e){ log.println("Exception occurred "); @@ -135,7 +135,7 @@ public class _XContainerQuery extends MultiMethodTest { while (subSet.hasMoreElements()) { try{ - Object element = subSet.nextElement(); + subSet.nextElement(); } catch (com.sun.star.container.NoSuchElementException e){ log.println("Exception occurred "); diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/tests/java/ifc/container/_XEnumeration.java index 6304934c99f0..10a23d7450d0 100644 --- a/qadevOOo/tests/java/ifc/container/_XEnumeration.java +++ b/qadevOOo/tests/java/ifc/container/_XEnumeration.java @@ -61,7 +61,7 @@ public class _XEnumeration extends MultiMethodTest { int tmpCounter = 0; while ( oObj.hasMoreElements() ) { try { - Object oAny = oObj.nextElement(); + oObj.nextElement(); counter ++; if (counter - tmpCounter > 10000) { log.println(counter+ " Elements"); @@ -108,7 +108,7 @@ public class _XEnumeration extends MultiMethodTest { log.println("additional call must throw NoSuchElementException"); try { - Object oAny = oObj.nextElement(); + oObj.nextElement(); log.println("nextElement: no exception!"); result = false; } catch (WrappedTargetException e) { diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java index fcdd33b416e6..396635f642b5 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java @@ -81,8 +81,6 @@ public class _XIndexAccess extends MultiMethodTest { catch(java.lang.InterruptedException e) {} boolean result = true; - boolean loc_result = true; - Object o = null; log.println("Testing getByIndex()"); if (count > 0) { @@ -102,7 +100,7 @@ public class _XIndexAccess extends MultiMethodTest { log.println("Testing getByIndex with wrong params."); try { log.println("getByIndex(" + count + ")"); - loc_result = oObj.getByIndex(count) == null; + oObj.getByIndex(count); log.println("no exception thrown - FAILED"); result = false; } catch (IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java index 64c769935b5c..474f082c1411 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java @@ -40,7 +40,7 @@ public class _XClipboardEx extends MultiMethodTest { * Has <b> OK </b> status if no runtime exceptions occurred. */ public void _getRenderingCapabilities() { - byte caps = oObj.getRenderingCapabilities(); + oObj.getRenderingCapabilities(); tRes.tested("getRenderingCapabilities()", true); } } diff --git a/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java b/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java index 9a17c65c5891..277c3df1fba4 100644 --- a/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java @@ -43,7 +43,7 @@ public class _XEventsSupplier extends MultiMethodTest { public void _getEvents() { XNameReplace xNR = oObj.getEvents(); - String str[] = xNR.getElementNames(); + xNR.getElementNames(); tRes.tested("getEvents()",xNR != null); } diff --git a/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java b/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java index 4dca661587c9..9a10e5697278 100644 --- a/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java @@ -41,7 +41,7 @@ public class _XLinkTargetSupplier extends MultiMethodTest { */ public void _getLinks() { XNameAccess links = oObj.getLinks(); - String names[] = links.getElementNames(); + links.getElementNames(); tRes.tested("getLinks()", links != null); } diff --git a/qadevOOo/tests/java/ifc/drawing/_Text.java b/qadevOOo/tests/java/ifc/drawing/_Text.java index c8566ab48a92..2ed2be97f1ba 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Text.java +++ b/qadevOOo/tests/java/ifc/drawing/_Text.java @@ -44,8 +44,7 @@ public class _Text extends MultiPropertyTest { } log.println("Trying to cast property 'NumberingRules' "+ "to XIndexReplace"); - XIndexReplace theRules = (XIndexReplace) - oObj.getPropertyValue( "NumberingRules" ); + oObj.getPropertyValue( "NumberingRules" ); bResult = true; } catch( Exception e ) { log.println("Error occurred while trying to get property"+ diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java index 0ac972a9cafa..1433a7a749dd 100644 --- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java +++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java @@ -63,7 +63,7 @@ public class _XValidatableFormComponent extends MultiMethodTest public void _getCurrentValue() { - Object cValue = oObj.getCurrentValue(); + oObj.getCurrentValue(); tRes.tested("getCurrentValue()", true); } @@ -77,21 +77,17 @@ public class _XValidatableFormComponent extends MultiMethodTest { requiredMethod("isValid()"); - boolean res = true; - try { oObj.removeFormComponentValidityListener(listener); } catch (com.sun.star.lang.NullPointerException e) { - res = false; e.printStackTrace(); } listenerCalled = false; changeAllProperties(); - res &= !listenerCalled; tRes.tested("removeFormComponentValidityListener()", true); } @@ -166,9 +162,6 @@ public class _XValidatableFormComponent extends MultiMethodTest ((property.Attributes & PropertyAttribute.READONLY) == 0); boolean isNotNull = ((property.Attributes & PropertyAttribute.MAYBEVOID) == 0); - boolean isBound = - ((property.Attributes & PropertyAttribute.BOUND) != 0); - //these have values that are interfaces we can't change if ( name.equals("TextUserDefinedAttributes") diff --git a/qadevOOo/tests/java/ifc/frame/_XDesktop.java b/qadevOOo/tests/java/ifc/frame/_XDesktop.java index 7e19e9dec6e8..84e8c1f7f44f 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDesktop.java +++ b/qadevOOo/tests/java/ifc/frame/_XDesktop.java @@ -57,9 +57,8 @@ public class _XDesktop extends MultiMethodTest { try { for (; xEnum.hasMoreElements();) { - XInterface xInt = null; try { - xInt = (XInterface) AnyConverter.toObject( + AnyConverter.toObject( new Type(XInterface.class), xEnum.nextElement()); } catch (com.sun.star.lang.IllegalArgumentException iae) { log.println("Can't convert any"); diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index 438c5690b169..dbe43e261675 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -84,7 +84,7 @@ public class _XLayoutManager extends MultiMethodTest { public void _getElement() { requiredMethod("createElement()"); - XUIElement xElement = oObj.getElement(sElementName); + oObj.getElement(sElementName); tRes.tested("getElement()", true); } @@ -109,22 +109,22 @@ public class _XLayoutManager extends MultiMethodTest { } public void _hideElement() { - boolean hidden = oObj.hideElement(sElementName); + oObj.hideElement(sElementName); tRes.tested("hideElement()", true); } public void _isElementDocked() { - boolean docked = oObj.isElementDocked(sElementName); + oObj.isElementDocked(sElementName); tRes.tested("isElementDocked()", true); } public void _isElementFloating() { - boolean docked = oObj.isElementFloating(sElementName); + oObj.isElementFloating(sElementName); tRes.tested("isElementFloating()", true); } public void _isElementVisible() { - boolean docked = oObj.isElementVisible(sElementName); + oObj.isElementVisible(sElementName); tRes.tested("isElementVisible()", true); } @@ -175,7 +175,7 @@ public class _XLayoutManager extends MultiMethodTest { public void _showElement() { requiredMethod("createElement()"); - boolean shown = oObj.showElement(sElementName); + oObj.showElement(sElementName); tRes.tested("showElement()", true); } diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java index bb8db3113690..90d049cbd05f 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java @@ -50,18 +50,6 @@ public class _XDataOutputStream extends MultiMethodTest { public XDataOutputStream oObj = null; - // values that are written - private boolean writeBoolean; - private byte writeByte; - private char writeChar; - private double writeDouble; - private float writeFloat; - private long writeHyper; - private int writeLong; - private short writeShort; - private String writeUTF; - - /** * Retrieves object relation <code>'StreamData'</code> * and executes methods of interface depending of data in stream. @@ -81,31 +69,30 @@ public class _XDataOutputStream extends MultiMethodTest { dataElem = data.get(i) ; if (dataElem instanceof Boolean) { - writeBoolean = ((Boolean)dataElem).booleanValue(); + ((Boolean)dataElem).booleanValue(); } else if (dataElem instanceof Byte) { - writeByte = ((Byte)dataElem).byteValue(); + ((Byte)dataElem).byteValue(); } else if (dataElem instanceof Character) { - writeChar = ((Character)dataElem).charValue(); + ((Character)dataElem).charValue(); } else if (dataElem instanceof Short) { - writeShort = ((Short)dataElem).shortValue(); + ((Short)dataElem).shortValue(); } else if (dataElem instanceof Integer) { - writeLong = ((Integer)dataElem).intValue(); + ((Integer)dataElem).intValue(); } else if (dataElem instanceof Long) { - writeHyper = ((Long)dataElem).longValue(); + ((Long)dataElem).longValue(); } else if (dataElem instanceof Float) { - writeFloat = ((Float)dataElem).floatValue(); + ((Float)dataElem).floatValue(); } else if (dataElem instanceof Double) { - writeDouble = ((Double)dataElem).doubleValue(); + ((Double)dataElem).doubleValue(); } else if (dataElem instanceof String) { - writeUTF = (String)dataElem; } } } diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java index 125df6012b75..7f4db951d86f 100644 --- a/qadevOOo/tests/java/ifc/lang/_XComponent.java +++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java @@ -41,7 +41,6 @@ import com.sun.star.lang.XEventListener; public class _XComponent extends MultiMethodTest { public static XComponent oObj = null; - private XNameContainer xContainer = null; private XComponent altDispose = null; boolean listenerDisposed[] = new boolean[2]; diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java index 7087e4807fc8..306c25883fe6 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java +++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java @@ -69,7 +69,6 @@ public class _XIdlReflection extends MultiMethodTest{ * returned value isn't null and no exceptions were thrown. <p> */ public void _getType() { - boolean result = true; Object obj = null; try { @@ -82,7 +81,6 @@ public class _XIdlReflection extends MultiMethodTest{ } if (obj == null) { - result = false; log.println("Object wasn't created !"); tRes.tested("getType()", false); } diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java index 1958836f924b..8780fe274aa5 100644 --- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java +++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java @@ -159,8 +159,6 @@ public class _XImplementationRegistration extends MultiMethodTest { * </ul> */ public void _revokeImplementation() throws RuntimeException{ - boolean result = false ; - requiredMethod("registerImplementation()") ; executeMethod("getImplementations()") ; @@ -170,9 +168,7 @@ public class _XImplementationRegistration extends MultiMethodTest { RegistryTools.printRegistryInfo(reg, log) ; try { - String[] subKeys = reg.getRootKey().getKeyNames() ; - - result = subKeys == null || subKeys.length == 0 ; + reg.getRootKey().getKeyNames(); } catch (com.sun.star.registry.InvalidRegistryException e) { log.println("!!! Exception retrieving keys from registry :") ; e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java index f8f2d94a5b43..fda6ad192669 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java +++ b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java @@ -33,7 +33,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XResultSet oldValue = UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); + UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); XResultSet newValue = UnoRuntime.queryInterface(XResultSet.class,tEnv.getObjRelation("DataAccessDescriptor.XResultSet")); @@ -76,7 +76,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XConnection oldValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); XConnection newValue = UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("DataAccessDescriptor.XConnection")); diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index 8ba1702e3b44..838370ea3215 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -52,8 +52,6 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { // oObj filled by MultiMethodTest public XSingleSelectQueryComposer oObj = null ; - private String queryString = "SELECT * FROM \"biblio\""; - private XSingleSelectQueryAnalyzer xQueryAna = null; private XPropertySet xProp = null; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java index c405a96fa13f..279efc3e98bc 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java @@ -418,7 +418,7 @@ public class _XResultSet extends MultiMethodTest { public void _rowUpdated() { try { - boolean res = oObj.rowUpdated() ; + oObj.rowUpdated(); tRes.tested("rowUpdated()", true) ; } catch (SQLException e) { log.println("Exception occurred :") ; @@ -433,7 +433,7 @@ public class _XResultSet extends MultiMethodTest { */ public void _rowInserted() { try { - boolean res = oObj.rowInserted() ; + oObj.rowInserted(); tRes.tested("rowInserted()", true) ; } catch (SQLException e) { log.println("Exception occurred :") ; @@ -448,7 +448,7 @@ public class _XResultSet extends MultiMethodTest { */ public void _rowDeleted() { try { - boolean res = oObj.rowDeleted() ; + oObj.rowDeleted(); tRes.tested("rowDeleted()", true) ; } catch (SQLException e) { log.println("Exception occurred :") ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index fa1d1b89fda0..a707bbe34cb2 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -141,9 +141,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - String getStr = oObj.getString(col) ; - //result &= ((String)data.get(col - 1)).equals(getStr) ; - //notNullRes &= !oObj.wasNull() ; + oObj.getString(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -163,9 +161,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - boolean getVal = oObj.getBoolean(col) ; - //result &= ((Boolean)data.get(col - 1)).booleanValue() == getVal ; - //notNullRes &= !oObj.wasNull() ; + oObj.getBoolean(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -185,9 +181,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - byte getVal = oObj.getByte(col) ; - //result &= ((Byte)data.get(col - 1)).byteValue() == getVal ; - //notNullRes &= !oObj.wasNull() ; + oObj.getByte(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -207,9 +201,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - short getVal = oObj.getShort(col) ; - //result &= ((Short)data.get(col - 1)).shortValue() == getVal ; - //notNullRes &= !oObj.wasNull() ; + oObj.getShort(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -229,7 +221,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - int getVal = oObj.getInt(col) ; + oObj.getInt(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -249,7 +241,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - long getVal = oObj.getLong(col) ; + oObj.getLong(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -269,7 +261,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - float getVal = oObj.getFloat(col) ; + oObj.getFloat(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -289,7 +281,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - double getVal = oObj.getDouble(col) ; + oObj.getDouble(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -309,7 +301,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - byte[] getVal = oObj.getBytes(col) ; + oObj.getBytes(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -329,7 +321,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - Date getVal = oObj.getDate(col) ; + oObj.getDate(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -349,7 +341,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - Time getVal = oObj.getTime(col) ; + oObj.getTime(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -369,7 +361,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - DateTime getVal = oObj.getTimestamp(col) ; + oObj.getTimestamp(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -389,7 +381,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XInputStream getVal = oObj.getBinaryStream(col) ; + oObj.getBinaryStream(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -409,7 +401,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XInputStream getVal = oObj.getCharacterStream(col) ; + oObj.getCharacterStream(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -429,7 +421,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - Object getVal = oObj.getObject(col, null) ; + oObj.getObject(col, null); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -449,7 +441,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XRef getVal = oObj.getRef(col) ; + oObj.getRef(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -469,7 +461,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XBlob getVal = oObj.getBlob(col) ; + oObj.getBlob(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -489,7 +481,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XClob getVal = oObj.getClob(col) ; + oObj.getClob(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; @@ -509,7 +501,7 @@ public class _XRow extends MultiMethodTest { if (col < 0) log.println("Type not found in relation: not tested"); else { try { - XArray getVal = oObj.getArray(col) ; + oObj.getArray(col); } catch (SQLException e) { log.println("Unexpected SQL exception:") ; log.println(e) ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java index e0520bde061e..0cc5d43b087f 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java @@ -99,13 +99,10 @@ public class _XRowSet extends MultiMethodTest { public void _execute() { requiredMethod("addRowSetListener()"); listener.reset(); - boolean result = true ; - try { oObj.execute() ; } catch (SQLException e) { log.println("Exception occurred :" + e) ; - result = false ; } tRes.tested("execute()", listener.rowSetChanged); diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java index 3a14ed43e03f..e6aad78638a6 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java @@ -139,26 +139,19 @@ public class _XDataDefinitionSupplier extends MultiMethodTest { * exception was thrown. */ public void _getDataDefinitionByURL() { - boolean bRes = false; - XTablesSupplier xTS = null; - try { log.println("getDataDefinitionByURL('" + url + "')"); - xTS = oObj.getDataDefinitionByURL(url, info); - bRes = xTS != null; + oObj.getDataDefinitionByURL(url, info); } catch (com.sun.star.sdbc.SQLException e) { log.println("Unexpected exception: " + e); - bRes = false; } try { log.println("getDataDefinitionByURL('" + wrongUrl + "')"); - xTS = oObj.getDataDefinitionByURL(wrongUrl, info); + oObj.getDataDefinitionByURL(wrongUrl, info); log.println("Exception was expected"); - bRes = false; } catch (com.sun.star.sdbc.SQLException e) { log.println("Expected exception"); - bRes &= true; } tRes.tested("getDataDefinitionByURL()", true); diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java index ca61c91d2977..79b541100130 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java @@ -42,8 +42,6 @@ public class _XTablesSupplier extends MultiMethodTest { * <code>XNameAccess</code> object, FAILED otherwise. */ public void _getTables() { - boolean result = true ; - XNameAccess tabs = oObj.getTables() ; diff --git a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java index db57e6cd4931..c4a737a700f5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java @@ -79,7 +79,6 @@ public class _XConsolidationDescriptor extends MultiMethodTest { */ public void _getSources() { CRaddr = oObj.getSources(); - int wiev = CRaddr.length; tRes.tested("getSources()", true); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index da56fbb3071c..d7c513c99088 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -280,7 +280,7 @@ public class _XDataPilotTable2 extends MultiMethodTest // out-of-bound condition is undefined. try { - CellRangeAddress rangeOutOfBound = xDPTab2.getOutputRangeByType(-1); + xDPTab2.getOutputRangeByType(-1); log.println("exception not raised"); break; } @@ -291,7 +291,7 @@ public class _XDataPilotTable2 extends MultiMethodTest try { - CellRangeAddress rangeOutOfBound = xDPTab2.getOutputRangeByType(100); + xDPTab2.getOutputRangeByType(100); log.println("exception not raised"); break; } diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index 9141741aca89..9a838ecef630 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -215,7 +215,6 @@ public class _CharacterProperties extends MultiPropertyTest { if (oPara == null) { testProperty("CharStyleNames", StylesTester) ; } else { - String[] newNames = {"Standard"}; changeProp((XPropertySet) oPara, (XPropertySet) oPort,"CharStyleNames",new String[] {"Standard"}); } @@ -254,7 +253,7 @@ public class _CharacterProperties extends MultiPropertyTest { changeProp((XPropertySet) oPara, (XPropertySet) oPort,"RubyAdjust", aShort); } - Short aShort = new Short((short) 1); + new Short((short) 1); } /** @@ -447,14 +446,14 @@ public class _CharacterProperties extends MultiPropertyTest { attr.Value = "true"; uda.insertByName("Cellprop:has-first-alien-attribute", attr); - String[] els = uda.getElementNames(); + uda.getElementNames(); oObj.setPropertyValue("TextUserDefinedAttributes", uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("TextUserDefinedAttributes")); - els = uda.getElementNames(); + uda.getElementNames(); - Object obj = uda.getByName("Cellprop:has-first-alien-attribute"); + uda.getByName("Cellprop:has-first-alien-attribute"); res = true; } catch (com.sun.star.beans.UnknownPropertyException upe) { if (isOptional("TextUserDefinedAttributes")) { diff --git a/qadevOOo/tests/java/ifc/style/_PageProperties.java b/qadevOOo/tests/java/ifc/style/_PageProperties.java index a47e46966151..929c9ca2b893 100644 --- a/qadevOOo/tests/java/ifc/style/_PageProperties.java +++ b/qadevOOo/tests/java/ifc/style/_PageProperties.java @@ -89,13 +89,13 @@ public class _PageProperties extends MultiPropertyTest { attr.Type="CDATA"; attr.Value="true"; uda.insertByName("Cellprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("UserDefinedAttributes")); - els = uda.getElementNames(); - Object obj = uda.getByName("Cellprop:has-first-alien-attribute"); + uda.getElementNames(); + uda.getByName("Cellprop:has-first-alien-attribute"); res = true; } catch (com.sun.star.beans.UnknownPropertyException upe) { log.println("Don't know the Property 'UserDefinedAttributes'"); diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index 4abf8c93c95d..7be6f0ecb4be 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -410,14 +410,14 @@ public class _ParagraphProperties extends MultiPropertyTest { attr.Value = "true"; uda.insertByName("Cellprop:has-first-alien-attribute", attr); - String[] els = uda.getElementNames(); + uda.getElementNames(); oObj.setPropertyValue("ParaUserDefinedAttributes", uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("ParaUserDefinedAttributes")); - els = uda.getElementNames(); + uda.getElementNames(); - Object obj = uda.getByName("Cellprop:has-first-alien-attribute"); + uda.getByName("Cellprop:has-first-alien-attribute"); res = true; } catch (com.sun.star.beans.UnknownPropertyException upe) { if (isOptional("ParaUserDefinedAttributes")) { diff --git a/qadevOOo/tests/java/ifc/table/_CellProperties.java b/qadevOOo/tests/java/ifc/table/_CellProperties.java index d8606bb0d5a7..ce45507cb27d 100644 --- a/qadevOOo/tests/java/ifc/table/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/table/_CellProperties.java @@ -73,13 +73,13 @@ public class _CellProperties extends MultiPropertyTest { attr.Type="CDATA"; attr.Value="true"; uda.insertByName("Cellprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("UserDefinedAttributes")); - els = uda.getElementNames(); - Object obj = uda.getByName("Cellprop:has-first-alien-attribute"); + uda.getElementNames(); + uda.getByName("Cellprop:has-first-alien-attribute"); res = true; } catch (com.sun.star.beans.UnknownPropertyException upe) { log.println("Don't know the Property 'UserDefinedAttributes'"); diff --git a/qadevOOo/tests/java/ifc/table/_XCell.java b/qadevOOo/tests/java/ifc/table/_XCell.java index a5ad522cbe60..faeb61d09dbc 100644 --- a/qadevOOo/tests/java/ifc/table/_XCell.java +++ b/qadevOOo/tests/java/ifc/table/_XCell.java @@ -114,10 +114,9 @@ public class _XCell extends MultiMethodTest { */ public void _getValue() { boolean result = true; - double value = 0; log.println("getValue() ..."); - value = oObj.getValue(); + oObj.getValue(); tRes.tested("getValue()",result); } // end getValue() diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java b/qadevOOo/tests/java/ifc/table/_XCellCursor.java index 142c2def170c..ae278f3a0c8a 100644 --- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java +++ b/qadevOOo/tests/java/ifc/table/_XCellCursor.java @@ -67,24 +67,16 @@ public class _XCellCursor extends MultiMethodTest { */ public void _gotoNext(){ boolean bResult = false; - int startCol, endCol, startRow, endRow = 0; - int startCol2, endCol2, startRow2, endRow2 = 0; + int startCol; + int startCol2; XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj); CellRangeAddress oAddr = oRange.getRangeAddress(); - startRow = oAddr.StartRow; startCol = oAddr.StartColumn; - endRow = oAddr.EndRow; - endCol = oAddr.EndColumn; - oObj.gotoNext(); oAddr = oRange.getRangeAddress(); - startRow2 = oAddr.StartRow; startCol2 = oAddr.StartColumn; - endRow2 = oAddr.EndRow; - endCol2 = oAddr.EndColumn; - if (!(startCol == startCol2)){ bResult = true; } @@ -101,23 +93,18 @@ public class _XCellCursor extends MultiMethodTest { */ public void _gotoOffset(){ boolean bResult = false; - int startCol, endCol, startRow, endRow = 0; - int startCol2, endCol2, startRow2, endRow2 = 0; + int startCol, startRow; + int startCol2, startRow2; XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj); CellRangeAddress oAddr = oRange.getRangeAddress(); startRow = oAddr.StartRow; startCol = oAddr.StartColumn; - endRow = oAddr.EndRow; - endCol = oAddr.EndColumn; - oObj.gotoOffset(4,4); oAddr = oRange.getRangeAddress(); startRow2 = oAddr.StartRow; startCol2 = oAddr.StartColumn; - endRow2 = oAddr.EndRow; - endCol2 = oAddr.EndColumn; if (!(startCol == startCol2) || (startRow == startRow2)){ bResult = true; } @@ -134,24 +121,16 @@ public class _XCellCursor extends MultiMethodTest { */ public void _gotoPrevious(){ boolean bResult = false; - int startCol, endCol, startRow, endRow = 0; - int startCol2, endCol2, startRow2, endRow2 = 0; + int startCol; + int startCol2; XCellRangeAddressable oRange = UnoRuntime.queryInterface(XCellRangeAddressable.class, oObj); CellRangeAddress oAddr = oRange.getRangeAddress(); - startRow = oAddr.StartRow; startCol = oAddr.StartColumn; - endRow = oAddr.EndRow; - endCol = oAddr.EndColumn; - oObj.gotoPrevious(); oAddr = oRange.getRangeAddress(); - startRow2 = oAddr.StartRow; startCol2 = oAddr.StartColumn; - endRow2 = oAddr.EndRow; - endCol2 = oAddr.EndColumn; - if (!(startCol == startCol2)){ bResult = true; } diff --git a/qadevOOo/tests/java/ifc/table/_XTableRows.java b/qadevOOo/tests/java/ifc/table/_XTableRows.java index 354fde9d9abf..8acb33a5a8f4 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableRows.java +++ b/qadevOOo/tests/java/ifc/table/_XTableRows.java @@ -62,7 +62,7 @@ public class _XTableRows extends MultiMethodTest { requiredMethod("removeByIndex()"); - int origCnt = oObj.getCount(); + oObj.getCount(); log.println("Inserting row before first row"); oObj.insertByIndex(0,1); result &= checkCell(1,15); diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java index f9d4c8d6b741..98b2ec3cac0e 100644 --- a/qadevOOo/tests/java/ifc/text/_MailMerge.java +++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java @@ -58,7 +58,7 @@ public class _MailMerge extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XResultSet oldValue = UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); + UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); XResultSet newValue = UnoRuntime.queryInterface(XResultSet.class,tEnv.getObjRelation("MailMerge.XResultSet")); @@ -102,7 +102,7 @@ public class _MailMerge extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XConnection oldValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); XConnection newValue = UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("MailMerge.XConnection")); diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java index 2355bdc90994..86a20de32633 100644 --- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java +++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java @@ -64,7 +64,6 @@ import com.sun.star.beans.PropertyValue; */ public class _NumberingLevel { - private static TestParameters tParam = null; private static HashMap<String, Boolean> NumberingLevel = new HashMap<String,Boolean>(); private static PropertyValue[] PropertyArray = null; private static LogWriter log = null; @@ -78,7 +77,6 @@ public class _NumberingLevel { */ public _NumberingLevel(LogWriter log, TestParameters tParam, PropertyValue[] propertyValues){ - this.tParam = tParam; this.PropertyArray = propertyValues; this.log = log; diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java index 1dcd91e32a0a..6d42a7363564 100644 --- a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java +++ b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java @@ -195,12 +195,12 @@ public class _XAutoTextGroup extends MultiMethodTest { boolean result = false; try { - String[] tit = oObj.getTitles() ; - String[] names = oObj.getElementNames() ; + oObj.getTitles(); + oObj.getElementNames(); oObj.insertNewByName(str,"For " + str,oRange); oObj.insertNewByName(str + "dup","For " + str,oRange); - tit = oObj.getTitles() ; - names = oObj.getElementNames() ; + oObj.getTitles(); + oObj.getElementNames(); result = true; } catch (com.sun.star.container.ElementExistException e) { log.println("Unexpected exception occurred :") ; diff --git a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java index e8fe1dc78e61..3b4baa5a71bd 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java @@ -63,7 +63,6 @@ public class _XTextFieldsSupplier extends MultiMethodTest { XSpreadsheetDocument xSheetDoc = (XSpreadsheetDocument)tEnv.getObjRelation("SPREADSHEET"); - XInterface oObj = null; XText oText = null; XTextContent oContent = null; XInterface aField = null; @@ -80,7 +79,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { XSpreadsheets oSheets = xSheetDoc.getSheets() ; XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); - XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( + AnyConverter.toObject( new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0)); String[] services = _oMSF.getAvailableServiceNames(); @@ -135,7 +134,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { XEnumeration xEnum = xEnumAccess.createEnumeration(); while(xEnum != null && xEnum.hasMoreElements()) { try { - Object o = xEnum.nextElement(); + xEnum.nextElement(); } catch(com.sun.star.container.NoSuchElementException e) { setMethodFalse("getTextFields()", e); diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java index 86b9b857c0e8..4f1a08592da8 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java @@ -32,7 +32,7 @@ public class _XCommandProcessor2 extends MultiMethodTest { public void _releaseCommandIdentifier() { int id = oObj.createCommandIdentifier(); oObj.releaseCommandIdentifier(id); - int id2 = oObj.createCommandIdentifier(); + oObj.createCommandIdentifier(); System.out.println("id: "+id); System.out.println("id2: "+id); tRes.tested("releaseCommandIdentifier()", true); diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java index 38f1046e954d..cae741cec099 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java @@ -59,7 +59,6 @@ public class _XUIConfiguration extends MultiMethodTest { public void before() { xListener = (XUIConfigurationListenerImpl)tEnv.getObjRelation( "XUIConfiguration.XUIConfigurationListenerImpl"); - XUIConfigurationListener l; } /** diff --git a/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java b/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java index 6d6a94ad8236..e2540e49dd4f 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java @@ -61,12 +61,10 @@ public class _XUIElementFactoryRegistration extends MultiMethodTest { public void _deregisterFactory() { executeMethod("getRegisteredFactory()"); executeMethod("getFactory()"); - boolean result = true; try { oObj.deregisterFactory("private:resource/menubar/menubar", "MyOwnMenubar", ""); } catch(com.sun.star.container.NoSuchElementException e) { - result = false; e.printStackTrace(log); } tRes.tested("deregisterFactory()", true); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java index 709666b6113c..d9898c976e5d 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java @@ -96,8 +96,6 @@ public class _XControlInformation extends MultiMethodTest { public void _getSupportedControlProperties() { requiredMethod("getSupportedControls()") ; - boolean result = true; - supProperties = new String[supControls.length][]; for (int i = 0; i < supControls.length; i++) { log.println("Getting proeprties for control: " + supControls[i]); @@ -106,14 +104,11 @@ public class _XControlInformation extends MultiMethodTest { oObj.getSupportedControlProperties(supControls[i]); } catch (com.sun.star.lang.IllegalArgumentException e) { log.println("Unexpected exception:" + e); - result = false ; } - result &= supProperties[i] != null; } try { - Object prop = oObj.getSupportedControlProperties("NoSuchControl") ; - result &= prop == null; + oObj.getSupportedControlProperties("NoSuchControl"); } catch (com.sun.star.lang.IllegalArgumentException e) { log.println("Expected exception getting properties " + "for wrong control:" + e); diff --git a/qadevOOo/tests/java/ifc/uno/_XComponentContext.java b/qadevOOo/tests/java/ifc/uno/_XComponentContext.java index a4fd9955aef8..65363ac1bce8 100644 --- a/qadevOOo/tests/java/ifc/uno/_XComponentContext.java +++ b/qadevOOo/tests/java/ifc/uno/_XComponentContext.java @@ -63,8 +63,8 @@ public class _XComponentContext extends MultiMethodTest { byValue = UnoRuntime.queryInterface( XMultiComponentFactory.class, value); - String[] vNames = byValue.getAvailableServiceNames(); - String[] dNames = directly.getAvailableServiceNames(); + byValue.getAvailableServiceNames(); + directly.getAvailableServiceNames(); boolean res = ValueComparer.equalValue(byValue, directly); tRes.tested("getValueByName()", res); diff --git a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java index 8141a48c563d..a19ecbaf467c 100644 --- a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java +++ b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java @@ -39,7 +39,7 @@ public class _XStringSubstitution extends MultiMethodTest { try { log.println("try to get a invalid variable..."); String toCheck = "$(ThisVariableShouldNoExist)"; - String eString = oObj.getSubstituteVariableValue(toCheck); + oObj.getSubstituteVariableValue(toCheck); log.println("$(ThisVariableShouldNoExist) should not exist"); tRes.tested("getSubstituteVariableValue()",false); @@ -66,7 +66,7 @@ public class _XStringSubstitution extends MultiMethodTest { try { log.println("try to get a invalid variable..."); String toCheck = "$(ThisVariableShouldNoExist)"; - String eString = oObj.substituteVariables(toCheck,true); + oObj.substituteVariables(toCheck,true); log.println("$(ThisVariableShouldNoExist) should not exist"); tRes.tested("substituteVariables()",false); diff --git a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java index e3b9878fb3cf..3e46223931c8 100644 --- a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java +++ b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java @@ -36,13 +36,13 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest { attr.Type="CDATA"; attr.Value="true"; uda.insertByName("Chartprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("UserDefinedAttributes")); - els = uda.getElementNames(); - Object obj = uda.getByName("Chartprop:has-first-alien-attribute"); + uda.getElementNames(); + uda.getByName("Chartprop:has-first-alien-attribute"); res = true; } catch (com.sun.star.beans.UnknownPropertyException upe) { log.println("Don't know the Property 'UserDefinedAttributes'"); diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index 63e2f864e272..649f5dfa372d 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -76,30 +76,24 @@ import com.sun.star.xml.sax.XLocator; public class _XDocumentHandler extends MultiMethodTest { private static class DocumentLocator implements XLocator { - public boolean aMethodCalled = false ; - private PrintWriter log = null ; public DocumentLocator(PrintWriter log) { this.log = log ; } public int getColumnNumber() { log.println("getColumnNumber() method called.") ; - aMethodCalled = true ; return 10 ; } public int getLineNumber() { log.println("getLineNumber() method called.") ; - aMethodCalled = true ; return 9 ; } public String getPublicId() { log.println("getPublicId() method called.") ; - aMethodCalled = true ; return "file://d:/file.txt"; } public String getSystemId() { log.println("getSystemId() method called.") ; - aMethodCalled = true ; return "system"; } } diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java index d9f10f5192c7..0c88f0a28355 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java @@ -82,9 +82,6 @@ public class CachedContentResultSetFactory extends TestCase { XInterface oObj = null; Object oInterface = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - Object relationContainer = null ; - - try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedContentResultSetFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java index e084ab9c1284..24d151c5be9f 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java @@ -80,9 +80,6 @@ public class CachedContentResultSetStubFactory extends TestCase { XInterface oObj = null; Object oInterface = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - Object relationContainer = null ; - - try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedContentResultSetStubFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java index 04deb7697ea2..c092967b70d5 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java @@ -80,9 +80,6 @@ public class CachedDynamicResultSetFactory extends TestCase { XInterface oObj = null; Object oInterface = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - Object relationContainer = null ; - - try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedDynamicResultSetFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java index 0ab63dcd48a0..1f29cf1556e6 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java @@ -77,9 +77,6 @@ public class CachedDynamicResultSetStubFactory extends TestCase { XInterface oObj = null; Object oInterface = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - Object relationContainer = null ; - - try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index ec2bcc3ed056..425866018748 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -97,21 +97,19 @@ public class ConnectionLineAccessibility extends TestCase { XInterface oObj = null; - Object oDBContext = null; Object oDBSource = null; Object newQuery = null; - Object toolkit = null; XStorable store = null; try { - oDBContext = ((XMultiServiceFactory) Param.getMSF()) + ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.DatabaseContext"); oDBSource = ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.DataSource"); newQuery = ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.QueryDefinition"); - toolkit = ((XMultiServiceFactory) Param.getMSF()) + ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java index 911abfa5db15..9051c2c5ecc8 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java @@ -96,21 +96,19 @@ public class JoinViewAccessibility extends TestCase { { XInterface oObj = null; - Object oDBContext = null; Object oDBSource = null; Object newQuery = null; - Object toolkit = null; XStorable store = null; try { - oDBContext = ((XMultiServiceFactory) Param.getMSF ()) + ((XMultiServiceFactory) Param.getMSF ()) .createInstance ("com.sun.star.sdb.DatabaseContext"); oDBSource = ((XMultiServiceFactory) Param.getMSF ()) .createInstance ("com.sun.star.sdb.DataSource"); newQuery = ((XMultiServiceFactory) Param.getMSF ()) .createInstance ("com.sun.star.sdb.QueryDefinition"); - toolkit = ((XMultiServiceFactory) Param.getMSF ()) + ((XMultiServiceFactory) Param.getMSF ()) .createInstance ("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 2ba6a2cd94a9..1526dc182e7f 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -156,16 +156,13 @@ public class OQueryDesign extends TestCase { } catch ( com.sun.star.lang.WrappedTargetException e){ throw new StatusException("could not get '" + sDataSourceName + "'" , e) ; } - XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); -// XModel xMod = (XModel) UnoRuntime.queryInterface(XModel.class, xDDS.getDatabaseDocument ()); + UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); // Frame = xMod.getCurrentController().getFrame(); xFrame = DesktopTools.getCurrentFrame(xMSF); - // get an instance of Frame - Object oFrame = null; - SOfficeFactory SOF = null; + SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); try { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 5246edd5a72b..3ab9edd40210 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -578,12 +578,10 @@ public class ORowSet extends TestCase { public void handle(XInteractionRequest xInteractionRequest) { log.println("### _XCompletedExecution.InteractionHandlerImpl: handle called."); - ParametersRequest req = null; boolean abort = false; Object o = xInteractionRequest.getRequest(); if (o instanceof ParametersRequest) { - req = (ParametersRequest)o; } else if (o instanceof AuthenticationRequest) { log.println("### The request in XCompletedExecution is of type 'AuthenticationRequest'"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index ef07416e243d..a0b2b5d4760d 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -132,11 +132,6 @@ import com.sun.star.uno.XInterface; */ public class OSingleSelectQueryComposer extends TestCase { - private static int uniqueSuffix = 0 ; - private DBTools dbTools = null ; - private static String origDB = null ; - private PrintWriter log = null ; - private static String tmpDir = null ; String tableName = null; DBTools.DataSourceInfo srcInf = null; boolean isMySQLDB = false; @@ -172,9 +167,6 @@ public class OSingleSelectQueryComposer extends TestCase { XInterface oObj = null; Object oInterface = null; XMultiServiceFactory xMSF = null ; - boolean envCreatedOK = false ; - - try { xMSF = (XMultiServiceFactory)Param.getMSF(); @@ -250,8 +242,7 @@ public class OSingleSelectQueryComposer extends TestCase { tEnv.addObjRelation("xProp", xCol); tEnv.addObjRelation("colName", xCols.getElementNames()[0]); - envCreatedOK = true ; - return tEnv; + return tEnv; } catch(com.sun.star.uno.Exception e) { log.println("Can't create object" ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index 4ea9fe8610db..5887999090df 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -97,20 +97,18 @@ public class TableWindowAccessibility extends TestCase { PrintWriter log) { XInterface oObj = null; - Object oDBContext = null; Object oDBSource = null; Object newQuery = null; - Object toolkit = null; XStorable store = null; try { - oDBContext = ((XMultiServiceFactory) Param.getMSF()) + ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.DatabaseContext"); oDBSource = ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.DataSource"); newQuery = ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.sdb.QueryDefinition"); - toolkit = ((XMultiServiceFactory) Param.getMSF()) + ((XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 896c590af483..3d84958bfbbe 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -871,8 +871,7 @@ public class ODatabaseForm extends TestCase { int count = params.getCount(); try { for(int i=0; i<count; i++) { - Object aObject = params.getByIndex(i); - Any any = (Any)aObject; + params.getByIndex(i); log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter "+i+": "+params.getByIndex(i)); XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i)); log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter Name: '"+xProp.getPropertyValue("Name") + "' is set to Value '1'"); diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 84680fa1878a..1678ae0a5362 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -319,7 +319,6 @@ class OGridControlModelold extends TestCase { XPropertySet aControl2 = null; XPropertySet aControl3 = null; XPropertySet aControl4 = null; - XPropertySet aControl5 = null; XGridColumnFactory columns = null; @@ -327,8 +326,6 @@ class OGridControlModelold extends TestCase { // first we write what we are intend to do to log file log.println("creating a test environment"); - //get GridControlModel - String objName = "Grid"; XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, 7000, 2000, 2000, "GridControl"); @@ -345,7 +342,7 @@ class OGridControlModelold extends TestCase { aControl2 = columns.createColumn("DateField"); aControl3 = columns.createColumn("TextField"); aControl4 = columns.createColumn("TextField"); - aControl5 = columns.createColumn("TextField"); + columns.createColumn("TextField"); } catch (com.sun.star.lang.IllegalArgumentException e) { // Some exception occures.FAILED log.println("!!! Couldn't create instance : " + e); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index b5689275dd8d..8c97bac37114 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -174,7 +174,6 @@ public class OTimeModel extends GenericModelTest { } static class Checker implements UpdateChecker { - private short lastItem = (short) 0; XLoadable formLoaderF = null; XPropertySet ps = null; XInterface ctrl = null; diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index 9f4362a89bd2..f413ad9cced2 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -100,7 +100,7 @@ public class ModuleUIConfigurationManager extends TestCase { tEnv = new TestEnvironment(oObj); XNameAccess xMM = UnoRuntime.queryInterface(XNameAccess.class, xMSF.createInstance("com.sun.star.comp.framework.ModuleManager")); - String[] names = xMM.getElementNames(); + xMM.getElementNames(); o = xMSF.createInstance("com.sun.star.embed.StorageFactory"); XSingleServiceFactory xStorageService = UnoRuntime.queryInterface(XSingleServiceFactory.class, o); diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index a53c46374db0..dae5c0f9191a 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -134,7 +134,7 @@ public class UIConfigurationManager extends TestCase { try { if (iUniqueCounter == 0) { iUniqueCounter++; - PropertyValue[][]props = xUIManager.getUIElementsInfo(UIElementType.UNKNOWN); + xUIManager.getUIElementsInfo(UIElementType.UNKNOWN); XIndexAccess xMenuBarSettings = xUIManager.getSettings( "private:resource/menubar/menubar", true); diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java index 9b17a34042c2..ee007bcaa6d0 100644 --- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java @@ -87,7 +87,7 @@ public class ContentHandlerFactory extends TestCase { XNameAccess xNA = UnoRuntime.queryInterface (XNameAccess.class, oObj); tEnv.addObjRelation("XMSF.serviceNames", xNA.getElementNames()); - String[] dummy = xNA.getElementNames(); + xNA.getElementNames(); // com.sun.star.container.XContainerQuery NamedValue[] querySequenze = new NamedValue[1]; diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java index 0e105af4b6a1..e6b4b55cedcf 100644 --- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java @@ -97,12 +97,11 @@ public class FilterFactory extends TestCase { // XNameContainer; XNameReplace String filterName = filterNames[0]; Object[] instance = null;; - PropertyValue instanceProp = new PropertyValue(); + new PropertyValue(); try{ instance = (Object[]) xNA.getByName(filterName); - PropertyValue[] props = (PropertyValue[]) instance; - instanceProp = getPropertyValue - (((PropertyValue[]) instance), "FilterService"); //instance[9]; + getPropertyValue + (((PropertyValue[]) instance), "FilterService"); } catch (com.sun.star.container.NoSuchElementException e){ throw new StatusException( Status.failed("Couldn't get elements from object")); diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 04f4a24349d0..c2c11c076320 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -126,8 +126,6 @@ public class various extends TestCase { */ public Exception ex = null ; private XAcceptor acc = null ; - private XInstanceProvider xInstProv = null ; - private XBridgeFactory xBrdgFctr = null; /** * If method call returns some value it stores in this field. */ @@ -140,8 +138,6 @@ public class various extends TestCase { public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv, XBridgeFactory xBrdgFctr) { this.acc = acc ; - this.xInstProv = xInstProv; - this.xBrdgFctr = xBrdgFctr; } /** diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 2b7714422ff1..3ba57ae9dc77 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -186,24 +186,16 @@ public class ScDataPilotFieldGroupItemObj extends TestCase throw new StatusException ("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition (1, 5); + oSheet.getCellByPosition (1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition (x, y); - aChangeValue = new Integer (27); + oSheet.getCellByPosition (x, y); + new Integer (27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index 2fc1fa4f5bda..1a92045be7c2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -185,24 +185,16 @@ public class ScDataPilotFieldGroupObj extends TestCase throw new StatusException ("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition (1, 5); + oSheet.getCellByPosition (1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition (x, y); - aChangeValue = new Integer (27); + oSheet.getCellByPosition (x, y); + new Integer (27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 7899d586b068..97294117d99c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -185,24 +185,16 @@ public class ScDataPilotFieldGroupsObj extends TestCase throw new StatusException ("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition (1, 5); + oSheet.getCellByPosition (1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition (x, y); - aChangeValue = new Integer (27); + oSheet.getCellByPosition (x, y); + new Integer (27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 862cd89cf96a..226c7e2e50be 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -186,23 +186,15 @@ public class ScDataPilotFieldObj extends TestCase { throw new StatusException("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition(1, 5); + oSheet.getCellByPosition(1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition(x, y); - aChangeValue = new Integer(27); + oSheet.getCellByPosition(x, y); + new Integer(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changeing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index 7bb82070f96c..217521d47c43 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -187,23 +187,15 @@ public class ScDataPilotItemObj extends TestCase { throw new StatusException("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition(1, 5); + oSheet.getCellByPosition(1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition(x, y); - aChangeValue = new Integer(27); + oSheet.getCellByPosition(x, y); + new Integer(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changeing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index 804c3a255fe2..73fb3d94d046 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -187,23 +187,15 @@ public class ScDataPilotItemsObj extends TestCase { throw new StatusException("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition(1, 5); + oSheet.getCellByPosition(1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition(x, y); - aChangeValue = new Integer(27); + oSheet.getCellByPosition(x, y); + new Integer(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changeing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index a63d9222a512..9930c0fa9e9e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -174,13 +174,11 @@ public class ScDatabaseRangeObj extends TestCase { //dbRanges.addNewByName("dbRange", aRange); XNameAccess dbrNA = UnoRuntime.queryInterface( XNameAccess.class, dbRanges); - XNamed xNamed = null; - try { // we need to add it dbRanges.addNewByName(dbName,new CellRangeAddress((short)0, 0, 0, 0, 5)); - xNamed = UnoRuntime.queryInterface(XNamed.class, + UnoRuntime.queryInterface(XNamed.class, dbrNA.getByName( dbName)); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index e8e5a7b097fd..2bc6d4a4811f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -189,23 +189,15 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration throw new StatusException("Couldn't fill some cells", e); } - // change a value of a cell and check the change in the data pilot - // (for the XDataPilotTable.refresh() test) - Object oChangeCell = null; - Object oCheckCell = null; - Integer aChangeValue = null; - try { - // cell of data - oChangeCell = oSheet.getCellByPosition(1, 5); + oSheet.getCellByPosition(1, 5); int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - // cell of the data pilot output - oCheckCell = oSheet.getCellByPosition(x, y); - aChangeValue = new Integer(27); + oSheet.getCellByPosition(x, y); + new Integer(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changeing.", e); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java index bcf423f105ee..23c76dc98bd1 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java @@ -144,7 +144,7 @@ public class SdUnoOutlineView extends TestCase { XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xImpressDoc); XDrawPages the_pages = oDPS.getDrawPages(); - XIndexAccess oDPi = UnoRuntime.queryInterface(XIndexAccess.class,the_pages); + UnoRuntime.queryInterface(XIndexAccess.class,the_pages); XModel aModel = UnoRuntime.queryInterface(XModel.class, xImpressDoc); diff --git a/qadevOOo/tests/java/mod/_stm/Pipe.java b/qadevOOo/tests/java/mod/_stm/Pipe.java index e3c869aec22d..afdf554e469e 100644 --- a/qadevOOo/tests/java/mod/_stm/Pipe.java +++ b/qadevOOo/tests/java/mod/_stm/Pipe.java @@ -89,7 +89,6 @@ public class Pipe extends TestCase { tEnv.addObjRelation("XOutputStream.StreamChecker", new ifc.io._XOutputStream.StreamChecker() { - XInputStream inStream = null; public void resetStreams() { } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index b0e0401a2331..3028e0020802 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -162,7 +162,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { XInterface oObj = null; - final XInitialization xInit = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XInitialization.class, the_frame2.getController()); PropertyValue[] params = new PropertyValue[3]; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index f07bf5dd3191..db3c0bbe739c 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -185,8 +185,6 @@ public class AccessibleBrowseBoxTable extends TestCase { XSelectionSupplier.class, xCont); - final Object[] initArgs = params; - XInterface oObj = null; AccessibilityTools at = new AccessibilityTools(); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 754f74884502..a2c0ee0bf6ee 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -159,7 +159,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { XInterface oObj = null; - final XInitialization xInit = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XInitialization.class, the_frame2.getController()); Object[] params = new Object[3]; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index a83aa2689c30..83dd22756976 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -190,7 +190,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { XInterface oObj = null; - XInitialization xInit = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XInitialization.class, the_frame2.getController()); diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index 68dddf1fc7ac..d86d5bcb829e 100644 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -88,7 +88,7 @@ public class ParagraphStyle extends TestCase { oSFNA = UnoRuntime.queryInterface( XNameAccess.class,oSF.getByName("ParagraphStyles")); XIndexAccess oSFIA = UnoRuntime.queryInterface(XIndexAccess.class, oSFNA); - String[] els = oSFNA.getElementNames(); + oSFNA.getElementNames(); oStyle = UnoRuntime.queryInterface( XStyle.class,oSFIA.getByIndex(1)); } catch ( com.sun.star.lang.WrappedTargetException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 4364ad03dfe9..3dc8e9e2ac09 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -75,8 +75,6 @@ public class SwAccessiblePageView extends TestCase { XInterface port = null; XInterface para = null; XPropertySet paraP = null; - XPropertySet portP = null; - XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); @@ -125,7 +123,7 @@ public class SwAccessiblePageView extends TestCase { } try { - portP = UnoRuntime.queryInterface(XPropertySet.class, port); + UnoRuntime.queryInterface(XPropertySet.class, port); paraP = UnoRuntime.queryInterface(XPropertySet.class, para); paraP.setPropertyValue("BreakType",com.sun.star.style.BreakType.PAGE_AFTER); } catch ( com.sun.star.lang.WrappedTargetException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java index afa7c6ab6123..b37512167a85 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java @@ -122,9 +122,6 @@ public class SwXAutoTextEntry extends TestCase { XAutoTextEntry oEntry = null; XAutoTextContainer oContainer; XInterface oObj = null; - int n = 0; - int nCount = 0; - log.println( "creating a test environment" ); try { XMultiServiceFactory myMSF = (XMultiServiceFactory)Param.getMSF(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index a57fd9d6b21a..1601497815b2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -74,7 +74,6 @@ public class SwXMailMerge extends TestCase { XInterface oObj = null; XInterface oRowSet = null; - Object oConnection = null; XJob Job = null; log.println(" instantiate MailMerge service"); @@ -304,14 +303,12 @@ public class SwXMailMerge extends TestCase { log.println("create remote connection"); String databaseName = null ; - XDataSource oXDataSource = null; - Object oInterface = null; XMultiServiceFactory xMSF = null ; int uniqueSuffix = Param.getInt("uniqueSuffix"); try { xMSF = (XMultiServiceFactory)Param.getMSF(); - oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); + xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); // retrieving temp directory for database String tmpDatabaseUrl = utils.getOfficeTempDir((XMultiServiceFactory)Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java index 97700079e63e..45cb0a88241c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java @@ -120,7 +120,6 @@ public class SwXTextPortionEnumeration extends TestCase { XEnumerationAccess oEnumA = UnoRuntime.queryInterface( XEnumerationAccess.class, oText ); XEnumeration oEnum = oEnumA.createEnumeration(); - int n = 0; while ( (oEnum.hasMoreElements()) ) { try { param = (XInterface) AnyConverter.toObject( @@ -130,7 +129,6 @@ public class SwXTextPortionEnumeration extends TestCase { e.printStackTrace(); throw new StatusException( "Couldn't get Paragraph", e ); } - n++; } XEnumerationAccess oEnumP = UnoRuntime.queryInterface( XEnumerationAccess.class, param ); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index 6ec4eb7ffc9c..3be2b9dc1414 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -65,8 +65,6 @@ import util.utils; */ public class AccessibleDropDownListBox extends TestCase { private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; - /** * Finds AccessibleDropDownListBox walking through the * accessible component tree of a writer document. diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index 4f88a2ccf515..034f015c7c09 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -68,8 +68,6 @@ import util.utils; * @see ifc.accessibility._XAccessibleText */ public class AccessibleFixedText extends TestCase { - private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; private static XWindow xWinDlg = null; /** diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index 6a644754b8c8..77e6bec67faa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -76,8 +76,6 @@ import util.utils; */ public class AccessibleMenu extends TestCase { private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; - /** * Finds accessible component with role <code>MENU</code> * walking through the accessible component tree of a document. diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index 2ef80e46a4a2..8de7b62e9fa9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -66,8 +66,6 @@ import util.utils; */ public class AccessibleMenuBar extends TestCase { private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; - /** * Finds accessible component with role <code>MENUBAR</code> * walking through the accessible component tree of a document. diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index 990c5eca843a..b0e77d926b77 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -73,7 +73,6 @@ import util.utils; */ public class AccessibleMenuItem extends TestCase { private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; private static XMultiServiceFactory msf = null; /** diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index 68bbc21bfc7e..3b306eba08a2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -64,7 +64,6 @@ import util.utils; */ public class AccessibleMenuSeparator extends TestCase { private static XTextDocument xTextDoc = null; - private static XAccessibleAction action = null; private static XMultiServiceFactory msf = null; /** diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index 9b5ef49c81e0..949739325122 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -48,7 +48,6 @@ import util.SOfficeFactory; public class AccessiblePopupMenu extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; private static Point point; @@ -56,7 +55,7 @@ public class AccessiblePopupMenu extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index b346eb1076cb..870bfad95f4a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -84,7 +84,6 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleText */ public class AccessibleRadioButton extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; private static XAccessibleAction accCloseButton; @@ -93,7 +92,7 @@ public class AccessibleRadioButton extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index ba9ce4ee6d9e..fa55b1f20578 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -73,14 +73,13 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleAction */ public class AccessibleScrollBar extends TestCase { - private static XDesktop the_Desk; private static XComponent xDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index 85f77a8e1c8d..d3e932988f01 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -151,7 +151,7 @@ public class AccessibleStatusBar extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - final XExtendedToolkit tk = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XExtendedToolkit.class, toolkit); tEnv.addObjRelation("EventProducer", diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index 7ee8dafc7181..0c5b5d586c50 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -73,14 +73,13 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleAction */ public class AccessibleStatusBarItem extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index 01a7ab25e91c..819984ea1394 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -79,7 +79,6 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleSelection */ public class AccessibleTabControl extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; private static XAccessibleAction accCloseButton = null; @@ -87,7 +86,7 @@ public class AccessibleTabControl extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index bd5f29f57b93..ea3ff9eb89f1 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -76,7 +76,6 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleExtendedComponent */ public class AccessibleTabPage extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; private static XAccessibleAction accCloseButton = null; @@ -84,7 +83,7 @@ public class AccessibleTabPage extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -246,7 +245,7 @@ public class AccessibleTabPage extends TestCase { XAccessibleComponent accComp = UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); - final Point point = accComp.getLocationOnScreen(); + accComp.getLocationOnScreen(); shortWait(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index f634a024ef5e..58f217772f20 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -63,14 +63,13 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleExtendedComponent */ public class AccessibleToolBox extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index 244a158894e7..9b4ac2952778 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -77,14 +77,13 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleValue */ public class AccessibleToolBoxItem extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index d43c66b164a4..d3e1f8e69f58 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -79,14 +79,13 @@ import util.SOfficeFactory; * @see ifc.accessibility.XAccessibleValue */ public class AccessibleWindow extends TestCase { - private static XDesktop the_Desk; private static XTextDocument xTextDoc; /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = UnoRuntime.queryInterface(XDesktop.class, + UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java index 41fd13b6b435..c0b77dca48ef 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java @@ -43,15 +43,11 @@ public class MutableTreeNode extends TestCase { private static XInterface oObj = null; private static XMutableTreeDataModel mXTreeDataModel; private static XMultiServiceFactory mxMSF; - private static PrintWriter log; - private static boolean debug = false; /** * Creates StarOffice Writer document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - this.log = log; - debug = tParam.getBool(PropertyName.DEBUG_IS_ACTIVE); mxMSF = (XMultiServiceFactory) tParam.getMSF(); // log.println("creating a textdocument"); // xTextDoc = WriterTools.createTextDoc(mxMSF); @@ -120,7 +116,7 @@ public class MutableTreeNode extends TestCase { if( xNode.getChildCount() == 0 ) { - String sParentPath = (String) xNode.getDataValue(); + xNode.getDataValue(); String officeUserPath = utils.getOfficeUserPath(mxMSF); Object fileacc = null; @@ -129,7 +125,7 @@ public class MutableTreeNode extends TestCase { } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } - XSimpleFileAccess sA = UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); + UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); dirlist(officeUserPath, xNode); @@ -149,7 +145,7 @@ public class MutableTreeNode extends TestCase { try { xChildNode = mXTreeDataModel.createNode(dir.substring(dir.lastIndexOf("/")+1, dir.length()), sfa.isFolder(dir)); xChildNode.setDataValue(dir); - boolean test = sfa.isFolder(dir); + sfa.isFolder(dir); if (sfa.isFolder(dir)){ xChildNode.setExpandedGraphicURL( "private:graphicrepository/sd/res/triangle_down.png"); xChildNode.setCollapsedGraphicURL("private:graphicrepository/sd/res/triangle_right.png"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index 1d8f50e365f8..3087387ce11a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -151,7 +151,7 @@ public class UnoControlDialogModel extends TestCase { log.println("creating a new environment for object"); - XMultiServiceFactory oMSF = UnoRuntime.queryInterface( + UnoRuntime.queryInterface( XMultiServiceFactory.class, oObj); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java index 57b15539be4e..a3dad60c3522 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java @@ -66,7 +66,7 @@ public class UnoScrollBarControl extends TestCase { XFrame xFrame = xModel.getCurrentController().getFrame(); XWindow xWin = xFrame.getContainerWindow(); - Toolkit tk = Toolkit.getDefaultToolkit(); + Toolkit.getDefaultToolkit(); Dimension dim = new Dimension(800, 600); Rectangle newPosSize = xWin.getPosSize(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index 570e12d588c8..e40fa35723d9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -53,22 +53,16 @@ import util.utils; public class UnoTreeControl extends TestCase { - private static XTextDocument xTextDoc; private static XMutableTreeDataModel mXTreeDataModel; private static XMultiServiceFactory mxMSF; - private static PrintWriter log; - private static boolean debug = false; protected void initialize(TestParameters Param, PrintWriter log) { - this.log = log; - debug = Param.getBool(PropertyName.DEBUG_IS_ACTIVE); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); try { log.println("creating a textdocument"); - xTextDoc = SOF.createTextDoc(null); + SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { // Some exception occures.FAILED e.printStackTrace(log); @@ -210,7 +204,7 @@ public class UnoTreeControl extends TestCase { if( xNode.getChildCount() == 0 ) { - String sParentPath = (String) xNode.getDataValue(); + xNode.getDataValue(); String officeUserPath = utils.getOfficeUserPath(mxMSF); Object fileacc = null; @@ -219,7 +213,7 @@ public class UnoTreeControl extends TestCase { } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } - XSimpleFileAccess sA = UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); + UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); dirlist(officeUserPath, xNode); @@ -239,7 +233,7 @@ public class UnoTreeControl extends TestCase { try { xChildNode = mXTreeDataModel.createNode(dir.substring(dir.lastIndexOf("/")+1, dir.length()), sfa.isFolder(dir)); xChildNode.setDataValue(dir); - boolean test = sfa.isFolder(dir); + sfa.isFolder(dir); if (sfa.isFolder(dir)){ xChildNode.setExpandedGraphicURL( "private:graphicrepository/sd/res/triangle_down.png"); xChildNode.setCollapsedGraphicURL("private:graphicrepository/sd/res/triangle_right.png"); |