diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:53 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:53 +0200 |
| commit | b29a838b1cd9014c0951312f53ca6c0ebb9e1219 (patch) | |
| tree | f951731fcd4f0c17dd7a55b154be238cb2b71bae | |
| parent | b9bff9906e94ef3b1c8d6da779269122d39d8354 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 868b90218854a32bdd0bbcc85aad838f198e40bb (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:21 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 7525320ca65ca0cf2ed5ec481d9f26638aed1b5c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:38 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: testing_libreoffice-3.3.0.4
1629 files changed, 9489 insertions, 9489 deletions
diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml index f00746a2a6b8..f1d18384c438 100755 --- a/qadevOOo/build.xml +++ b/qadevOOo/build.xml @@ -32,7 +32,7 @@ </classpath> </javac> </target> - + <!-- target for building the tests --> <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build"> <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}"> diff --git a/qadevOOo/runner/base/TestBase.java b/qadevOOo/runner/base/TestBase.java index d09f28721ab0..5901cbd727ec 100644 --- a/qadevOOo/runner/base/TestBase.java +++ b/qadevOOo/runner/base/TestBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ package base; import lib.TestParameters; -/** +/** * - * Base Interface to execute a given TestJob + * Base Interface to execute a given TestJob */ public interface TestBase { - + public boolean executeTest(TestParameters param); - + } diff --git a/qadevOOo/runner/base/basic_fat.java b/qadevOOo/runner/base/basic_fat.java index 74a6708cf801..b8202d874b0d 100644 --- a/qadevOOo/runner/base/basic_fat.java +++ b/qadevOOo/runner/base/basic_fat.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java index c25de6efc4a9..dd919d630786 100644 --- a/qadevOOo/runner/base/java_cmp.java +++ b/qadevOOo/runner/base/java_cmp.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java index 946e14b42934..879f03c54d0f 100644 --- a/qadevOOo/runner/base/java_complex.java +++ b/qadevOOo/runner/base/java_complex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public class java_complex implements TestBase /** * This function executes the complex tests given as parameter "-o" or "TestJob". It querys for the correspond class * and crates the JobDescription. - * @param param + * @param param * @return true of all tests run successfuly, esle false */ public boolean executeTest(TestParameters param) @@ -75,8 +75,8 @@ public class java_complex implements TestBase /** * This function run the given DescEntry[] as ComplexTest - * @param param - * @param entries + * @param param + * @param entries * @return true of all tests run successfuly, esle false */ public boolean executeTest(TestParameters param, DescEntry[] entries) @@ -93,10 +93,10 @@ public class java_complex implements TestBase ComplexTestCase testClass = null; boolean returnVal = true; -// the concept of the TimeOut depends on runner logs. If the runner log, +// the concept of the TimeOut depends on runner logs. If the runner log, // for exmaple to start a test method, the timeout was restet. This is not // while the test itself log something like "open docuent...". -// An property of complex test could be that it have only one test method +// An property of complex test could be that it have only one test method // which works for serveral minutes. Ih this case the TimeOut get not trigger // and the office was killed. // In complex tests just use "ThreadTimeOut" as timout. diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index 4dd3ad51a817..39e66b4e8ecb 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -494,7 +494,7 @@ public class java_fat implements TestBase } } - + // private void shortWait(int millis) // { // try diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 0c8fd17e43ec..4c9ae1a5f7a7 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public class java_fat_service implements TestBase { static protected boolean debug = false; protected LogWriter log = null; - + public boolean executeTest(lib.TestParameters param) { DynamicClassLoader dcl = new DynamicClassLoader(); log = (LogWriter)dcl.getInstance((String)param.get("LogWriter")); @@ -137,29 +137,29 @@ public class java_fat_service implements TestBase { continue; } log.println("Created "+tCase.getObjectName()+"\n"); - + for (int j=0;j<entry.SubEntryCount;j++) { if (!entry.SubEntries[j].isToTest) { Summarizer.summarizeDown(entry.SubEntries[j],"not part of the job"); continue; } - + log.println("running: "+entry.SubEntries[j].entryName); - + LogWriter ifclog = (LogWriter)dcl.getInstance( (String)param.get("LogWriter")); - - ifclog.initialize(entry.SubEntries[j],true); + + ifclog.initialize(entry.SubEntries[j],true); entry.SubEntries[j].UserDefinedParams = param; entry.SubEntries[j].Logger = ifclog; - + if (tEnv == null || tEnv.isDisposed()) { - tEnv = getEnv(entry,param); + tEnv = getEnv(entry,param); } - + MultiMethodTest ifc = null; lib.TestResult res = null; - try { + try { ifc = (MultiMethodTest) dcl.getInstance( entry.SubEntries[j].entryName); res = ifc.run(entry.SubEntries[j],tEnv,param); @@ -197,16 +197,16 @@ public class java_fat_service implements TestBase { sumIfc.summary(entry.SubEntries[j]); } try { - tCase.cleanupTestCase(param); + tCase.cleanupTestCase(param); } catch (Exception e) { e.printStackTrace((PrintWriter)log); - } + } sumIt.summarizeUp(entry); LogWriter sumObj = (LogWriter)dcl.getInstance( (String)param.get("OutProducer")); sumObj.initialize(entry,true); - sumObj.summary(entry); - } + sumObj.summary(entry); + } if (entries.length > 1) { log.println(""); int counter = 0; @@ -220,9 +220,9 @@ public class java_fat_service implements TestBase { log.println(counter +" of "+entries.length + " tests failed" ); } - return retValue; - } - + return retValue; + } + protected TestEnvironment getEnv(DescEntry entry, TestParameters param) { DynamicClassLoader dcl = new DynamicClassLoader(); log = (LogWriter)dcl.getInstance((String)param.get("LogWriter")); @@ -249,7 +249,7 @@ public class java_fat_service implements TestBase { try { tCase.initializeTestCase(param); - tEnv = tCase.getTestEnvironment(param); + tEnv = tCase.getTestEnvironment(param); } catch (com.sun.star.lang.DisposedException de) { @@ -257,11 +257,11 @@ public class java_fat_service implements TestBase { } return tEnv; } - + // protected void shortWait(int millis) { // try { // Thread.sleep(millis); // } catch (java.lang.InterruptedException ie) {} // } - + } diff --git a/qadevOOo/runner/basicrunner/BasicException.java b/qadevOOo/runner/basicrunner/BasicException.java index 419e26461916..40a446dc68c4 100644 --- a/qadevOOo/runner/basicrunner/BasicException.java +++ b/qadevOOo/runner/basicrunner/BasicException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,12 +30,12 @@ package basicrunner; */ public class BasicException extends Throwable { /** Detailed information about the exception. - */ + */ public String info; /** Constructor with detailed information. * @param info Information about the exception. - */ + */ public BasicException(String info) { this.info = info; } diff --git a/qadevOOo/runner/basicrunner/BasicHandler.java b/qadevOOo/runner/basicrunner/BasicHandler.java index a0f5f5e405fc..997a7af94b5b 100644 --- a/qadevOOo/runner/basicrunner/BasicHandler.java +++ b/qadevOOo/runner/basicrunner/BasicHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ import share.LogWriter; * This class is a java-part of BASIC-java interaction "driver" * It is used to call Star-Basic's function from java using * basic's part of "driver" where listeners are implemented. - * The instance of the BasicHandler should be added to the MSF that will be + * The instance of the BasicHandler should be added to the MSF that will be * used for loading BASIC's part of "driver".<br> - * After opening basic's document it creates an instance of the + * After opening basic's document it creates an instance of the * HandlerContainer using BasicHandler. HandlerContainer is a UNO * XContainer and XNameContainer. * Only one instance of BasicHandler can be used at the moment. @@ -68,11 +68,11 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { /** * serviceName is the name of service that can be created in BASIC. */ - static final String serviceName = + static final String serviceName = "com.sun.star.jsuite.basicrunner.BasicHandler"; /** - * <code>container</code> is a SHARED variable (between BASIC and Java). + * <code>container</code> is a SHARED variable (between BASIC and Java). * It is used for interacting. */ static private HandlerContainer container = null; @@ -108,9 +108,9 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { static private boolean respFlag = false; /** - * <code>iBasicTimeout</code> is the amount of milliseconds that - * the BasicHandler will wait for a response from tests - * (finish to execute a method or add log information) + * <code>iBasicTimeout</code> is the amount of milliseconds that + * the BasicHandler will wait for a response from tests + * (finish to execute a method or add log information) * before it decides that SOffice is dead. */ static private int iBasicTimeout = 10000; @@ -132,7 +132,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { /** * Set the tested interface and a log writer. * @param ifc The test of an interface - * @param log A log writer. + * @param log A log writer. */ public void setTestedInterface(BasicIfcTest ifc, LogWriter log) { this.log = log; @@ -183,8 +183,8 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { * @see com.sun.star.lang.XMultiServiceFactory * @throws ConnectionSetupException Exception is thrown, if no connection could be made. */ - public synchronized void Connect(String sBasicBridgeURL, - TestParameters tParam, XMultiServiceFactory xMSF, + public synchronized void Connect(String sBasicBridgeURL, + TestParameters tParam, XMultiServiceFactory xMSF, LogWriter log) throws ConnectionSetupException { this.log = log; try { @@ -196,7 +196,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { XComponentLoader oCLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, oDesktop); - + // load BasicBridge with MarcoEceutionMode = Always-no warn //PropertyValue[] DocArgs = null; PropertyValue[] DocArgs = new PropertyValue[1]; @@ -204,7 +204,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { DocArg.Name = "MacroExecutionMode"; DocArg.Value = new Short( com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN); - DocArgs[0] = DocArg; + DocArgs[0] = DocArg; // configure Office to allow to execute macos PropertyValue [] ProvArgs = new PropertyValue [1]; @@ -212,40 +212,40 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { Arg.Name = "nodepath"; Arg.Value = "/org.openoffice.Office.Common/Security"; ProvArgs[0] = Arg; - + Object oProvider = xMSF.createInstance( "com.sun.star.configuration.ConfigurationProvider"); - - XMultiServiceFactory oProviderMSF = (XMultiServiceFactory) + + XMultiServiceFactory oProviderMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, oProvider); - + Object oSecure = oProviderMSF.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", - ProvArgs); - - XPropertySet oSecureProps = (XPropertySet) + ProvArgs); + + XPropertySet oSecureProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oSecure); - + Object oScripting = oSecureProps.getPropertyValue("Scripting"); XPropertySet oScriptingSettings = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oScripting); - + oScriptingSettings.setPropertyValue("Warning", Boolean.FALSE); oScriptingSettings.setPropertyValue("OfficeBasic", new Integer(2)); - - XChangesBatch oSecureChange = (XChangesBatch) + + XChangesBatch oSecureChange = (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class, oSecure); oSecureChange.commitChanges(); - - // As we want to have some information about a debugFile + + // As we want to have some information about a debugFile // BEFORE connection is established // we pass the information about it in frame name. String sFrameName = (String)tParam.get( "soapi.test.basic.debugFile"); if (sFrameName == null) sFrameName = "BasicRunner"; - oHandlerDoc = oCLoader.loadComponentFromURL(sBasicBridgeURL, + oHandlerDoc = oCLoader.loadComponentFromURL(sBasicBridgeURL, sFrameName, 40, DocArgs); do { @@ -268,7 +268,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { * Overloads perform(Strin fName, Object params) for convenience. * @return A proprty value as result. * - public synchronized PropertyValue perform(String fName) + public synchronized PropertyValue perform(String fName) throws BasicException { return perform(fName, ""); } @@ -280,7 +280,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { * @return A proprty value as result of the test. * @throws BasicException The method could not be executed. */ - public synchronized PropertyValue perform(String fName, Object params) + public synchronized PropertyValue perform(String fName, Object params) throws BasicException { try { container.callBasicFunction(fName, params); @@ -288,7 +288,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { do { respFlag = false; // waiting for basic response for iBasicTimeout milliseconds. - wait(iBasicTimeout); + wait(iBasicTimeout); } while(respFlag && !container.hasByName("BASIC_Done")); } catch (InterruptedException e) { @@ -300,7 +300,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { if (!container.hasByName("BASIC_Done")) { System.out.println("Operation timed out."); throw new BasicException( - "Operation timed out."); + "Operation timed out."); } Object res = container.getByName("BASIC_Done") ; @@ -311,7 +311,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { System.out.println( "BasicBridge returns null"); throw new BasicException( - "BasicBridge returns null"); + "BasicBridge returns null"); } else { System.out.println( "BasicBridge returns wrong type: " + res.getClass()); @@ -354,7 +354,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { return getClass().getName(); } - /** + /** * Create an instance of HandlerContainer. * Arguments are not supported here, so they will be ignored. * @param args The arguments. @@ -364,7 +364,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { return container; } - /** + /** * Create an instance of HandlerContainer. * @return The instance. */ @@ -394,7 +394,7 @@ public class BasicHandler implements XServiceInfo, XSingleServiceFactory { * @see com.sun.star.container.XContainer * @see com.sun.star.container.XNameContainer * @see com.sun.star.lang.XTypeProvider - */ + */ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ /** Container for parameters. @@ -405,13 +405,13 @@ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ * @see com.sun.star.container.XContainerListener */ static XContainerListener[] listener = null; - + /** The BasicHandler belonging to this handler. **/ BasicHandler parent = null; /** * Constructor with the parent BasicHandler. - * @param par The BasicHandler. + * @param par The BasicHandler. */ public HandlerContainer(BasicHandler par) { parent = par; @@ -462,7 +462,7 @@ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ parent.notify(); } } else if (name.equals("BASIC_MethodTested")) { - parent.methodTested(result.Name, + parent.methodTested(result.Name, ((Boolean)result.Value).booleanValue()); } } else if (name.equals("BASIC_Log")) { @@ -566,8 +566,8 @@ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ int length = 0; if (listener != null) length = listener.length; - - XContainerListener[] mListener = + + XContainerListener[] mListener = new XContainerListener[length+1]; for (int i=0; i<length-1; i++) { mListener[i] = listener[i]; @@ -586,7 +586,7 @@ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ public void removeContainerListener(XContainerListener xListener){ if (listener != null && listener.length != 0) { int length = listener.length; - XContainerListener[] mListener = + XContainerListener[] mListener = new XContainerListener[length-1]; boolean found = false; int j=0; @@ -606,7 +606,7 @@ class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{ } else listener = mListener; - + } } } diff --git a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java b/qadevOOo/runner/basicrunner/BasicHandlerProvider.java index 9a6479d50f1d..de64336bd45d 100644 --- a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java +++ b/qadevOOo/runner/basicrunner/BasicHandlerProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ import basicrunner.basichelper.Filter; import basicrunner.basichelper.DispatchProviderInterceptor; /** - * This class provides a BasicHandler. All classes for the communication with - * and handling of the BASIC tests are instantiated and inserted int the + * This class provides a BasicHandler. All classes for the communication with + * and handling of the BASIC tests are instantiated and inserted int the * MultiServiceFactory of StarOffice. */ public class BasicHandlerProvider { diff --git a/qadevOOo/runner/basicrunner/BasicIfcTest.java b/qadevOOo/runner/basicrunner/BasicIfcTest.java index 8c75f8ff94f0..76ca93204416 100644 --- a/qadevOOo/runner/basicrunner/BasicIfcTest.java +++ b/qadevOOo/runner/basicrunner/BasicIfcTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/basicrunner/BasicTestCase.java b/qadevOOo/runner/basicrunner/BasicTestCase.java index 1356badc12d7..3656717f447f 100644 --- a/qadevOOo/runner/basicrunner/BasicTestCase.java +++ b/qadevOOo/runner/basicrunner/BasicTestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ import com.sun.star.beans.PropertyValue; * The basic test case. */ public class BasicTestCase extends TestCase { - + /** * Specifies the PrintWriter to log information. */ - public PrintWriter oLog; - + public PrintWriter oLog; + /** The name of the test object **/ protected String objName; /** The implementation name of the test object **/ @@ -68,7 +68,7 @@ public class BasicTestCase extends TestCase { /** * Initialize the test case. - * The BasicHandler is talken from the test parameters and several + * The BasicHandler is talken from the test parameters and several * parameters are initialized. * @param tParam The test parameters. * @param pLog A log writer. @@ -80,17 +80,17 @@ public class BasicTestCase extends TestCase { LogWriter log = (LogWriter)pLog; oBasicHandler = BasicHandlerProvider.getHandler(tParam, log); try { - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "cBASPath = \"" + tParam.get("BASICRESPTH") + "/\""); - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "cTestDocsDir = \"" + tParam.get("DOCPTH") + "/\""); - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "CNCSTR = \"" + tParam.get("CNCSTR") + "\""); if (tParam.get("soapi.test.hidewindows") != null) { - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "soapi_test_hidewindows = true"); } else { - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "soapi_test_hidewindows = false"); } //this parameters are used by testcases of db-driver components @@ -124,7 +124,7 @@ public class BasicTestCase extends TestCase { } } - /** + /** * Create the environment for the test. This is done by BASIC. * @param tParam The test parameters. * @param log A log writer. @@ -137,7 +137,7 @@ public class BasicTestCase extends TestCase { boolean bObjectWasCreated = false; try { - oBasicHandler.perform("setValue", + oBasicHandler.perform("setValue", "cObjectImplementationName = \"" + implName + "\""); Res = oBasicHandler.perform("createObject", objName); bObjectWasCreated = ((Boolean)Res.Value).booleanValue(); @@ -162,8 +162,8 @@ public class BasicTestCase extends TestCase { /** * BASIC is told to dispose the test object. * @param tParam The test parameters. - */ - + */ + public void cleanupTestCase(TestParameters tParam) { PropertyValue Res; oLog.println("Cleaning up testcase"); diff --git a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java b/qadevOOo/runner/basicrunner/basichelper/AttributeList.java index cdcba0f6f956..2ee98614b664 100644 --- a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java +++ b/qadevOOo/runner/basicrunner/basichelper/AttributeList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class AttributeList implements XServiceInfo, XSingleServiceFactory { return new String[] {__serviceName}; } - /** + /** * Ask for the implementation name. * @return The implementation name. */ @@ -104,7 +104,7 @@ class AttributeListImpl extends XMLTools.AttributeList * Initialize this class. * @param p0 An array of XML attributes that are added to the list. * @throws Exception Initialize failed. - */ + */ public void initialize(Object[] p0) throws com.sun.star.uno.Exception { for(int i = 0; i + 2 < p0.length; i += 3) { add((String)p0[i], (String)p0[i + 1], (String)p0[i + 2]); diff --git a/qadevOOo/runner/basicrunner/basichelper/Connector.java b/qadevOOo/runner/basicrunner/basichelper/Connector.java index cc219ac9f416..c53504331209 100644 --- a/qadevOOo/runner/basicrunner/basichelper/Connector.java +++ b/qadevOOo/runner/basicrunner/basichelper/Connector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,13 +46,13 @@ import com.sun.star.lang.XSingleServiceFactory; * connection it writes a connectionString to XConnection. */ public class Connector implements XServiceInfo, XSingleServiceFactory { - /** The service name of this class **/ + /** The service name of this class **/ static final String __serviceName = "basichelper.Connector"; /** The Connector implementation **/ static ConnectorImpl oConnector = null; /** Create a connector. - */ + */ public Connector() { oConnector = new ConnectorImpl(); } @@ -127,7 +127,7 @@ import com.sun.star.lang.XSingleServiceFactory; * @see com.sun.star.lang.XInitialization * @see com.sun.star.lang.XTypeProvider * @see com.sun.star.container.XNameAccess - */ + */ class ConnectorImpl implements XInitialization, XTypeProvider, XNameAccess { static String aState; static Integer iTimeout; diff --git a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java b/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java index f50a7d2eb470..257120aca299 100644 --- a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java +++ b/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,23 +41,23 @@ import com.sun.star.util.URL; * @see com.sun.star.lang.XSingleServiceFactory * @see com.sun.star.lang.XServiceInfo */ -public class DispatchProviderInterceptor implements XServiceInfo, +public class DispatchProviderInterceptor implements XServiceInfo, XSingleServiceFactory { - /** The service name **/ - static final String __serviceName = + /** The service name **/ + static final String __serviceName = "basichelper.DispatchProviderInterceptor"; - /** Create an instance of the interceptor + /** Create an instance of the interceptor * Arguments are not supported here, so they will be ignored. * @param args The arguments. - * @return A new instance of the interceptor. + * @return A new instance of the interceptor. **/ public Object createInstanceWithArguments(Object[] args) { return new InterceptorImpl(); } - /** Create an instance of the interceptor - * @return A new instance of the interceptor. + /** Create an instance of the interceptor + * @return A new instance of the interceptor. **/ public Object createInstance() { return createInstanceWithArguments(null); @@ -111,13 +111,13 @@ public class DispatchProviderInterceptor implements XServiceInfo, /** * The actual implementation of the interceptor. - * @see com.sun.star.lang.XTypeProvider + * @see com.sun.star.lang.XTypeProvider * @see com.sun.star.frame.XDispatchProviderInterceptor * @see com.sun.star.frame.XDispatchProvider */ -class InterceptorImpl implements XDispatchProvider, +class InterceptorImpl implements XDispatchProvider, XDispatchProviderInterceptor, XTypeProvider { - + /** A master dispatch provider **/ public XDispatchProvider master = null; /** A slave dispatch provider **/ @@ -162,7 +162,7 @@ class InterceptorImpl implements XDispatchProvider, public XDispatch queryDispatch(URL url, String frame, int flags) { return master.queryDispatch(url, frame, flags) ; } - + /** * Query for an array of <type>XDispatch</type>. * @param desc A list of dipatch requests. diff --git a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java b/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java index 62909f16dd4f..677a8588bf55 100644 --- a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java +++ b/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public class DocumentHandler implements XServiceInfo, XSingleServiceFactory { /** The log writer (just a wrapper around <code>writer</code>) **/ private PrintWriter log; - /** + /** * Create an instance of the document handler. * @param args A boolean value as <codde>args[0]</code> determines, * if checked XML data is printed to the log. @@ -72,7 +72,7 @@ public class DocumentHandler implements XServiceInfo, XSingleServiceFactory { return oDocumentHandler; } - /** + /** * Create an instance of the document handler. * @return The document handler */ @@ -131,19 +131,19 @@ public class DocumentHandler implements XServiceInfo, XSingleServiceFactory { * @see com.sun.star.container.XNameAccess * @see com.sun.star.lang.XTypeProvider */ -class DocumentHandlerImpl extends XMLTools.XMLChecker - implements XInitialization, XDocumentHandler, +class DocumentHandlerImpl extends XMLTools.XMLChecker + implements XInitialization, XDocumentHandler, XNameAccess, XTypeProvider { /** A string writer **/ private StringWriter writer; - /** + /** * Constructor * @param log_ A log writer. * @param printXML Should XML data be printed to the log? * @param logWriter A wrapper around <code>log_</code> for convenience. */ - public DocumentHandlerImpl(PrintWriter log_, + public DocumentHandlerImpl(PrintWriter log_, boolean printXML, StringWriter logWriter) { super(log_, printXML); writer = logWriter; @@ -151,7 +151,7 @@ class DocumentHandlerImpl extends XMLTools.XMLChecker /** * Initialize this class with rules. - * @param parm1 An array of filter rules: + * @param parm1 An array of filter rules: * <code>processAction()</code> is called for every rule. * @throws com.sun.star.uno.Exception for an incorrect rule. */ @@ -168,7 +168,7 @@ class DocumentHandlerImpl extends XMLTools.XMLChecker * @param filterRule An array building one filter rule. * @throws com.sun.star.uno.Exception for an incorrect rule. */ - private void processActionForXMLChecker(Object[] filterRule) + private void processActionForXMLChecker(Object[] filterRule) throws com.sun.star.uno.Exception { int arrLen = filterRule.length; String oTagName; @@ -221,7 +221,7 @@ class DocumentHandlerImpl extends XMLTools.XMLChecker // Action for constructor Tag(TagName, attrName, attrValue) if (oTag.length == 3) { if ((oTag[1] instanceof String)&&(oTag[2] instanceof String)) { - allTags.add(new Tag(oTagName, + allTags.add(new Tag(oTagName, (String) oTag[1], (String) oTag[2])); } else { throw new com.sun.star.uno.Exception("Error: invalid tag '"+ diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/runner/basicrunner/basichelper/Filter.java index d9616d30e5b2..7a7d2f8e3db4 100644 --- a/qadevOOo/runner/basicrunner/basichelper/Filter.java +++ b/qadevOOo/runner/basicrunner/basichelper/Filter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ import com.sun.star.beans.PropertyValue; * @see com.sun.star.document.XFilter * @see com.sun.star.lang.XServiceInfo * @see com.sun.star.lang.XSingleServiceFactory - */ + */ public class Filter implements XServiceInfo, XSingleServiceFactory { /** The service name of this class **/ static final String __serviceName = "basichelper.Filter"; @@ -262,7 +262,7 @@ class FilterThread extends Thread { FilterImpl.bResult = bOK; } catch (Exception e) { ConnectorImpl.aState = "error"; - throw new RuntimeException("Can't filtering exception" + throw new RuntimeException("Can't filtering exception" + e.toString()); } } diff --git a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java b/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java index ec8957e01a6f..ed576c238271 100644 --- a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java +++ b/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 665980d792ab..b07c3fb8be3d 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ import java.lang.reflect.Method; /** * * @author ll93751 - * + * * I have removed the assure(...) functions from ComplexTestCase due to the fact now I can * use the functions every where and don't need to be a ComplexTestCase any longer. */ diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index b15224bc503f..29befbe4d1fd 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest protected int m_nThreadTimeOut = 0; /** Continue a test even if it did fail **/ // public static final boolean CONTINUE = true; - + /** End a test if it did fail **/ public static final boolean BREAK = true; private boolean m_bBeforeCalled; - + /** * is called before the real test starts */ @@ -97,7 +97,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest t.printStackTrace((PrintWriter) log); } } - + } /** Description entry **/ diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/runner/complexlib/ShowTargets.java index 6f46a389d14b..e8ac360cad32 100644 --- a/qadevOOo/runner/complexlib/ShowTargets.java +++ b/qadevOOo/runner/complexlib/ShowTargets.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/convwatch/Basename.java b/qadevOOo/runner/convwatch/Basename.java index 05381e841eed..b93824fce953 100644 --- a/qadevOOo/runner/convwatch/Basename.java +++ b/qadevOOo/runner/convwatch/Basename.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ package convwatch; // ----------------------------------------------------------------------------- -// Helper stuff to +// Helper stuff to // abstract class Name // { // abstract public String getName(); @@ -41,7 +41,7 @@ package convwatch; // { // public String getName() {return "-test";} // } -// +// // public class Basename /* extends *//* implements */ { // String fs; // Basename() @@ -54,8 +54,8 @@ package convwatch; // String sJPEGName = _sOutputPath + fs + sBaseNameNoSuffix + "-" + _sGS_PageOutput + _aPostNameAdd.getName() + ".jpg"; // return sJPEGName; // } -// +// // public static void main( String[] argv ) { -// +// // } // } diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index 986f6ff6582b..88415fc78c92 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ class BorderRemover * @param _nColor1 * @param _nColor2 * @param _nTolerance is a percentage value how strong the colors could be differ - + */ boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance) { @@ -84,7 +84,7 @@ class BorderRemover int red1 = (_nColor1 >> 16) & 0xff; int green1 = (_nColor1 >> 8) & 0xff; int blue1 = (_nColor1 ) & 0xff; - + // int alpha2 = (_nColor2 >> 24) & 0xff; int red2 = (_nColor2 >> 16) & 0xff; int green2 = (_nColor2 >> 8) & 0xff; @@ -97,11 +97,11 @@ class BorderRemover // calculate tolerance halve double nTolerable = (_nTolerance * 256 / 100); - if (nTolerable < 0) + if (nTolerable < 0) { nTolerable = 0; } - + // X - th < Y < X + th // if ((red1 - nTolerable) < red2 && red2 < (red1 + nTolerable)) // is the same @@ -112,7 +112,7 @@ class BorderRemover { if (Math.abs(blue1 - blue2) < nTolerable) { - return true; + return true; } else { @@ -128,10 +128,10 @@ class BorderRemover { // red differ } - + return false; } - + /** * create a new image from an exist one without it's borders * open the file (_sFilenameFrom) as an image, check if it contains any borders and remove @@ -151,7 +151,7 @@ class BorderRemover // int nb = graphics_stuff.countNotBlackPixel(m_aImage); // System.out.println("not black pixels:" + String.valueOf(nb)); - + int nBorderColor = m_aImage.getPixel(0,0); Rect aInnerRect = findBorder(m_aImage, nBorderColor); @@ -159,20 +159,20 @@ class BorderRemover File aWriteFile = new File(_sFilenameTo); // GlobalLogWriter.get().println("Hello World: File to: " + _sFilenameTo); - + Exception ex = null; try { Class imageIOClass = Class.forName("javax.imageio.ImageIO"); // GlobalLogWriter.get().println("Hello World: get Class"); - + 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) ); - + Method writeMethod = imageIOClass.getDeclaredMethod("write", new Class[]{ java.awt.image.RenderedImage.class, java.lang.String.class, java.io.File.class}); @@ -207,8 +207,8 @@ class BorderRemover return true; } - - + + /** * runs through the image, pixel by pixel * as long as found pixels like the color at (0,0) this is interpreted as border. @@ -223,7 +223,7 @@ class BorderRemover int nXMax = 0; int nYMin = h; int nYMax = 0; - + for (int y = 0; y < h; y++) { for (int x = 0; x < nXMin; x++) @@ -276,8 +276,8 @@ class BorderRemover // create the smalles possible image aRect = new Rect(0,0,1,1); } - - + + // m_nXMin = nXMin; // m_nXMax = nXMax; // m_nYMin = nYMin; @@ -294,8 +294,8 @@ class BorderRemover if (w <= 0 || h <= 0) { throw new IllegalArgumentException("width or height are too small or negative."); - } - + } + BufferedImage aBI = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); int nXOffset = _aRect.getX(); @@ -315,5 +315,5 @@ class BorderRemover // return java.awt.Toolkit.getDefaultToolkit().createImage(aSource); return aBI; } - + } diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java index efb091d160f9..dc60b89e1291 100644 --- a/qadevOOo/runner/convwatch/BuildID.java +++ b/qadevOOo/runner/convwatch/BuildID.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ 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 76dc3522d2e0..138dcef519c0 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ import convwatch.StatusHelper; import helper.URLHelper; import java.io.File; -public class ConvWatch +public class ConvWatch { String getBuildID_FromFile(String _sInfoFile) @@ -50,13 +50,13 @@ public class ConvWatch return sBuildID; } /** - * Check if given document (_sAbsoluteInputFile) and it's postscript representation (_sAbsoluteReferenceFile) produce + * Check if given document (_sAbsoluteInputFile) and it's postscript representation (_sAbsoluteReferenceFile) produce * the same output like the StarOffice / OpenOffice.org which is accessable with XMultiServiceFactory. * Here a simple graphically difference check is run through. * * Hint: In the OutputPath all needed files will create, there must * be very much space. It's not possible to say how much. - * One page need up to 800kb as jpeg. + * One page need up to 800kb as jpeg. * Sample: If a document contains 2 pages, we need 2*800kb for prn * output and 2*800kb for ps output and 2*800kb for it's difference * output. So up to 4800kb or 4.8mb. @@ -65,12 +65,12 @@ public class ConvWatch * * It's also absolutlly impossible to say, how much time this functions consume. */ - + StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA, String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile) throws ConvWatchCancelException { -// TODO: some more checks +// TODO: some more checks if (! FileHelper.exists(_sAbsoluteInputFile)) { @@ -88,7 +88,7 @@ public class ConvWatch File aAbsoluteReferenceFile = new File(_sAbsoluteReferenceFile); if (aAbsoluteReferenceFile.isDirectory()) - { + { String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); String sAbsoluteReferenceFileInfo = _sAbsoluteReferenceFile + fs + sNameNoSuffix + ".info"; @@ -115,8 +115,8 @@ public class ConvWatch throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference directory: '" + _sAbsoluteReferenceFile + "' does not exist."); } } - - + + boolean bAbsoluteReferenceFile = true; if (! FileHelper.exists(_sAbsoluteReferenceFile)) { @@ -130,7 +130,7 @@ public class ConvWatch throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference file: " + _sAbsoluteReferenceFile + " does not exist."); } } - + FileHelper.makeDirectories("", _sOutputPath); // runner.convwatch.compare(); @@ -139,10 +139,10 @@ public class ConvWatch String sInputFile = FileHelper.getBasename(_sAbsoluteInputFile); // System.out.println("InputFile: " + sInputFile); - + String sInputFileNoSuffix = FileHelper.getNameNoSuffix(sInputFile); // System.out.println("BasenameNoSuffix: " + sInputFileNoSuffix); - + String sAbsoluteOutputFile = _sOutputPath + fs + sInputFile; String sAbsoluteOutputFileURL = URLHelper.getFileURLFromSystemPath(sAbsoluteOutputFile); @@ -154,7 +154,7 @@ public class ConvWatch String sAbsolutePrintFile = _sOutputPath + fs + sPostScriptFile; String sAbsolutePrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFile); - + // System.out.println("AbsoluteInputFileURL: " + sAbsoluteInputFileURL); // System.out.println("AbsoluteOutputFileURL: " + sAbsoluteOutputFileURL); // System.out.println("AbsolutePrintFileURL: " + sAbsolutePrintFileURL); @@ -163,7 +163,7 @@ public class ConvWatch OfficePrint.printToFile(_aGTA, sAbsoluteInputFileURL, sAbsoluteOutputFileURL, sAbsolutePrintFileURL); // wait(2); - + if (! FileHelper.exists(sAbsolutePrintFile)) { throw new ConvWatchCancelException("createPostscriptStartCheck: Printed file " + sAbsolutePrintFile + " does not exist."); @@ -181,16 +181,16 @@ public class ConvWatch throw new ConvWatchCancelException("createPostscriptStartCheck: Given reference file: " + _sAbsoluteReferenceFile + " does not exist, after try to copy."); } } - + PRNCompare a = new PRNCompare(); String sInputPath = FileHelper.getPath(_sAbsoluteInputFile); String sReferencePath = FileHelper.getPath(_sAbsoluteReferenceFile); // String sReferenceFile = FileHelper.getBasename(sAbsoluteReferenceFile); - + // System.out.println("InputPath: " + sInputPath); // System.out.println("sReferencePath: " + sReferencePath); // System.out.println("sReferenceFile: " + sReferenceFile); - + a.setInputPath( sInputPath ); a.setReferencePath( sReferencePath ); a.setOutputPath( _sOutputPath ); @@ -213,7 +213,7 @@ public class ConvWatch a.setMaxPages(9999); } } - + a.setResolutionInDPI(_aGTA.getResolutionInDPI()); a.setBorderMove(_aGTA.getBorderMove()); a.setDocumentType(_aGTA.getDocumentType()); @@ -223,7 +223,7 @@ public class ConvWatch _aGTA.setBorderMove(a.getBorderMove()); return aList; } - + // ----------------------------------------------------------------------------- // This creates a status for exact on document static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID) @@ -235,14 +235,14 @@ public class ConvWatch // String sHTMLFile = _sFilenamePrefix + sNameNoSuffix + ".html"; // HTMLOutputter HTMLoutput = HTMLOutputter.create(_sOutputPath, sHTMLFile, "", ""); // HTMLoutput.header(sNameNoSuffix); -// TODO: version info was fine +// TODO: version info was fine // HTMLoutput.checkSection(sBasename); // Status end String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, "", ""); INIoutput.createHeader(); -// TODO: version info was fine +// TODO: version info was fine INIoutput.writeSection("global"); INIoutput.writeValue("pages", String.valueOf(aList.length)); @@ -256,7 +256,7 @@ public class ConvWatch { INIoutput.writeSection("page" + String.valueOf(i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1) aList[i].printStatus(); - + boolean bCurrentResult = true; // result over exact one page int nCurrentDiffStatus = aList[i].nDiffStatus; @@ -294,7 +294,7 @@ public class ConvWatch INIoutput.close(); return bResultIsOk; } - + // ----------------------------------------------------------------------------- static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID) @@ -330,7 +330,7 @@ public class ConvWatch // HTMLoutput.close(); INIoutput.close(); } - + // ----------------------------------------------------------------------------- @@ -355,7 +355,7 @@ public class ConvWatch } return bResultIsOk; } - + // ----------------------------------------------------------------------------- public static boolean checkDiffDiff(GraphicalTestArguments _aGTA, String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile, @@ -396,7 +396,7 @@ public class ConvWatch String sSourceFile1 = sDiffBasename; String sSourcePath2 = _sAbsoluteDiffPath; String sSourceFile2 = sDiffBasename; - + StatusHelper aCurrentStatus = aCompare.checkDiffDiff(_sOutputPath, sSourcePath1, sSourceFile1, sSourcePath2, sSourceFile2); boolean bCurrentResult = (aCurrentStatus.nDiffStatus == StatusHelper.DIFF_NO_DIFFERENCES); // logic: nDiff==0 = true if there is no difference bDiffIsOk &= bCurrentResult; @@ -417,7 +417,7 @@ public class ConvWatch } return bDiffIsOk; } - + // public static void main( String[] argv ) // { // PRNCompare a = new PRNCompare(); @@ -425,7 +425,7 @@ public class ConvWatch // a.setDocFile( "1_Gov.ppt"); // a.setReferencePath( "/cws/so-cwsserv06/qadev18/SRC680/src.m47/convwatch.keep/input/msoffice/xp/PowerPoint"); // a.setReferenceFile( "1_Gov.prn" ); - // + // // a.setOutputPath( "/tmp/convwatch_java"); // a.setPostScriptFile("1_Gov.ps" ); // } diff --git a/qadevOOo/runner/convwatch/ConvWatchCancelException.java b/qadevOOo/runner/convwatch/ConvWatchCancelException.java index 2042f600b4cc..27b8ddceed81 100644 --- a/qadevOOo/runner/convwatch/ConvWatchCancelException.java +++ b/qadevOOo/runner/convwatch/ConvWatchCancelException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/convwatch/ConvWatchException.java b/qadevOOo/runner/convwatch/ConvWatchException.java index f0fab0852deb..3493a4984008 100644 --- a/qadevOOo/runner/convwatch/ConvWatchException.java +++ b/qadevOOo/runner/convwatch/ConvWatchException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ package convwatch; -public class ConvWatchException extends Exception +public class ConvWatchException extends Exception { public ConvWatchException(String _aMessage) { diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index c81ba3dfca85..1d7bbdee0681 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,7 +155,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase /** - * + * * @return a List of software which must accessable as an external executable */ protected Object[] mustInstalledSoftware() @@ -178,11 +178,11 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // Ghostscript aList.add( "gswin32c.exe -version" ); } - + return aList.toArray(); } - + /** * The test method itself. * Don't try to call it from outside, it is started only from qadevOOo runner @@ -205,7 +205,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase { return; } - + initMember(); aGTA.allowStore(); @@ -220,7 +220,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // } String fs = System.getProperty("file.separator"); - + String sHTMLName = "index.html"; File aInputPathTest = new File(m_sInputPath); if (!aInputPathTest.isDirectory()) @@ -295,13 +295,13 @@ public class ConvWatchStarter extends EnhancedComplexTestCase runGDCWithStatus(HTMLoutput, LISToutput, m_sInputPath, m_sOutputPath, m_sReferencePath, m_sDiffPath, ""); } } - + LISToutput.close(); HTMLoutput.close(); log.println("The file '" + HTMLoutput.getFilename() + "' shows a html based status."); DB.writeHTMLFile(HTMLoutput.getFilename()); } - + // ----------------------------------------------------------------------------- void runGDCWithStatus(HTMLOutputter _aHTMLoutput, LISTOutputter _aLISToutput, String _sInputFile, String _sOutputPath, String _sReferencePath, String _sDiffPath, String _sNewSubDir ) @@ -317,7 +317,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // { // aSemaphore.P(aSemaphore.getSemaphoreFile()); // } - + aGTA.getPerformance().startTime(PerformanceContainer.OfficeStart); aProvider = new OfficeProvider(); XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param); @@ -328,7 +328,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase aGTA = getGraphicalTestArguments(); // get new TestArguments aGTA.getPerformance().setTime(PerformanceContainer.OfficeStart, nStartTime); } - + // Watcher Object is need in log object to give a simple way to say if a running office is alive. // As long as a log comes, it pings the Watcher and says the office is alive, if not an // internal counter increase and at a given point (300 seconds) the office is killed. @@ -371,7 +371,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase sStatusRunThrough = "FAILED, FAILED"; DB.destination_failed(sStatusRunThrough, sStatusMessage); } - + GlobalLogWriter.get().println("Watcher count is: " + aWatcher.getPing()); // Office shutdown @@ -441,5 +441,5 @@ public class ConvWatchStarter extends EnhancedComplexTestCase } - + } diff --git a/qadevOOo/runner/convwatch/CrashLoopTest.java b/qadevOOo/runner/convwatch/CrashLoopTest.java index 6eb7b35391b8..daab40c3a9f7 100644 --- a/qadevOOo/runner/convwatch/CrashLoopTest.java +++ b/qadevOOo/runner/convwatch/CrashLoopTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ public class CrashLoopTest extends ReferenceBuilder return new String[]{"testcrashandloops"}; } - public void testcrashandloops() + public void testcrashandloops() { buildreference(); } - + } diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 4f6ab74a738b..071f390cf9e2 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -15,7 +15,7 @@ public class DB extends DBHelper private DB() { } - + private static synchronized DB getDB() { if (m_aDB == null) @@ -38,17 +38,17 @@ public class DB extends DBHelper getDB().fillVariables(_sDBInfoString); getDB().updatestate_status("source started"); } - + public static void test() { getDB().sql_test(); } - + public static void source_start() { getDB().updatestate_status("source started"); } - + public static void source_finished() { getDB().updatestate_status( "source finished"); @@ -64,7 +64,7 @@ public class DB extends DBHelper { getDB().updatestate_status("destination started"); } - + public static void destination_finished() { getDB().updatestate_status("PASSED-OK"); @@ -87,14 +87,14 @@ public class DB extends DBHelper { getDB().updatehtmlfile_status(_sHTMLFile); } - - public static void writeToDB(String _sFilename, - String _sBasename, - String _sFileFormat, - String _sBuildID, - String _sSourceType, + + public static void writeToDB(String _sFilename, + String _sBasename, + String _sFileFormat, + String _sBuildID, + String _sSourceType, int _nResolution ) - { + { GlobalLogWriter.get().println("DB: Filename:" + _sFilename); GlobalLogWriter.get().println("DB: Basename:" + _sBasename); GlobalLogWriter.get().println("DB: FileFormat:" + _sFileFormat); @@ -102,7 +102,7 @@ public class DB extends DBHelper GlobalLogWriter.get().println("DB: SourceType:" + _sSourceType); GlobalLogWriter.get().println("DB: Resolution:" + _nResolution); } - + private String getEnvironment() { if (OSHelper.isWindows()) @@ -129,7 +129,7 @@ public class DB extends DBHelper return ""; } } - + // fill some db access important variables with values given out of a simple string // DOC_COMPARATOR_DB_INFO_STRING=p:m220,c:m224,d:demo_lla,src:m220,dest:m224,doc:demo_lla,id:294,distinct:81 @@ -137,7 +137,7 @@ public class DB extends DBHelper { fillDBConnection(_sInfo); m_sEnvironment = getEnvironment(); - + StringTokenizer aTokenizer = new StringTokenizer(_sInfo,",",false); while (aTokenizer.hasMoreTokens()) { @@ -187,21 +187,21 @@ public class DB extends DBHelper } } } - - // public static void insertinto_file(String _sFilename, - // String _sBasename, - // String _sFileFormat, - // String _sBuildID, - // String _sSourceType, + + // public static void insertinto_file(String _sFilename, + // String _sBasename, + // String _sFileFormat, + // String _sBuildID, + // String _sSourceType, // int _nResolution ) // { // Connection aCon = new ShareConnection().getConnection(); - // + // // String sFilename = _sFilename.replace('\\', '/'); - // + // // String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename); // ExecSQL(aCon, sDeleteOld); - // + // // String sValueLine = "type, filename, basename, fileformat, buildid, resolution, date"; // StringBuffer aDataLine = new StringBuffer(); // aDataLine.append( Quote(_sSourceType) ) . append( sComma ) . @@ -210,21 +210,21 @@ public class DB extends DBHelper // append( Quote( _sFileFormat) ) . append( sComma ) . // append( Quote( _sBuildID) ) . append( sComma ) . // append( _nResolution) . append( sComma ) . - // append( Quote( today() ) ); - // + // append( Quote( today() ) ); + // // SQLinsertValues(aCon, "file", sValueLine, aDataLine.toString()); // } - - // public static void updatestate_currentdocs(String _sFilename, + + // public static void updatestate_currentdocs(String _sFilename, // String _sState) // { // Connection aCon = new ShareConnection().getConnection(); - // + // // String sFilename = _sFilename.replace('\\', '/'); - // + // // // String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename); // // ExecSQL(aCon, sDeleteOld); - // + // // String sSet = "state=" + Quote(_sState); // String sWhere = getWhereClause() + sAND + "name=" + Quote(sFilename); // SQLupdateValue( aCon, "currentdocs", sSet, sWhere ); @@ -242,9 +242,9 @@ public class DB extends DBHelper Connection oCon = null; ArrayList aResultList = new ArrayList(); try - { + { oStmt = _aCon.createStatement(); - + java.sql.ResultSet aResultSet = oStmt.executeQuery(_sSQL); java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); @@ -261,8 +261,8 @@ public class DB extends DBHelper try { Object aObj = null; - - + + aResult.append("sqlresult: "); for (int i=1;i<=nColumnCount;i++) { @@ -281,7 +281,7 @@ public class DB extends DBHelper sValue = String.valueOf(nValue); break; } - + default: sValue = "UNSUPPORTED TYPE"; } @@ -296,7 +296,7 @@ public class DB extends DBHelper catch (java.sql.SQLException e) { } - } + } } catch (java.sql.SQLException e) { @@ -306,16 +306,16 @@ public class DB extends DBHelper } return aResultList; } - + private void updatestate_status(String _sStatus) { Connection aCon = new ShareConnection().getConnection(); - + // String sInfo = _sInfo.replace('\\', '/'); // String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename); // ExecSQL(aCon, sDeleteOld); - + String sSet = "state=" + Quote(_sStatus); String sWhere = getWhereClause(); if (sWhere.length() > 0) @@ -326,12 +326,12 @@ public class DB extends DBHelper private void updateinfo_status(String _sInfo) { Connection aCon = new ShareConnection().getConnection(); - + // String sInfo = _sInfo.replace('\\', '/'); // String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename); // ExecSQL(aCon, sDeleteOld); - + String sSet = "info=" + Quote(_sInfo); String sWhere = getWhereClause(); SQLupdateValue( aCon, "status", sSet, sWhere ); @@ -339,7 +339,7 @@ public class DB extends DBHelper private void updateerrorfile_status(String _sErrorFile) { Connection aCon = new ShareConnection().getConnection(); - + String sErrorFile = _sErrorFile.replace('\\', '/'); String sSet = "errorfile=" + Quote(sErrorFile); @@ -349,7 +349,7 @@ public class DB extends DBHelper private void updatehtmlfile_status(String _sHtmlFile) { Connection aCon = new ShareConnection().getConnection(); - + String sHtmlFile = _sHtmlFile.replace('\\', '/'); String sSet = "htmlfile=" + Quote(sHtmlFile); @@ -363,10 +363,10 @@ public class DB extends DBHelper String sSet = "pagecount=" + _nPageCount; String sWhere = getWhereClause(); SQLupdateValue( aCon, "documents", sSet, sWhere ); - + } - - + + private String getWhereClause() { StringBuffer aWhereClause = new StringBuffer(); @@ -394,7 +394,7 @@ public class DB extends DBHelper } return aWhereClause.toString(); } - + private String getDBDistinct() { Connection aCon = new ShareConnection().getConnection(); @@ -427,10 +427,10 @@ public class DB extends DBHelper } // System.out.println(sResult); } - + return "0"; } - + public static void insertinto_documentcompare(String _sSourceVersion, String _sSourceName, String _sSourceCreatorType, String _sDestinationVersion, String _sDestinationName, String _sDestinationCreatorType, String _sDocumentPoolDir, String _sDocumentPoolName, String _sMailAddress, @@ -441,7 +441,7 @@ public class DB extends DBHelper _sDocumentPoolDir, _sDocumentPoolName, _sMailAddress, _sSpecial, _sParentDistinct); } - + private void insertinto_documentcompare_impl(String _sSourceVersion, String _sSourceName, String _sSourceCreatorType, String _sDestinationVersion, String _sDestinationName, String _sDestinationCreatorType, String _sDocumentPoolDir, String _sDocumentPoolName, String _sMailAddress, @@ -452,7 +452,7 @@ public class DB extends DBHelper { _sParentDistinct = ""; } - + Connection aCon = new ShareConnection().getConnection(); String sValueLine="dbdistinct2, environment, sourceversion, sourcename, sourcecreatortype, destinationversion, destinationname, destinationcreatortype, documentpoolpath, documentpool, mailfeedback, state, special, parentdistinct, startdate"; @@ -473,7 +473,7 @@ public class DB extends DBHelper append( Quote( _sSpecial ) ) . append( sComma ) . append( Quote( _sParentDistinct ) ) . append( sComma ) . append( Quote( today() )); - + SQLinsertValues(aCon, "documentcompare", sValueLine, aDataLine.toString()); } @@ -481,25 +481,25 @@ public class DB extends DBHelper // { // if (_sDBInfoString == null) return; // fillVariables(_sDBInfoString); - // + // // Connection aCon = new ShareConnection().getConnection(); - // + // // String sDeleteSQL = "DELETE FROM currentdocs WHERE " + getWhereClause(); - // + // // ExecSQL(aCon, sDeleteSQL); // } - // + // // public static void fileInsert(String _sDBInfoString, // String _sFilename, // String _sRemovePath) // { // if (_sDBInfoString == null) return; // fillVariables(_sDBInfoString); - // + // // String sFilename = _sFilename.replace('\\', '/'); - // + // // Connection aCon = new ShareConnection().getConnection(); - // + // // String sValueLine = "environment, referenceversion, currentversion, documentpool, name, state"; // StringBuffer aDataLine = new StringBuffer(); // aDataLine.append( Quote(m_sEnvironment) ) . append( sComma ) . @@ -508,33 +508,33 @@ public class DB extends DBHelper // append( Quote( m_sDocumentPool) ) . append( sComma ) . // append( Quote( sFilename) ) . append( sComma ) . // append( Quote( "undone")); - // + // // SQLinsertValues(aCon, "currentdocs", sValueLine, aDataLine.toString()); // } - + // public static void insertinto_file(String _sFilename, String _sFileFormat, String _sBuildID) // { // Connection aCon = new ShareConnection().getConnection(); - // + // // String sValueLine = "type, filename, fileformat, buildid, date"; // StringBuffer aDataLine = new StringBuffer(); // aDataLine.append( "1" ) . append( sComma ) . // append( Quote( _sFilename) ) . append( sComma ) . // append( Quote( _sFileFormat) ) . append( sComma ) . // append( Quote( _sBuildID) ) . append( sComma ) . - // append( Quote( today() ) ); - // + // append( Quote( today() ) ); + // // SQLinsertValues(aCon, "file", sValueLine, aDataLine.toString()); // } - - // public static void main( String[] args ) + + // public static void main( String[] args ) // { - // + // // String _sFilename = ""; // String _sFileFormat = ""; // String _sBuildID = ""; - // + // // // insertinto_file("c:\temp\test.txt", "test", "txt", "nix", "", 0); // fillVariables("p:m128,c:m134,d:demo"); // } diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index e28fafb65ec4..30df13123b99 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ class ShareConnection private Connection m_aConnection = null; public ShareConnection() {} - + public Connection getConnection() { if (m_aConnection == null) { try - { + { m_aConnection = DBHelper.getMySQLConnection(); } catch(java.sql.SQLException e) @@ -69,7 +69,7 @@ class ShareConnection m_aCon = _aCon; m_sSQL = _sSQL; } - + public void run() { Statement oStmt = null; @@ -78,13 +78,13 @@ class ShareConnection GlobalLogWriter.get().println("DB: ERROR: in ExecSQL, connection not established."); return; } - + // Connection oCon = null; try - { + { // oCon = getMySQLConnection(); oStmt = m_aCon.createStatement(); - + GlobalLogWriter.get().println("DB: " + m_sSQL); /* ResultSet oResult = */ oStmt.executeUpdate(m_sSQL); @@ -103,8 +103,8 @@ public class DBHelper * This method inserts given values into<br> * the table 'states' * @param values a set of comma separated values to be inserted - */ - + */ + public void SQLinsertValues(Connection _aCon, String _sTableName, String value_names, String values) { if (_aCon == null) @@ -112,13 +112,13 @@ public class DBHelper GlobalLogWriter.get().println("DB: ERROR: in SQLinsertValues, connection not established."); return; } - + // String aInsertStr = ""; - // + // // aInsertStr = "INSERT INTO " + _sTableName + " (" + value_names + " ) VALUES (" + values + ")"; // ExecSQL(_aCon, aInsertStr); StringBuffer aInsertStr = new StringBuffer(); - + aInsertStr.append( "INSERT INTO " ) . append( _sTableName ); aInsertStr.append( " (").append( value_names ).append ( ")" ); aInsertStr.append(" VALUES (" ).append( values ).append( ")" ); @@ -132,13 +132,13 @@ public class DBHelper GlobalLogWriter.get().println("DB: ERROR: in SQLinsertValues, connection not established."); return; } - + // String aUpdateStr = ""; - // + // // aUpdateStr = "UPDATE " + _sTableName + " SET " + _sSet + " WHERE " + _sWhere; // ExecSQL( _aCon, aUpdateStr ); StringBuffer aUpdateStr = new StringBuffer(); - + aUpdateStr.append( "UPDATE " ).append( _sTableName ) .append( " SET " ).append( _sSet ) .append( " WHERE " ).append( _sWhere ); @@ -149,7 +149,7 @@ public class DBHelper private static String m_sDBName; private static String m_sDBUser; private static String m_sDBPasswd; - + protected synchronized void fillDBConnection(String _sInfo) { StringTokenizer aTokenizer = new StringTokenizer(_sInfo,",",false); @@ -175,12 +175,12 @@ public class DBHelper } } } - + /** * This method establishes a Connection<br> * with the database 'module_unit' on jakobus - */ - + */ + public static Connection getMySQLConnection() throws SQLException { try @@ -206,28 +206,28 @@ public class DBHelper * module/platform combination * @param mdl the name of the module, e.g. sal * @param os the name of the platform, e.g. unxsols - */ + */ // LLA: public static void SQLdeleteValues(Connection _aCon, String _sEnvironment, String _sUnitName, String _sMethodName, String _sCWS, String _sDate) // LLA: { - // LLA: String sSQL = + // LLA: String sSQL = // LLA: "DELETE FROM states WHERE " + // LLA: " unit=" + DatabaseEntry.Quote(_sUnitName) + - // LLA: " AND pf=" + DatabaseEntry.Quote (_sEnvironment) + + // LLA: " AND pf=" + DatabaseEntry.Quote (_sEnvironment) + // LLA: " AND meth=" + DatabaseEntry.Quote (_sMethodName) + // LLA: " AND cws=" + DatabaseEntry.Quote(_sCWS) + // LLA: " AND dt=" + DatabaseEntry.Quote(_sDate); - // LLA: + // LLA: // LLA: // ExecSQL(_aCon, sSQL); // LLA: } - + protected synchronized void ExecSQL(Connection _aCon, String _sSQL) { MySQLThread aSQLThread = new MySQLThread(_aCon, _sSQL); aSQLThread.start(); } + - - + // public static int QueryIntFromSQL(String _sSQL, String _sColumnName, String _sValue) // { // boolean bNeedSecondTry = false; @@ -255,10 +255,10 @@ public class DBHelper Connection oCon = null; int nValue = 0; try - { + { // oCon = getMySQLConnection(); oStmt = _aCon.createStatement(); - + ResultSet oResult = oStmt.executeQuery(_sSQL); oResult.next(); @@ -301,7 +301,7 @@ public class DBHelper } return ts + _sToQuote + ts; } - + /* default date format in the MySQL DB yyyy-MM-dd */ public static String today() { diff --git a/qadevOOo/runner/convwatch/DateHelper.java b/qadevOOo/runner/convwatch/DateHelper.java index 59207ea3ee3a..d551a8b3c75b 100755 --- a/qadevOOo/runner/convwatch/DateHelper.java +++ b/qadevOOo/runner/convwatch/DateHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ public class DateHelper { return getDateString("yyyyMMdd-HHmmss"); } - + public static String getDateTimeForHumanreadableLog() { return getDateString("[yyyy/MM/dd hh:mm:ss]"); @@ -48,7 +48,7 @@ public class DateHelper { GregorianCalendar aCalendar = new GregorianCalendar(); StringBuffer aBuf = new StringBuffer(); - + Locale aLocale = new Locale("en","US"); SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale); aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) ); diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index a15d790b9c25..74b6097c1798 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import java.util.ArrayList; * @author Lars.Langhans@sun.com */ public class DirectoryHelper -{ +{ ArrayList m_aFileList = new ArrayList(); boolean m_bRecursiveIsAllowed = true; @@ -45,12 +45,12 @@ public class DirectoryHelper { m_bRecursiveIsAllowed = _bValue; } - + /** * Traverse over a given directory, and filter with a given FileFilter * object and gives back the deep directory as a Object[] list, which * contain a String object for every directory entry. - * + * * <B>Example</B> * List directory /bin, filter out all files which ends with '.prn' * @@ -65,14 +65,14 @@ public class DirectoryHelper * return true; * } * }; - * + * * Object[] aList = DirectoryHelper.traverse("/bin", aFileFilter); * for (int i=0;i<aList.length;i++) * { * String aEntry = (String)aList[i]; * System.out.println(aEntry); * } - * + * */ public static Object[] traverse( String _sDirectory, FileFilter _aFileFilter, boolean _bRecursiveIsAllowed ) { @@ -81,7 +81,7 @@ public class DirectoryHelper a.traverse_impl(_sDirectory, _aFileFilter); return a.m_aFileList.toArray(); } - + public static Object[] traverse( String _sDirectory, boolean _bRecursiveIsAllowed ) { DirectoryHelper a = new DirectoryHelper(); @@ -89,8 +89,8 @@ public class DirectoryHelper a.traverse_impl(_sDirectory, null); return a.m_aFileList.toArray(); } - - void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) + + void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) { File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception @@ -98,7 +98,7 @@ public class DirectoryHelper { throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); } - + // Getting all files and directories in the current directory File[] aDirEntries; if (_aFileFilter != null) @@ -109,7 +109,7 @@ public class DirectoryHelper { aDirEntries = fileDirectory.listFiles(); } - + // Iterating for each file and directory for ( int i = 0; i < aDirEntries.length; ++i ) { @@ -121,7 +121,7 @@ public class DirectoryHelper traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter ); } } - else + else { // adding file to List try @@ -145,7 +145,7 @@ public class DirectoryHelper // { // String sDirectory = "/misc/convwatch/gfxcmp/data/doc-pool/demo"; // Object[] aDirectoryList = DirectoryHelper.traverse( sDirectory, false ); - // + // // for (int i=0;i<aDirectoryList.length;i++) // { // String sEntry = (String)aDirectoryList[i]; diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index f6583dd5fdbc..e0a567d6c2b9 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public class DocumentConverter extends EnhancedComplexTestCase log.println("found " + PropertyName.DOC_COMPARATOR_INPUT_PATH + " " + sINPATH); m_sInputPath = sINPATH; } - + // REFERENCE_PATH ---------- String sREF = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_PATH ); if (sREF == null || sREF.length() == 0) @@ -122,21 +122,21 @@ public class DocumentConverter extends EnhancedComplexTestCase log.println("found " + PropertyName.DOC_COMPARATOR_REFERENCE_PATH + " " + sREF); m_sReferencePath = sREF; } - + if (bQuit == true) { // log.println("must quit."); assure("Must quit, Parameter problems.", false); } - + if (m_sInputPath.startsWith("file:") || m_sReferencePath.startsWith("file:")) { assure("We can't handle file: URL right, use system path instead.", false); } - + } - + /** * Function returns a List of software which must accessable as an external executable */ @@ -148,7 +148,7 @@ public class DocumentConverter extends EnhancedComplexTestCase } // the test ====================================================================== - public void convert() + public void convert() { GlobalLogWriter.set(log); // check if all need software is installed and accessable @@ -162,7 +162,7 @@ public class DocumentConverter extends EnhancedComplexTestCase { assure("Must quit", false); } - + initMember(); File aInputPath = new File(m_sInputPath); @@ -173,7 +173,7 @@ public class DocumentConverter extends EnhancedComplexTestCase String sRemovePath = aInputPath.getAbsolutePath(); // a whole directory FileFilter aFileFilter = FileHelper.getFileFilter(); - + Object[] aList = DirectoryHelper.traverse(m_sInputPath, aFileFilter, aGTA.includeSubDirectories()); for (int i=0;i<aList.length;i++) { @@ -218,7 +218,7 @@ public class DocumentConverter extends EnhancedComplexTestCase param.put("ServiceFactory", xMSF); } GraphicalTestArguments aGTA = getGraphicalTestArguments(); - + if (aGTA.getOfficeProgram().toLowerCase().equals("msoffice")) { // ReferenceType is MSOffice @@ -238,7 +238,7 @@ public class DocumentConverter extends EnhancedComplexTestCase { sOutputFile += fs + sInputFileBasename; } - + a.storeToFileWithMSOffice(aGTA, _sInputFile, sOutputFile); } catch(ConvWatchCancelException e) @@ -265,7 +265,7 @@ public class DocumentConverter extends EnhancedComplexTestCase assure(e.getMessage(), false); } } - + if (aGTA.restartOffice()) { // Office shutdown diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java index 7c51940d7801..38b972b8b525 100644 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase // { // // System.out.println("before()"); // } - // + // // public void after() // { // // System.out.println("after()"); @@ -90,7 +90,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase } } } - + // ----------------------------------------------------------------------------- protected abstract Object[] mustInstalledSoftware(); @@ -111,7 +111,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase } return false; } - + // ----------------------------------------------------------------------------- public GraphicalTestArguments getGraphicalTestArguments() @@ -124,7 +124,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase if (aGTA.getExportFilterName() != null && aGTA.getExportFilterName().toLowerCase().equals("help")) { aGTA = null; - } + } return aGTA; } } diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 2ff9ede2f8d4..e0e003246779 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ public class FileHelper String sOSName = System.getProperty("os.name"); String sOSArch = System.getProperty("os.arch"); String sOSVersion = System.getProperty("os.version"); - + GlobalLogWriter.get().println(sOSName); GlobalLogWriter.get().println(sOSArch); GlobalLogWriter.get().println(sOSVersion); } - + public static void MessageBox(String _sStr) { String sVersion = System.getProperty("java.version"); @@ -75,17 +75,17 @@ public class FileHelper // System.out.println( _sFile ); // System.out.println( aFile.getAbsolutePath() ); // MessageBox("Der JavaProzess wartet auf eine interaktion ihrerseits."); - // + // // File aFile2 = new File(_sFile); // if (aFile2.exists()) // { // System.out.println("Thanks, file exists." ); // return true; // } - // } + // } return false; } - + public static boolean isDir(String _sDir) { if (_sDir == null) return false; @@ -104,7 +104,7 @@ public class FileHelper } return false; } - + public static String getBasename(String _sFilename) { if (_sFilename == null) return ""; @@ -128,7 +128,7 @@ public class FileHelper } return _sFilename; } - + public static String getSuffix(String _sFilename) { if (_sFilename == null) return ""; @@ -139,7 +139,7 @@ public class FileHelper } return ""; } - + public static String getPath(String _sFilename) { if (_sFilename == null) return ""; @@ -155,19 +155,19 @@ public class FileHelper /* static ArrayList files = new ArrayList(); - public static Object[] traverse( String afileDirectory ) + public static Object[] traverse( String afileDirectory ) { - + File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception if ( !fileDirectory.isDirectory() ) { throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); } - + // Getting all files and directories in the current directory File[] entries = fileDirectory.listFiles(); - + // Iterating for each file and directory for ( int i = 0; i < entries.length; ++i ) { @@ -206,7 +206,7 @@ public class FileHelper first = path.substring(0, n); path = path.substring(n + 1); } - + String already_done = null; StringTokenizer path_tokenizer = new StringTokenizer(path,fs,false); already_done = first; @@ -218,7 +218,7 @@ public class FileHelper // System.out.println(already_done); //create the directory new_dir.mkdirs(); - if (OSHelper.isUnix() && + if (OSHelper.isUnix() && _sMode.length() > 0) { try @@ -237,7 +237,7 @@ public class FileHelper public static void chmod(File file, String mode) throws java.io.IOException { Runtime.getRuntime().exec - (new String[] + (new String[] {"chmod", mode, file.getAbsolutePath()}); } @@ -274,7 +274,7 @@ public class FileHelper sSubDirs = sSubDirs.substring(1); } } - + return sSubDirs; } @@ -340,7 +340,7 @@ public class FileHelper return bDebug; } - public static void copy(String _sSource, String _sDestination) + public static void copy(String _sSource, String _sDestination) { try { @@ -350,10 +350,10 @@ public class FileHelper java.io.FileReader in = new java.io.FileReader(inputFile); java.io.FileWriter out = new java.io.FileWriter(outputFile); int c; - + while ((c = in.read()) != -1) out.write(c); - + in.close(); out.close(); } @@ -363,12 +363,12 @@ public class FileHelper GlobalLogWriter.get().println("Message: " + e.getMessage()); } } - + /** * Within the directory run through, it's possible to say which file extension types should not * consider like '*.prn' because it's not a document. * - * @return a FileFilter function + * @return a FileFilter function */ public static FileFilter getFileFilter() { @@ -381,7 +381,7 @@ public class FileHelper { return false; } - + if (pathname.getName().endsWith(".prn")) { return false; @@ -395,7 +395,7 @@ public class FileHelper if (pathname.getName().endsWith("_")) { return false; - } + } return true; } }; diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 3d49703dc995..0f6df3538b93 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,9 +27,9 @@ /** * Helper class to hold a Filename or a FileURL - * Something like File in Java, + * Something like File in Java, * with some more extensions direct to ConvWatch and it's name conventions - * + * * */ package convwatch; @@ -42,7 +42,7 @@ import util.utils; interface Filenamer { public String getSuffix(); - public String getFileURL(); + public String getFileURL(); public String getAbsoluteSystemFilename(); public String getFilename(); public String getSystemPath(); @@ -57,7 +57,7 @@ abstract class FilenameHelper_impl implements Filenamer String m_sFilename; String m_sSuffix; int m_nNumber = 0; - + public String getNumber() { return StringHelper.createValueString(m_nNumber, 4); @@ -70,17 +70,17 @@ abstract class FilenameHelper_impl implements Filenamer { fs = System.getProperty("file.separator"); } - + /** * initialise a FilenameHelper_impl with a complete filename. * if the filename starts with 'file:///' it is interpret as a file URL - * + * */ public FilenameHelper_impl() { initMember(); } - + public void setCompleteFilename(String _sFilename) { if (_sFilename.startsWith("file:///")) @@ -109,27 +109,27 @@ abstract class FilenameHelper_impl implements Filenamer String sPath = checkPath(_sPath); String sFilename = checkFilename(_sName); String sSuffix = checkSuffix(_sSuffix); - + m_sPath = sPath; m_sFilename = sFilename; m_sSuffix = sSuffix; } - + /** * @return the current path as a OOo path URL */ - public String getFileURL() + public String getFileURL() { String sSystemPath = createAbsoluteFilename(); String sFileURL = URLHelper.getFileURLFromSystemPath(sSystemPath); return sFileURL; } - + /** * @return the current path as a system path */ - public String getAbsoluteSystemFilename() + public String getAbsoluteSystemFilename() { String sSystemFilename = createAbsoluteFilename(); sSystemFilename = utils.replaceAll13(sSystemFilename, "/", fs); @@ -154,7 +154,7 @@ abstract class FilenameHelper_impl implements Filenamer { m_sPath = _sName; } - + /** * @return a created name */ @@ -162,7 +162,7 @@ abstract class FilenameHelper_impl implements Filenamer // { // return getName(); // } - + /** * @return the complete filename with it's suffix */ @@ -187,7 +187,7 @@ abstract class FilenameHelper_impl implements Filenamer { return FileHelper.isDir(getSystemPath()); } - + /** * @return true, if the file really exist. */ @@ -195,10 +195,10 @@ abstract class FilenameHelper_impl implements Filenamer { return FileHelper.exists(createAbsoluteFilename()); } - + /** * @return the current suffix - */ + */ public String getSuffix() { return m_sSuffix; @@ -210,7 +210,7 @@ abstract class FilenameHelper_impl implements Filenamer { return m_sPath + fs + getFilename(); } - + /* * remove follows 'file separators' */ @@ -227,7 +227,7 @@ abstract class FilenameHelper_impl implements Filenamer } return sPath; } - + String checkFilename(String _sFilename) { String sFilename; @@ -241,7 +241,7 @@ abstract class FilenameHelper_impl implements Filenamer } return sFilename; } - + String checkSuffix(String _sSuffix) { String sSuffix; @@ -255,13 +255,13 @@ abstract class FilenameHelper_impl implements Filenamer } return sSuffix; } - + String splitSuffix(String _sName) { String sSuffix = FileHelper.getSuffix(_sName); return checkSuffix(sSuffix); } - + public boolean equals(FilenameHelper_impl _aOtherFN) { String sPath = createAbsoluteFilename(); @@ -272,7 +272,7 @@ abstract class FilenameHelper_impl implements Filenamer } return false; } - + } /** @@ -284,7 +284,7 @@ class OriginalFilename extends FilenameHelper_impl { return getName(); } - + public OriginalFilename(){} public OriginalFilename(String _path, String _filename, String _ext) { super(_path, _filename, _ext);} } @@ -302,7 +302,7 @@ class OriginalReferenceFilename extends FilenameHelper_impl { return getName(); } - public OriginalReferenceFilename(){} + public OriginalReferenceFilename(){} public OriginalReferenceFilename(String _path, String _filename, String _ext) { super(_path, _filename, _ext);} } @@ -323,7 +323,7 @@ class OriginalReferencePictureFilename extends FilenameHelper_impl { return getName() + "-" + "%04d" + "-ref"; } - + public OriginalReferencePictureFilename(){} public OriginalReferencePictureFilename(String _path, String _filename, String _ext) { super(_path, _filename, _ext);} } @@ -371,7 +371,7 @@ class CurrentReferencePictureFilename extends FilenameHelper_impl public class FilenameHelper { - + public static void main(String[] args) { OriginalReferenceFilename d = new OriginalReferenceFilename(); @@ -387,8 +387,8 @@ public class FilenameHelper OriginalReferenceFilename a2 = new OriginalReferenceFilename("/dir1/dir2","/name.ext",""); OriginalReferenceFilename a3 = new OriginalReferenceFilename("/dir1/dir2","/name",".ext"); OriginalReferenceFilename a4 = new OriginalReferenceFilename("/dir1/dir2","name","ext"); - - + + // OriginalReferenceFilename b = new OriginalReferenceFilename("c:/dir1/dir2/name.ext"); // OriginalReferenceFilename c = new OriginalReferenceFilename("file:///dir1/dir2/name.ext"); // OriginalReferenceFilename e = new OriginalReferenceFilename("c:\\dir1\\dir2\\name"); diff --git a/qadevOOo/runner/convwatch/GfxCompare.java b/qadevOOo/runner/convwatch/GfxCompare.java index b45897475c23..a2baadf60c3e 100644 --- a/qadevOOo/runner/convwatch/GfxCompare.java +++ b/qadevOOo/runner/convwatch/GfxCompare.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,13 +53,13 @@ public class GfxCompare extends EnhancedComplexTestCase * Return all test methods. * @return The test methods. */ - + public String[] getTestMethodNames() { return new String[]{"gfxcompare"}; } /** - * + * * @return a List of software which must accessable as an external executable */ protected Object[] mustInstalledSoftware() @@ -95,7 +95,7 @@ public class GfxCompare extends EnhancedComplexTestCase String sFile2 = (String)param.get("FILE2"); compare(sFile1, sFile2); } - + // ----------------------------------------------------------------------------- String createJPEG(String _sFile, String _sAdditional) @@ -122,20 +122,20 @@ public class GfxCompare extends EnhancedComplexTestCase String sFileDir = FileHelper.getPath(_sFile); String sBasename = FileHelper.getBasename(_sFile); String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); - + String fs = System.getProperty("file.separator"); String sTmpDir = util.utils.getUsersTempDir(); if (m_aArguments.getOutputPath() != null) { sTmpDir = m_aArguments.getOutputPath(); } - + if (_sFile.toLowerCase().endsWith("ps") || _sFile.toLowerCase().endsWith("prn") || _sFile.toLowerCase().endsWith("pdf")) { // seems to be a Postscript of PDF file - + String[] aList = PRNCompare.createJPEGFromPostscript(sTmpDir, sFileDir, sBasename, m_aArguments.getResolutionInDPI()); sJPEGFile = aList[0]; } @@ -173,8 +173,8 @@ public class GfxCompare extends EnhancedComplexTestCase } return sJPEGFile; } - - + + public String compare(String _sFile1, String _sFile2) { String sJPEGFile1 = createJPEG(_sFile1, "-1"); @@ -183,7 +183,7 @@ public class GfxCompare extends EnhancedComplexTestCase if (sJPEGFile1.length() > 0 && sJPEGFile2.length() > 0) { String sDiffFile = PRNCompare.compareJPEGs(sJPEGFile1, sJPEGFile2); - + if (sDiffFile.length() > 0) { GlobalLogWriter.get().println("Difference created: " + sDiffFile); diff --git a/qadevOOo/runner/convwatch/GlobalLogWriter.java b/qadevOOo/runner/convwatch/GlobalLogWriter.java index fe785915cc02..cb31959dd0e7 100644 --- a/qadevOOo/runner/convwatch/GlobalLogWriter.java +++ b/qadevOOo/runner/convwatch/GlobalLogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,16 +42,16 @@ public class GlobalLogWriter } return m_aGlobalLogWriter; } - + // public static synchronized void initialize() // { // get().initialize(null, true); // } - + public static synchronized void set(LogWriter _aLog) { m_aGlobalLogWriter = _aLog; } - + } diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java index efce96c1c15b..fe4de9d172f4 100644 --- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java +++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public class GraphicalDifferenceCheck GlobalLogWriter.get().println(""); } } - + /** * Creates references form documents used by the graphical difference check * @@ -72,7 +72,7 @@ public class GraphicalDifferenceCheck // System.out.println("createReferences() InputPath: " + _sInputPath + " refpath: " + _sReferencePath); showVersion(); File aInputPath = new File(_sInputPath); - + // System.out.println("Inputpath in file: " + aInputPath.getAbsolutePath()); //! // if (aInputPath.exists()) @@ -84,7 +84,7 @@ public class GraphicalDifferenceCheck // System.out.println("Inputpath doesn't exists"); // return; // } - + if (aInputPath.isDirectory()) { String fs = System.getProperty("file.separator"); @@ -139,7 +139,7 @@ public class GraphicalDifferenceCheck { return OfficePrint.isReferenceExists(_aGTA, _sReferencePath, _sInputFile); } - + /** * Used for the comparance of graphical differences. @@ -230,7 +230,7 @@ public class GraphicalDifferenceCheck return checkOneFile( _sInputFile, _sOutputPath, _sReferencePath, null, _aGTA); } - + /** * Used for the comparance of graphical differences. * Method compares one document (_sInputFile) with an older document of the same name in the provided directory (_sReferencePath). @@ -283,7 +283,7 @@ public class GraphicalDifferenceCheck // one file String sInputFile; - sInputFile = createInputFile(xComponent, _sOutputPath, _resultDocName); + sInputFile = createInputFile(xComponent, _sOutputPath, _resultDocName); sInputFile = FileHelper.getSystemPathFromFileURL(sInputFile); return convwatch.ConvWatch.check(_aGTA, _sOutputPath, sInputFile, _sReferencePath); } @@ -296,26 +296,26 @@ public class GraphicalDifferenceCheck // LLA: old! * // LLA: old! * @param inputPath the original document name (possibly including path) // LLA: old! * @param referencePath the directory where the reference document will be stored -// LLA: old! +// LLA: old! // LLA: old! */ // LLA: old! public static boolean isReferencExistent(String inputDocumentPath, String referencePath) // LLA: old! { -// LLA: old! // isolate the document name +// LLA: old! // isolate the document name // LLA: old! if(inputDocumentPath.indexOf(File.separator) != -1) // LLA: old! inputDocumentPath = inputDocumentPath.substring(inputDocumentPath.lastIndexOf(File.separator) + 1, inputDocumentPath.length()); -// LLA: old! -// LLA: old! // exchange any arbitray suffix against the refence suffix (.prn) +// LLA: old! +// LLA: old! // exchange any arbitray suffix against the refence suffix (.prn) // LLA: old! if(inputDocumentPath.indexOf('.') != -1) // LLA: old! inputDocumentPath = inputDocumentPath.substring(0, inputDocumentPath.lastIndexOf('.')); // LLA: old! inputDocumentPath = inputDocumentPath + ".prn"; -// LLA: old! System.out.println("GraphicalDifference CheckReferenceDocument: " + inputDocumentPath); -// LLA: old! +// LLA: old! System.out.println("GraphicalDifference CheckReferenceDocument: " + inputDocumentPath); +// LLA: old! // LLA: old! File refFile = new File(referencePath + inputDocumentPath); // LLA: old! if(refFile.exists()){ // LLA: old! return true; // LLA: old! }else // LLA: old! return false; -// LLA: old! } +// LLA: old! } private static String createInputFile(XComponent xComponent, String _sOutputPath, String resultDocName) diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 72d732d3d8de..04080e3a8d0e 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public class GraphicalTestArguments String m_sDistinct = null; boolean m_bCreateDefaultReference = false; - + // CONSTRUCTOR private GraphicalTestArguments(){} @@ -116,7 +116,7 @@ public class GraphicalTestArguments m_aCurrentParams = param; // collect interesting information from the ComplexTestCase // .... - + // REFERENCE_TYPE ---------- String sReferenceType = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_TYPE ); if (sReferenceType == null || sReferenceType.length() == 0) @@ -127,7 +127,7 @@ public class GraphicalTestArguments // log.println("found REFERENCE_TYPE " + sReferenceType ); setReferenceType(sReferenceType); } - + // PRINTER_NAME ---------- String sPrinterName = (String)param.get( PropertyName.DOC_COMPARATOR_PRINTER_NAME ); if (sPrinterName == null || sPrinterName.length() == 0) @@ -221,7 +221,7 @@ public class GraphicalTestArguments { m_bResuseOffice = false; } - + String sHTMLOutputPrefix = (String)param.get( PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX); if (sHTMLOutputPrefix == null) @@ -255,19 +255,19 @@ public class GraphicalTestArguments m_tWithBorderMove = TriState.FALSE; // m_tWithBorderMove = TriState.UNSET; } - + String sLeaveOutNames = (String)param.get(PropertyName.DOC_COMPARATOR_LEAVE_OUT_FILES); if (sLeaveOutNames != null) { m_sLeaveOutNames = sLeaveOutNames; - } - + } + String sDBInfoString = (String)param.get(PropertyName.DOC_COMPARATOR_DB_INFO_STRING); if (sDBInfoString != null) { m_sDBInfoString = sDBInfoString; } - + // DISTINCT ---------- String sDistinct = (String)param.get( "DISTINCT" ); if (sDistinct == null || sDistinct.length() == 0) @@ -306,7 +306,7 @@ public class GraphicalTestArguments m_bCreateDefaultReference = false; } } - + } public boolean checkIfUsableDocumentType(String _sName) @@ -322,18 +322,18 @@ public class GraphicalTestArguments { return false; } - + return true; } - - static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + + static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { // System.out.println("No FilterName set."); return; } - + if (_xMSF == null) { GlobalLogWriter.get().println("MultiServiceFactory not set."); @@ -355,7 +355,7 @@ public class GraphicalTestArguments XNameAccess aNameAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) { - + if (_sFilterName.toLowerCase().equals("help")) { GlobalLogWriter.get().println("Show all possible ElementNames from current version." ); @@ -368,7 +368,7 @@ public class GraphicalTestArguments } } } - + /* public GraphicalTestArguments(TestParameters param, Log xxx) { @@ -397,12 +397,12 @@ public class GraphicalTestArguments public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;} // get methods - public XMultiServiceFactory getMultiServiceFactory() + public XMultiServiceFactory getMultiServiceFactory() { XMultiServiceFactory xMSF = (XMultiServiceFactory)m_aCurrentParams.getMSF(); - + // check if MultiServiceFactory is given - if (getReferenceType().toLowerCase().equals("pdf") || + if (getReferenceType().toLowerCase().equals("pdf") || getReferenceType().toLowerCase().equals("ooo")) { if (xMSF == null) @@ -454,7 +454,7 @@ public class GraphicalTestArguments } return true; } - + /** * @return integer value, which contain resolution in DPI. */ @@ -474,7 +474,7 @@ public class GraphicalTestArguments } } } - + /** * @return the INPUT_PATH out of the TestParameters @@ -528,7 +528,7 @@ public class GraphicalTestArguments sReferenceInputPath = (String)m_aCurrentParams.get(PropertyName.DOC_COMPARATOR_REFERENCE_INPUT_PATH); return sReferenceInputPath; } - + /** * Helper function to get the buildid of the current used OpenOffice.org * out of the AppExecutionCommand the build ID @@ -537,7 +537,7 @@ public class GraphicalTestArguments { String sAPP = (String)m_aCurrentParams.get(util.PropertyName.APP_EXECUTION_COMMAND); // return getBuildID(sAPP); -// TODO: here we need the getBuildID(string) method +// TODO: here we need the getBuildID(string) method String sBuildID = convwatch.BuildID.getBuildID(sAPP); return sBuildID; } @@ -554,7 +554,7 @@ public class GraphicalTestArguments } return true; } - + // Handle for Reference Build ID, is set in ConvWatch.createPostscriptStartCheck() private String m_sRefBuildID; @@ -566,7 +566,7 @@ public class GraphicalTestArguments { return m_sRefBuildID; } - + public void disallowStore() { m_bStoreFile = false; @@ -583,7 +583,7 @@ public class GraphicalTestArguments { return m_bCreateDefaultReference; } - + // get/set for FilterName // get the right Filtername (internal Name) from @@ -626,13 +626,13 @@ public class GraphicalTestArguments } return false; } - + String m_sHTMLOutputPrefix = ""; public String getHTMLOutputPrefix() { return m_sHTMLOutputPrefix; } - + TriState m_tWithBorderMove = TriState.UNSET; // public TriState isBorderMove() // { @@ -646,7 +646,7 @@ public class GraphicalTestArguments { m_tWithBorderMove = _tBorderMove; } - + String m_sDocumentType = ""; public void setDocumentType(String _sName) { @@ -656,7 +656,7 @@ public class GraphicalTestArguments { return m_sDocumentType; } - + /* helper class for performance analyser features */ @@ -669,7 +669,7 @@ public class GraphicalTestArguments } return m_aPerformanceContainer; } - + private String m_aInputFile; public void setInputFile(String _sInputFile) { @@ -690,10 +690,10 @@ public class GraphicalTestArguments return null; } } - + return m_sDBInfoString; } - + public boolean cancelRequest() { File aCancelFile = null; @@ -703,15 +703,15 @@ public class GraphicalTestArguments if (sTempPath != null) { String sGDC_Dir = sTempPath; - + if (m_sDistinct.length() > 0) { sGDC_Dir = sGDC_Dir + fs + m_sDistinct; } - + String sCancelFile = sGDC_Dir + fs + "cancel_compare.txt"; aCancelFile = new File(sCancelFile); - + if (aCancelFile.exists()) { GlobalLogWriter.get().println("ATTENTION: Found file: '" + sCancelFile + "'."); @@ -721,7 +721,7 @@ public class GraphicalTestArguments } return false; } - + } diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index 49edb2c25ac0..9801897c648c 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ public class HTMLOutputter FileWriter m_aOut; String m_sFilename; String m_sNamePrefix; // the HTML files used a suffix to build it's right name - + /** * ls is the current line separator (carridge return) */ @@ -67,7 +67,7 @@ public class HTMLOutputter return a; } public String getFilename() {return m_sFilename;} - + public void header(String _sTitle) { try @@ -79,17 +79,17 @@ public class HTMLOutputter m_aOut.write( "<link rel=\"stylesheet\" type=\"text/css\" href=\"/gfxcmp_ui/style.css\" media=\"screen\" />" + ls); m_aOut.write( "</head>" + ls); m_aOut.write( "<body bgcolor=white>" + ls); - m_aOut.flush(); + m_aOut.flush(); } catch (java.io.IOException e) { } } - + final static String TEST_TABLETITLE = "Test"; final static String VISUAL_STATUS_TABLETITLE = "Visual status"; final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message"; - + public void indexSection(String _sOfficeInfo) { try @@ -151,7 +151,7 @@ public class HTMLOutputter // sbUNIXPath.append(_sHREF.substring(index + 2)); // String sUNIXPath = sbUNIXPath.toString(); // sUNIXPath = utils.replaceAll13(sUNIXPath, "\\", "/"); - // + // // a.append("<A HREF=\""); // a.append(sUNIXPath); // a.append("\">"); @@ -162,7 +162,7 @@ public class HTMLOutputter // { // System.out.println("Path is '" + _sHREF + "'"); // } - + } return a.toString(); } @@ -175,7 +175,7 @@ public class HTMLOutputter a.append("</TD>"); return a.toString(); } - + String tableHeaderCell(String _sValue) { StringBuffer a = new StringBuffer(); @@ -184,7 +184,7 @@ public class HTMLOutputter a.append("</TH>"); return a.toString(); } - + public void indexLine(String _sHTMLFile, String _sHTMLName, String _sHTMLFile2, String _sHTMLName2, String _sStatusRunThrough, String _sStatusMessage) { try @@ -199,7 +199,7 @@ public class HTMLOutputter { m_aOut.write(tableDataCell( "" ) ); } - + m_aOut.write( tableDataCell(_sStatusRunThrough) ); m_aOut.write( tableDataCell(_sStatusMessage) ); m_aOut.write( "</TR>" + ls); @@ -210,7 +210,7 @@ public class HTMLOutputter { } } - + public void close() { try @@ -224,7 +224,7 @@ public class HTMLOutputter { } } - + // ----------------------------------------------------------------------------- String stronghtml(String _sValue) { @@ -234,7 +234,7 @@ public class HTMLOutputter a.append("</STRONG>"); return a.toString(); } - + final static String FIRSTGFX_TABLETITLE = "Original print file as jpeg"; final static String SECONDGFX_TABLETITLE = "New print file as jpeg"; final static String DIFFER_TABLETITLE = "Difference file"; @@ -265,7 +265,7 @@ public class HTMLOutputter m_aOut.write( "<table class=\"infotable\">" + ls); - m_aOut.write( "<TR>" + ls); + m_aOut.write( "<TR>" + ls); m_aOut.write( tableHeaderCell( FIRSTGFX_TABLETITLE) ); m_aOut.write( tableHeaderCell( SECONDGFX_TABLETITLE ) ); m_aOut.write( tableHeaderCell(DIFFER_TABLETITLE ) ); @@ -283,11 +283,11 @@ public class HTMLOutputter { } } - + public void checkLine(StatusHelper _aStatus, boolean _bCurrentResult) { try - { + { m_aOut.write( "<TR>" + ls); String sLink = getHREF(FileHelper.getBasename(_aStatus.m_sOldGfx), FileHelper.getBasename(_aStatus.m_sOldGfx)); m_aOut.write( tableDataCell(sLink) ); @@ -297,14 +297,14 @@ public class HTMLOutputter sLink = getHREF(FileHelper.getBasename(_aStatus.m_sDiffGfx), FileHelper.getBasename(_aStatus.m_sDiffGfx)); m_aOut.write( tableDataCell(sLink) ); - + String sPercent = String.valueOf(_aStatus.nPercent) + "%"; if (_aStatus.nPercent > 0 && _aStatus.nPercent < 5) { sPercent += " (less 5% is ok)"; } m_aOut.write(tableDataCell( sPercent ) ); - + if (_aStatus.m_sDiff_BM_Gfx == null) { sLink = "No diffs, therefore no moves"; @@ -333,7 +333,7 @@ public class HTMLOutputter { m_aOut.write(tableDataCell( "NO" ) ); } - + m_aOut.write( "</TR>" + ls); } catch (java.io.IOException e) @@ -353,7 +353,7 @@ public class HTMLOutputter m_aOut.write( "<table class=\"infotable\">" + ls); - m_aOut.write( "<TR>" + ls); + m_aOut.write( "<TR>" + ls); m_aOut.write( tableHeaderCell( "Source to actual difference" ) ); m_aOut.write( tableHeaderCell( "Actual difference" ) ); m_aOut.write( tableHeaderCell(DIFFER_TABLETITLE ) ); @@ -368,11 +368,11 @@ public class HTMLOutputter { } } - + public void checkDiffDiffLine(StatusHelper _aStatus, boolean _bCurrentResult) { try - { + { m_aOut.write( "<TR>" + ls); // the link to the old difference can't offer here // String sLink = getHREF(FileHelper.getBasename(_aStatus.m_sOldGfx), FileHelper.getBasename(_aStatus.m_sOldGfx)); @@ -380,7 +380,7 @@ public class HTMLOutputter String sBasename = FileHelper.getBasename(m_sFilename); String sNew = sBasename.substring(m_sNamePrefix.length()); - + String sLink; sLink = getHREF(sNew, sNew); m_aOut.write( tableDataCell(sLink) ); @@ -407,7 +407,7 @@ public class HTMLOutputter { m_aOut.write(tableDataCell( "NO" ) ); } - + m_aOut.write( "</TR>" + ls); } catch (java.io.IOException e) diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index faa542a05cb8..3041033f8384 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public class INIOutputter } a.m_sFilename = sFilename; a.m_sNamePrefix = _sNamePrefix; - + return a; } public String getFilename() {return m_sFilename;} @@ -83,7 +83,7 @@ public class INIOutputter { } } - + public void writeSection(String _sSectionName) { try @@ -95,7 +95,7 @@ public class INIOutputter { } } - + public void writeValue(String _sName, String _sValue) { try @@ -128,7 +128,7 @@ public class INIOutputter public void checkLine(StatusHelper _aStatus, boolean _bCurrentResult) { try - { + { m_aOut.write( "oldgfx=" + _aStatus.m_sOldGfx + ls); m_aOut.write( "newgfx=" + _aStatus.m_sNewGfx + ls); m_aOut.write( "diffgfx=" + _aStatus.m_sDiffGfx + ls); @@ -139,7 +139,7 @@ public class INIOutputter sPercent += " (less 5% is ok)"; } m_aOut.write("percent=" + sPercent + ls); - + if (_aStatus.m_sDiff_BM_Gfx == null) { m_aOut.write("BM=false" + ls); @@ -179,7 +179,7 @@ public class INIOutputter m_aOut.write("result=NO" + ls); } } - + public void checkDiffDiffLine(StatusHelper _aStatus, boolean _bCurrentResult) { try diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 6eec5dee6b63..0c288a4362c1 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class ImageHelper int m_w = 0; int m_h = 0; boolean m_bGrabbed = false; - + public ImageHelper(Image _aImage) { m_aImage = _aImage; @@ -75,7 +75,7 @@ class ImageHelper // Write down the current image to a file. // public void storeImage(String _sFilename) - // { + // { // } public static ImageHelper createImageHelper(String _sFilename) @@ -110,7 +110,7 @@ class ImageHelper "Cannot construct object with current Java version " + javaVersion + ": " + ex.getMessage()); } -// aImage = ImageIO.read(aFile); +// aImage = ImageIO.read(aFile); return new ImageHelper(aImage); } } diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index fbcaaea0b33b..b41eac2fdb12 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ class IniFile } try { - aReader.close(); + aReader.close(); } catch (java.io.IOException ie) { @@ -115,18 +115,18 @@ class IniFile } // ----------------------------------------------------------------------------- - + boolean isRemark(String _sLine) { if ( ((_sLine.length() < 2) ) || - ( _sLine.startsWith("#")) || + ( _sLine.startsWith("#")) || ( _sLine.startsWith(";")) ) { return true; } return false; } - + String getItem(int i) { return (String)m_aList.get(i); @@ -141,7 +141,7 @@ class IniFile { return _sName.toLowerCase(); } - + // return the number where this section starts int findSection(String _sSection) { @@ -167,7 +167,7 @@ class IniFile } return -1; } - + // return the line number, where the key is found. int findKey(String _sSection, String _sKey) { @@ -179,7 +179,7 @@ class IniFile } return findKeyFromKnownSection(i, _sKey); } - + // i must be the index in the list, where the well known section starts int findKeyFromKnownSection(int _nSectionIndex, String _sKey) { @@ -187,18 +187,18 @@ class IniFile for (int j=_nSectionIndex + 1; j<m_aList.size();j++) { String sLine = getItem(j).trim(); - + if (isRemark(sLine)) { continue; } - + if (sLine.startsWith("[") /* && sLine.endsWith("]") */) { // found end. break; } - + int nEqual = sLine.indexOf("="); if (nEqual >= 0) { @@ -211,7 +211,7 @@ class IniFile } return -1; } - + // i must be the index in the list, where the well known section starts int findLastKnownKeyIndex(int _nSectionIndex, String _sKey) { @@ -220,7 +220,7 @@ class IniFile for (int j=i; j<m_aList.size();j++) { String sLine = getItem(j).trim(); - + if (isRemark(sLine)) { continue; @@ -231,7 +231,7 @@ class IniFile // found end. return j; } - + int nEqual = sLine.indexOf("="); if (nEqual >= 0) { @@ -244,7 +244,7 @@ class IniFile } return i; } - + String getValue(int _nIndex) { String sLine = getItem(_nIndex).trim(); @@ -263,9 +263,9 @@ class IniFile } /** - @param _sSection string + @param _sSection string @param _sKey string - @return the value found in the inifile which is given by the section and key parameter + @return the value found in the inifile which is given by the section and key parameter */ public String getValue(String _sSection, String _sKey) { @@ -278,21 +278,21 @@ class IniFile } sValue = getValue(i); - + return sValue; } /** write back the ini file to the disk, only if there exist changes */ - public void store() + public void store() { if (m_bListContainUnsavedChanges == false) { // nothing has changed, so no need to store return; } - + File aFile = new File(m_sFilename); if (aFile.exists()) { @@ -321,7 +321,7 @@ class IniFile } aWriter.close(); } - + catch (java.io.FileNotFoundException fne) { GlobalLogWriter.get().println("couldn't open file for writing " + m_sFilename); @@ -335,9 +335,9 @@ class IniFile // DebugHelper.exception(BasicErrorCode.SbERR_INTERNAL_ERROR, ie.getMessage()); } } - - - + + + /** insert a value there are 3 cases @@ -345,7 +345,7 @@ class IniFile 2. section exist but key not, search section, search key, if key is -1 get last known key position and insert new key value pair there 3. section exist and key exist, remove the old key and insert the key value pair at the same position */ - public void insertValue(String _sSection, String _sKey, String _sValue) + public void insertValue(String _sSection, String _sKey, String _sValue) { int i = findSection(_sSection); if (i == -1) @@ -427,11 +427,11 @@ class IniFile // } // sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue); // sLocalValue = replaceEvaluatedKey("global", sLocalValue); - // + // // return sLocalValue; // } - + /** * some tests for this class */ diff --git a/qadevOOo/runner/convwatch/LISTOutputter.java b/qadevOOo/runner/convwatch/LISTOutputter.java index 87c13ea0477a..f8baf804f73e 100644 --- a/qadevOOo/runner/convwatch/LISTOutputter.java +++ b/qadevOOo/runner/convwatch/LISTOutputter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public class LISTOutputter return null; } a.m_sFilename = sFilename; - + return a; } public String getFilename() {return m_sFilename;} @@ -76,7 +76,7 @@ public class LISTOutputter { } } - + public void writeValue(String _sValue) { try diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 5be0cfe058ce..ccc6929c0233 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class ProcessHelper public class MSOfficePrint { private String m_sPrinterName; // within Windows the tools need a printer name; - + public void setPrinterName(String _s) {m_sPrinterName = _s;} // ----------------------------------------------------------------------------- @@ -162,7 +162,7 @@ public class MSOfficePrint realStartCommand(aStartCommand); } } - + // ----------------------------------------------------------------------------- /** * print the given file (_sInputFile) to the file name (_sPrintFile) @@ -243,14 +243,14 @@ public class MSOfficePrint OfficePrint.createInfoFile(_sPrintFilename, _aGTA, "msoffice"); TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print."); } - + public void realStartCommand(ArrayList _aStartCommand) throws ConvWatchCancelException - { + { if (_aStartCommand.isEmpty()) { throw new ConvWatchCancelException/*WrongEnvironmentException*/("Given list is empty."); - } - + } + try { // Convert the StartCommand ArrayList to a String List @@ -276,7 +276,7 @@ public class MSOfficePrint // TODO: use a better Exception!!! throw new ConvWatchCancelException/*WrongEnvironmentException*/("We doesn't work within windows environment."); } - + ProcessHandler aHandler = new ProcessHandler(aList); boolean bBackValue = aHandler.executeSynchronously(); @@ -285,10 +285,10 @@ public class MSOfficePrint { throw new ConvWatchCancelException/*WrongEnvironmentException*/("Given list is too short."); } - + // return aHandler.getExitCode(); } - + ArrayList createWordPrintHelper() throws java.io.IOException { @@ -304,7 +304,7 @@ public class MSOfficePrint { return aList; } - + String sName = sTmpPath + fs + sPrintViaWord; File aFile = new File(sName); FileWriter out = new FileWriter(aFile.toString()); @@ -406,14 +406,14 @@ public class MSOfficePrint { GlobalLogWriter.get().println("Search for local existance of " + aPerlScript.getAbsolutePath()); } - + if (aPerlScript.exists()) { if (FileHelper.isDebugEnabled()) { GlobalLogWriter.get().println("OK, found it, use this instead the internal one."); } - + String sName = aPerlScript.getAbsolutePath(); // String sCommand = "perl " + sName; // System.out.println(sCommand); @@ -423,14 +423,14 @@ public class MSOfficePrint } return aList; } - + ArrayList createWordStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); String ls = System.getProperty("line.separator"); String fs = System.getProperty("file.separator"); - + // ArrayList aList = new ArrayList(); String sSaveViaWord = "saveViaWord.pl"; @@ -439,13 +439,13 @@ public class MSOfficePrint { return aList; } - + String sName = sTmpPath + fs + sSaveViaWord; if (FileHelper.isDebugEnabled()) { GlobalLogWriter.get().println("No local found, create a perl script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile.toString()); @@ -505,7 +505,7 @@ public class MSOfficePrint aList.add(sName); return aList; } - + ArrayList createExcelPrintHelper() throws java.io.IOException { @@ -526,7 +526,7 @@ public class MSOfficePrint { GlobalLogWriter.get().println("No local found, create a perl script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile.toString()); @@ -624,10 +624,10 @@ public class MSOfficePrint { GlobalLogWriter.get().println("No local found, create a script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile.toString()); - + out.write( "eval 'exec perl -wS $0 ${1+\"$@\"}' " + ls ); out.write( " if 0; " + ls ); out.write( "use strict; " + ls ); @@ -694,7 +694,7 @@ public class MSOfficePrint aList.add(sName); return aList; } - + ArrayList createPowerPointPrintHelper() throws java.io.IOException { // create a program in tmp file @@ -703,7 +703,7 @@ public class MSOfficePrint String fs = System.getProperty("file.separator"); String sPrintViaPowerPoint = "printViaPowerPoint.pl"; - + ArrayList aList = searchLocalFile(sPrintViaPowerPoint); if (aList.isEmpty() == false) { @@ -714,7 +714,7 @@ public class MSOfficePrint { GlobalLogWriter.get().println("No local found, create a script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile.toString()); @@ -822,7 +822,7 @@ public class MSOfficePrint { aLine = aLine.trim(); if ( (! (aLine.length() < 2) ) && - (! aLine.startsWith("#")) && + (! aLine.startsWith("#")) && (! aLine.startsWith(";")) ) { int nIdx = aLine.indexOf("mso-application"); @@ -857,7 +857,7 @@ public class MSOfficePrint } try { - aReader.close(); + aReader.close(); } catch (java.io.IOException ie) { diff --git a/qadevOOo/runner/convwatch/NameHelper.java b/qadevOOo/runner/convwatch/NameHelper.java index cddf3aca75f2..2df09d09c57d 100644 --- a/qadevOOo/runner/convwatch/NameHelper.java +++ b/qadevOOo/runner/convwatch/NameHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,5 +85,5 @@ public class NameHelper GlobalLogWriter.get().println(" Suffix: " + m_sSuffix); } - + } diff --git a/qadevOOo/runner/convwatch/OSHelper.java b/qadevOOo/runner/convwatch/OSHelper.java index 1fbf804831d7..204290bbd266 100644 --- a/qadevOOo/runner/convwatch/OSHelper.java +++ b/qadevOOo/runner/convwatch/OSHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ package convwatch; -// +// // class OSHelper // { // public static boolean isWindows() @@ -37,7 +37,7 @@ package convwatch; // return true; // } // return false; -// } +// } // // not need // // public static boolean isUnix() // public static boolean isSolarisIntel() @@ -69,7 +69,7 @@ package convwatch; // } // return false; // } -// +// // public static boolean isUnix() // { // if (isLinuxIntel() || @@ -80,5 +80,5 @@ package convwatch; // } // return false; // } -// +// // } diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index c9a656ac84b4..3feebdfa5336 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ public class OfficePrint { // static long m_nStartTime; // // static Date m_aDateCache = null; -// +// // /* // simple helper functions to start/stop a timer, to know how long a process need in milliseconds // */ @@ -85,7 +85,7 @@ public class OfficePrint { // // { // // System.out.println("Forgotten to initialise start timer."); // // return 0; -// // } +// // } // // long m_nStopTime = m_aDateCache.getTime(); // if (m_nStartTime == 0) // { @@ -95,8 +95,8 @@ public class OfficePrint { // long m_nStopTime = System.currentTimeMillis(); // return m_nStopTime - m_nStartTime; // } - - + + private static void showProperty(PropertyValue _aValue) { String sName = _aValue.Name; @@ -112,8 +112,8 @@ public class OfficePrint { GlobalLogWriter.get().println("Property " + sName + ":= a Object which can't convert by AnyConverter()"); } } - - /** + + /** * shows the FilterName and MediaType from the given XComponent */ static String getDocumentType( XComponent _aDoc ) @@ -153,7 +153,7 @@ public class OfficePrint { String _sInputURL) { XComponent aDoc = null; - try + try { if (_aGTA.getMultiServiceFactory() == null) { @@ -162,7 +162,7 @@ public class OfficePrint { } Object oDsk = _aGTA.getMultiServiceFactory().createInstance("com.sun.star.frame.Desktop"); XDesktop aDesktop = UnoRuntime.queryInterface(XDesktop.class, oDsk); - + if (aDesktop != null) { GlobalLogWriter.get().println("com.sun.star.frame.Desktop created."); @@ -170,7 +170,7 @@ public class OfficePrint { // String sOutputURL = aCurrentParameter.sOutputURL; // String sPrintFileURL = aCurrentParameter.sPrintToFileURL; // System.out.println(_sInputURL); - + // set here the loadComponentFromURL() properties // at the moment only 'Hidden' is set, so no window is opened at work @@ -211,9 +211,9 @@ public class OfficePrint { GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Load document"); // GlobalLogWriter.get().flush(); - + XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop); - + // XComponent aDoc = null; _aGTA.getPerformance().startTime(PerformanceContainer.Load); @@ -250,14 +250,14 @@ public class OfficePrint { } return aDoc; } - + static boolean exportToPDF(XComponent _xComponent, String _sDestinationName) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _xComponent ); - + ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); PropertyValue aFiltername = new PropertyValue(); aFiltername.Name = "FilterName"; @@ -265,7 +265,7 @@ public class OfficePrint { aPropertyList.add(aFiltername); showProperty(aFiltername); boolean bWorked = true; - + try { XStorable store = @@ -280,14 +280,14 @@ public class OfficePrint { GlobalLogWriter.get().println("Message: " + e.getMessage()); bWorked = false; } - + return bWorked; } - + static String getFilterName_forPDF(XServiceInfo xServiceInfo) { String filterName = ""; - + if (xServiceInfo.supportsService("com.sun.star.text.TextDocument")) { //writer @@ -323,9 +323,9 @@ public class OfficePrint { //math document filterName = "math_pdf_Export"; } - + return filterName; - } + } // ----------------------------------------------------------------------------- @@ -335,7 +335,7 @@ public class OfficePrint { { boolean bBack = false; XComponent aDoc = loadFromURL(_aGTA, _sInputURL); - + if (aDoc == null) { GlobalLogWriter.get().println("Can't load document."); @@ -348,7 +348,7 @@ public class OfficePrint { aDoc.dispose(); return bBack; } - + public static boolean storeAsPDF(GraphicalTestArguments _aGTA, XComponent _aDoc, String _sOutputURL) @@ -366,7 +366,7 @@ public class OfficePrint { } return bBack; } - + // ----------------------------------------------------------------------------- /** @@ -390,7 +390,7 @@ public class OfficePrint { { // waitInSeconds(1); boolean bBack = false; - + XComponent aDoc = loadFromURL(_aGTA, _sInputURL); if (aDoc != null) { @@ -402,7 +402,7 @@ public class OfficePrint { _aGTA.disallowStore(); } bBack = impl_printToFileWithOOo(_aGTA, aDoc, _sOutputURL, _sPrintFileURL); - + GlobalLogWriter.get().println("Close document."); aDoc.dispose(); } @@ -418,7 +418,7 @@ public class OfficePrint { { createInfoFile(_sFile, _aGTA, ""); } - + public static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA, String _sSpecial) { String sFilename; @@ -478,7 +478,7 @@ public class OfficePrint { // out.write("# time is given in milli seconds" + ls); // out.write("time=" + nTime + ls); // } - + out.write(ls); out.write("# Values out of System.getProperty(...)" + ls); out.write("os.name=" + System.getProperty("os.name") + ls); @@ -491,7 +491,7 @@ public class OfficePrint { out.write("# Performance output, values are given in milli sec." + ls); _aGTA.getPerformance().print(out); } - + out.flush(); out.close(); } @@ -500,13 +500,13 @@ public class OfficePrint { GlobalLogWriter.get().println("can't create Info file."); e.printStackTrace(); } - + String sExtension = FileHelper.getSuffix(_aGTA.getInputFile()); if (sExtension.startsWith(".")) { sExtension = sExtension.substring(1); } - + DB.writeToDB(_aGTA.getInputFile(), sNameNoSuffix, sExtension, @@ -515,8 +515,8 @@ public class OfficePrint { _aGTA.getResolutionInDPI() ); } - - + + // ----------------------------------------------------------------------------- private static boolean impl_printToFileWithOOo(GraphicalTestArguments _aGTA, @@ -531,8 +531,8 @@ public class OfficePrint { GlobalLogWriter.get().println("No document is given."); return bBack; } - - try + + try { if (_sOutputURL != null) { @@ -543,7 +543,7 @@ public class OfficePrint { if (aStorable != null) { PropertyValue [] szEmptyArgs = new PropertyValue [0]; - + GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Store document."); _aGTA.getPerformance().startTime(PerformanceContainer.Store); aStorable.storeAsURL(_sOutputURL, szEmptyArgs); @@ -571,12 +571,12 @@ public class OfficePrint { bBack = false; } - try + try { - + // System.out.println("Document loaded."); // Change Pagesettings to DIN A4 - + GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Print document."); XPrintable aPrintable = UnoRuntime.queryInterface( XPrintable.class, _aDoc); if (aPrintable != null) @@ -594,9 +594,9 @@ public class OfficePrint { // aPrinterProps[nPropIndex].Value = com.sun.star.view.PaperFormat.A4; // aPrintable.setPrinter(aPrinterProps); // } - + // configure Office to allow to execute macos - + // TODO: We need a possiblity to set the printer name also for StarOffice/OpenOffice if (OSHelper.isWindows()) { @@ -613,7 +613,7 @@ public class OfficePrint { aPrintable.setPrinter(PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList)); } } - + // set property values for XPrintable.print() // more can be found at "http://api.openoffice.org/docs/common/ref/com/sun/star/view/PrintOptions.html" @@ -624,7 +624,7 @@ public class OfficePrint { // nProperties ++; // } // int nPropsCount = 0; - + // If we are a SpreadSheet (calc), we need to set PrintAllSheets property to 'true' XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _aDoc ); if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) @@ -638,7 +638,7 @@ public class OfficePrint { GlobalLogWriter.get().println("PrintAllSheets := true"); } } - + ArrayList<PropertyValue> aPrintProps = new ArrayList<PropertyValue>(); // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); @@ -665,20 +665,20 @@ public class OfficePrint { } sPages += String.valueOf(_aGTA.getOnlyPages()); } - + Arg = new PropertyValue(); Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); showProperty(Arg); } - + // GlobalLogWriter.get().println("Start printing."); _aGTA.getPerformance().startTime(PerformanceContainer.Print); aPrintable.print(PropertyHelper.createPropertyValueArrayFormArrayList(aPrintProps)); TimeHelper.waitInSeconds(1, "Start waiting for print ready."); - + GlobalLogWriter.get().println("Wait until document is printed."); boolean isBusy = true; int nPrintCount = 0; @@ -703,7 +703,7 @@ public class OfficePrint { } _aGTA.getPerformance().stopTime(PerformanceContainer.Print); GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Print document done."); - + // Create a .info file near the printed '.ps' or '.prn' file. createInfoFile(_sPrintFileURL, _aGTA); } @@ -723,7 +723,7 @@ public class OfficePrint { e.printStackTrace(); bBack = false; } - + if (bFailed == true) { GlobalLogWriter.get().println("convwatch.OfficePrint: FAILED"); @@ -735,7 +735,7 @@ public class OfficePrint { return bBack; } - + /** * @param _aGTA * @param _sAbsoluteOutputPath @@ -752,7 +752,7 @@ public class OfficePrint { // throw new ConvWatchCancelException("Input file: " + _sAbsoluteInputFile + " does not exist."); return false; } - + String fs = System.getProperty("file.separator"); // String sInputFileURL = URLHelper.getFileURLFromSystemPath(_sAbsoluteInputFile); @@ -772,7 +772,7 @@ public class OfficePrint { } // sOutputFileURL = URLHelper.getFileURLFromSystemPath(sOutputPath + fs + sInputFileBasename); // sOutputFileURL = null; - + String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename); // String sPrintFileURL; @@ -784,19 +784,19 @@ public class OfficePrint { } return false; } - + // ----------------------------------------------------------------------------- /** * create a reference file - * _sAbsoluteInputPath contains the source file, if not exists, return with failure. + * _sAbsoluteInputPath contains the source file, if not exists, return with failure. * _sAbsoluteOutputPath contains the destination, where the file will store after load with StarOffice/OpenOffice.org * if is null, print only near the Input file path * _sPrintType ".prn" Print input file with StarOffice/OpenOffice.org and the default printer as PostScript - * + * * @param _aGTA * @param _sAbsoluteOutputPath * @param _sAbsoluteInputFile - * @return + * @return * @throws ConvWatchCancelException */ public static boolean buildReference(GraphicalTestArguments _aGTA, @@ -828,7 +828,7 @@ public class OfficePrint { } // sOutputFileURL = URLHelper.getFileURLFromSystemPath(sOutputPath + fs + sInputFileBasename); sOutputFileURL = null; - + String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename); String sPrintFileURL; @@ -838,14 +838,14 @@ public class OfficePrint { GlobalLogWriter.get().println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); return true; } - + if (_aGTA.getReferenceType().toLowerCase().equals("msoffice")) { sPrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFilename); } else if (_aGTA.getReferenceType().toLowerCase().equals("pdf")) { -// TODO: If we rename the stored file to *.pdf, we have to be sure that we use *.pdf also as a available reference +// TODO: If we rename the stored file to *.pdf, we have to be sure that we use *.pdf also as a available reference sPrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFilename ); } else if (_aGTA.getReferenceType().toLowerCase().equals("ooo")) @@ -859,7 +859,7 @@ public class OfficePrint { } return printToFile(_aGTA, sInputFileURL, sOutputFileURL, sPrintFileURL); } - + public static boolean printToFile(GraphicalTestArguments _aGTA, String _sInputFileURL, String _sOutputFileURL, @@ -877,11 +877,11 @@ public class OfficePrint { { return false; } - - + + // remember the current timer, to know how long a print process need. // startTimer(); - + if (_aGTA.getReferenceType().toLowerCase().equals("ooo")) { bBack = printToFileWithOOo(_aGTA, _sInputFileURL, _sOutputFileURL, _sPrintFileURL); @@ -938,7 +938,7 @@ public class OfficePrint { { return; } - + if (_xMSF == null) { GlobalLogWriter.get().println("MultiServiceFactory not set."); @@ -964,14 +964,14 @@ public class OfficePrint { // ----------------------------------------------------------------------------- - public static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + public static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.get().println("MultiServiceFactory not set."); @@ -993,7 +993,7 @@ public class OfficePrint { XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) { - + // if (_sFilterName.toLowerCase().equals("help")) // { // System.out.println("Show all possible ElementNames from current version." ); @@ -1005,13 +1005,13 @@ public class OfficePrint { // System.out.println("Must quit."); // System.out.exit(1); // } - + if (! aNameAccess.hasByName(_sFilterName)) { GlobalLogWriter.get().println("FilterFactory.hasByName() says there exist no '" + _sFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1052,17 +1052,17 @@ public class OfficePrint { } return null; } - + // ----------------------------------------------------------------------------- - static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.get().println("MultiServiceFactory not set."); @@ -1083,13 +1083,13 @@ public class OfficePrint { { XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) - { + { if (! aNameAccess.hasByName(_sFilterName)) { GlobalLogWriter.get().println("FilterFactory.hasByName() says there exist no '" + _sFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1132,14 +1132,14 @@ public class OfficePrint { } // ----------------------------------------------------------------------------- - public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) + public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) { if (_sInternalFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.get().println("MultiServiceFactory not set."); @@ -1161,20 +1161,20 @@ public class OfficePrint { XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection); if (aNameAccess != null) { - + // System.out.println("Show ElementNames" ); // String[] aElementNames = aNameAccess.getElementNames(); // for (int i = 0; i<aElementNames.length; i++) // { // System.out.println(aElementNames[i]); // } - + if (! aNameAccess.hasByName(_sInternalFilterName)) { GlobalLogWriter.get().println("TypeDetection.hasByName() says there exist no '" + _sInternalFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1223,7 +1223,7 @@ public class OfficePrint { } return null; } - + // ----------------------------------------------------------------------------- public static void convertDocument(String _sInputFile, String _sOutputPath, GraphicalTestArguments _aGTA) throws ConvWatchCancelException { @@ -1233,7 +1233,7 @@ public class OfficePrint { GlobalLogWriter.get().println("MultiServiceFactory in GraphicalTestArgument not set."); return; } - + String sInputURL = URLHelper.getFileURLFromSystemPath(_sInputFile); // showType(sInputURL, xMSF); XComponent aDoc = loadFromURL( _aGTA, sInputURL); @@ -1242,13 +1242,13 @@ public class OfficePrint { GlobalLogWriter.get().println("Can't load document '"+ sInputURL + "'"); return; } - + if (_sOutputPath == null) { GlobalLogWriter.get().println("Outputpath not set."); return; } - + if (! _aGTA.isStoreAllowed()) { GlobalLogWriter.get().println("It's not allowed to store, check Input/Output path."); @@ -1268,7 +1268,7 @@ public class OfficePrint { GlobalLogWriter.get().println("com.sun.star.frame.XStorable is null"); return; } - + String sFilterName = _aGTA.getExportFilterName(); // check how many Properties should initialize @@ -1277,19 +1277,19 @@ public class OfficePrint { // { // nPropertyCount ++; // } - + // initialize PropertyArray // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ]; // int nPropertyIndex = 0; ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); - + String sExtension = ""; if (sFilterName != null && sFilterName.length() > 0) { String sInternalFilterName = getInternalFilterName(sFilterName, xMSF); String sServiceName = getServiceNameFromFilterName(sFilterName, xMSF); - + GlobalLogWriter.get().println("Filter detection:"); // check if service name from file filter is the same as from the loaded document boolean bServiceFailed = false; @@ -1328,7 +1328,7 @@ public class OfficePrint { showProperty(Arg); GlobalLogWriter.get().println("FilterName is set to: " + sFilterName); } - + String sOutputURL = ""; try { @@ -1351,7 +1351,7 @@ public class OfficePrint { { sOutputFile += sInputFileBasename; } - + if (FileHelper.exists(sOutputFile) && _aGTA.getOverwrite() == false) { GlobalLogWriter.get().println("File already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); @@ -1359,7 +1359,7 @@ public class OfficePrint { } sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputFile); - + GlobalLogWriter.get().println("Store document as '" + sOutputURL + "'"); xStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList)); GlobalLogWriter.get().println("Document stored."); @@ -1370,8 +1370,8 @@ public class OfficePrint { } // TODO: Do we need to wait? TimeHelper.waitInSeconds(1, "unknown in OfficePrint.convertDocument()"); - + } - + } - + diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 1d0503299d67..5c3f3f15dd82 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ import util.utils; // { // final static int NO_DIFFERENCE = 1; // final static int DIFFERENCE = 2; -// +// // public int nValue = NO_DIFFERENCE; // public boolean equals(int _n) // { // if ( _n == nValue ) return true; // return false; -// } +// } // } // ----------------------------------------------------------------------------- @@ -63,7 +63,7 @@ public class PRNCompare { // m_aHelper = new OSHelper(); fs = System.getProperty("file.separator"); - } + } String executeSynchronously(String _sCommand) { @@ -73,7 +73,7 @@ public class PRNCompare boolean bBackValue = aHandler.executeSynchronously(); String sText = aHandler.getOutputText(); - + GlobalLogWriter.get().println("Exitcode: " + String.valueOf(aHandler.getExitCode())); return sText; } @@ -81,7 +81,7 @@ public class PRNCompare int getMaxNumOfFileEntry(String _sDirectory, String _sBasename) { -// TODO: check if directory exist should be done earlier +// TODO: check if directory exist should be done earlier File aDirectory = new File(_sDirectory); File[] aDirList = aDirectory.listFiles( /* @@ -94,7 +94,7 @@ public class PRNCompare } } */ ); - + int nMaxNumber = 0; for(int n = 0; n<aDirList.length ; n++) { @@ -102,7 +102,7 @@ public class PRNCompare if (sDirEntry.endsWith(".jpg")) { int nNum = nMaxNumber; - + if (sDirEntry.startsWith(_sBasename)) { // System.out.println(sDirEntry); @@ -116,11 +116,11 @@ public class PRNCompare catch(java.lang.NumberFormatException e) { } - + // System.out.println(nValue); nNum = nValue; } - + if (nNum > nMaxNumber) { nMaxNumber = nNum; @@ -129,7 +129,7 @@ public class PRNCompare } return nMaxNumber; } - + String m_sInputPath; String m_sReferencePath; String m_sOutputPath; @@ -143,9 +143,9 @@ public class PRNCompare String m_sDocumentType; public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; } - + public void setReferencePath(String _sReferencePath) { m_sReferencePath = _sReferencePath; } - + public void setOutputPath(String _sOutPath) { m_sOutputPath = _sOutPath; } public void setDocFile(String _sDocFile) { m_sDocFile = _sDocFile;} @@ -170,15 +170,15 @@ public class PRNCompare { m_sDocumentType = _sTypeName; } - + // ----------------------------------------------------------------------------- - + public StatusHelper[] compare() { createJPEGFromPostscript(m_sOutputPath, m_sReferencePath, m_sReferenceFile, getResolutionInDPI()); -// TODO: Assume, that Postscript is already in the OutputPath, this may change. +// TODO: Assume, that Postscript is already in the OutputPath, this may change. createJPEGFromPostscript(m_sOutputPath, m_sOutputPath, m_sPostScriptFile, getResolutionInDPI()); - StatusHelper[] aList = createDiffs(m_sOutputPath, + StatusHelper[] aList = createDiffs(m_sOutputPath, m_sOutputPath, m_sReferenceFile, m_sOutputPath, m_sPostScriptFile, getMaxPages(), m_tUseBorderMove); @@ -191,9 +191,9 @@ public class PRNCompare public StatusHelper[] compare_new() { String[] aRefList = createJPEGFromPostscript(m_sOutputPath, m_sReferencePath, m_sReferenceFile, getResolutionInDPI()); -// TODO: Assume, that Postscript is already in the OutputPath, this may change. +// TODO: Assume, that Postscript is already in the OutputPath, this may change. String[] aPSList = createJPEGFromPostscript(m_sOutputPath, m_sOutputPath, m_sPostScriptFile, getResolutionInDPI()); - StatusHelper[] aList = createDiffs(m_sOutputPath, + StatusHelper[] aList = createDiffs(m_sOutputPath, aRefList, aPSList, getMaxPages(), m_tUseBorderMove); @@ -204,15 +204,15 @@ public class PRNCompare static String getJPEGName(String _sOutputPath, String _sBasename, String _sGS_PageOutput) { String fs = System.getProperty("file.separator"); - + String sJPEGName = _sOutputPath + fs + _sBasename + _sGS_PageOutput + ".jpg"; return sJPEGName; } - + /** * Create via ghostscript (gs) from the reference file for every page a JPEG file * - * MUST set: + * MUST set: * m_sOutputPath, m_sReferenceFile, m_sReferencePath * * return exit code from gs command @@ -224,7 +224,7 @@ public class PRNCompare // { // sGS_PageOutput = "%%d"; // } - + FileHelper.makeDirectories("", _sOutputPath); // create a jpeg from original prn @@ -238,9 +238,9 @@ public class PRNCompare { sGS = "gswin32c.exe"; } - + sCommand = sGS + " -dNOPROMPT -dBATCH -sDEVICE=jpeg -r" + String.valueOf(_nResolutionInDPI) + " -dNOPAUSE -sOutputFile=" + StringHelper.doubleQuoteIfNeed(sJPGFilename) + " " + StringHelper.doubleQuoteIfNeed(sOriginalFile); - String[] sCommandArray = + String[] sCommandArray = { sGS, "-dNOPROMPT", @@ -259,11 +259,11 @@ public class PRNCompare // System.out.println("FAILED"); // } // System.out.println("done"); - + ProcessHandler aHandler = new ProcessHandler(sCommandArray); boolean bBackValue = 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 + // TODO: return a real filename, due to the fact we don't know how much files are created, maybe better to return a list ArrayList m_aFileList = new ArrayList(); for (int i=1;i<9999;i++) @@ -282,7 +282,7 @@ public class PRNCompare aList = (String[])m_aFileList.toArray(aList); return aList; // sNewJPEGFilename; } - + /** * Create Difference Files from the JPEGs * parameter, how much difference files should create @@ -297,10 +297,10 @@ public class PRNCompare { _nMaxDiffs = 1; } - + String sS1Basename = FileHelper.getBasename(_sSourceFile1); String sS2Basename = FileHelper.getBasename(_sSourceFile2); - + // count, from which file (jpegs) exist more, take the less one // more are not compareable int nS1_Files = getMaxNumOfFileEntry(_sSourcePath1, sS1Basename); @@ -314,8 +314,8 @@ public class PRNCompare nMin = Math.min(nMin, _nMaxDiffs); StatusHelper[] aList = new StatusHelper[nMin]; - -// TODO: if both document do not have same page count, produce an error + +// TODO: if both document do not have same page count, produce an error // System.out.println("min of both: " + String.valueOf(nMin)); int nStatusIndex = 0; @@ -325,10 +325,10 @@ public class PRNCompare String sNewGfx = getJPEGName(_sSourcePath2, sS2Basename, StringHelper.createValueString(i, 4)); String sDiffGfx_ = getJPEGName(_sOutputPath, sS1Basename + ".diff", StringHelper.createValueString(i, 4)); - + String sDiffGfx = compareJPEGs(sOldGfx, sNewGfx, sDiffGfx_); StatusHelper aStatus = new StatusHelper(sOldGfx, sNewGfx, sDiffGfx); - + // if (FileHelper.exists(sDiffGfx)) if (sDiffGfx.length() > 0) { @@ -340,7 +340,7 @@ public class PRNCompare else { try - { + { int nPercent = estimateGfx(sOldGfx, sNewGfx, sDiffGfx); aStatus.nDiffStatus = StatusHelper.DIFF_DIFFERENCES_FOUND; aStatus.nPercent = nPercent; @@ -348,15 +348,15 @@ public class PRNCompare // GlobalLogWriter.get().println("Hello World: Percent:= " + nPercent); // GlobalLogWriter.get().println("Hello World: TriState:= " + _tUseBorderMove.intValue()); // GlobalLogWriter.get().println("Hello World: DocType:= " + m_sDocumentType); - + // TODO: insert here the new BorderRemover if the percentage value is creater than 75% - if (nPercent > 75 && + if (nPercent > 75 && ((_tUseBorderMove == TriState.TRUE ) || ((_tUseBorderMove == TriState.UNSET) && m_sDocumentType.indexOf("MS PowerPoint") > 0))) { setBorderMove(TriState.TRUE); - + String sOld_BM_Gfx = getJPEGName(_sSourcePath1, sS1Basename + ".BM", StringHelper.createValueString(i, 4)); String sNew_BM_Gfx = getJPEGName(_sSourcePath2, sS2Basename + ".BM", StringHelper.createValueString(i, 4)); String sDiff_BM_Gfx_ = getJPEGName(_sOutputPath, sS1Basename + ".diff.BM", StringHelper.createValueString(i, 4)); @@ -366,9 +366,9 @@ public class PRNCompare BorderRemover a = new BorderRemover(); a.createNewImageWithoutBorder(sOldGfx, sOld_BM_Gfx); a.createNewImageWithoutBorder(sNewGfx, sNew_BM_Gfx); - + String sDiff_BM_Gfx = compareJPEGs( sOld_BM_Gfx, sNew_BM_Gfx, sDiff_BM_Gfx_); - + // if (FileHelper.exists(sDiff_BM_Gfx)) if (sDiff_BM_Gfx.length() > 0) { @@ -394,7 +394,7 @@ public class PRNCompare GlobalLogWriter.get().println("Exception caught. At border remove: " + e.getMessage()); } } - + } catch (java.io.IOException e) @@ -402,9 +402,9 @@ public class PRNCompare GlobalLogWriter.get().println(e.getMessage()); } } - + // checkDiff(sOldGfx, sNewGfx, sDiffGfx); - // if (i >= _nMaxDiffs) + // if (i >= _nMaxDiffs) // { // break; // } @@ -413,7 +413,7 @@ public class PRNCompare } return aList; } - + public StatusHelper[] createDiffs(String _sOutputPath, String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove) { @@ -421,7 +421,7 @@ public class PRNCompare { _nMaxDiffs = 1; } - + // count, from which file (jpegs) exist more, take the less one // more are not compareable @@ -430,8 +430,8 @@ public class PRNCompare nMin = Math.min(nMin, _nMaxDiffs); StatusHelper[] aList = new StatusHelper[nMin]; - -// TODO: if both document do not have same page count, produce an error + +// TODO: if both document do not have same page count, produce an error // System.out.println("min of both: " + String.valueOf(nMin)); int nStatusIndex = 0; @@ -444,7 +444,7 @@ public class PRNCompare String sDiffGfx = compareJPEGs(sOldGfx, sNewGfx ); StatusHelper aStatus = new StatusHelper(sOldGfx, sNewGfx, sDiffGfx); - + // if (FileHelper.exists(sDiffGfx)) if (sDiffGfx.length() > 0) { @@ -456,28 +456,28 @@ public class PRNCompare else { try - { + { int nPercent = estimateGfx(sOldGfx, sNewGfx, sDiffGfx); // GlobalLogWriter.get().println("Hello World: Percent:= " + nPercent); // GlobalLogWriter.get().println("Hello World: TriState:= " + _tUseBorderMove.intValue()); // GlobalLogWriter.get().println("Hello World: DocType:= " + m_sDocumentType); - + aStatus.nDiffStatus = StatusHelper.DIFF_DIFFERENCES_FOUND; aStatus.nPercent = nPercent; - - if (nPercent > 75 && + + if (nPercent > 75 && ((_tUseBorderMove == TriState.TRUE ) || ((_tUseBorderMove == TriState.UNSET) && m_sDocumentType.indexOf("MS PowerPoint") > 0))) { _tUseBorderMove = TriState.TRUE; -// TODO: problem is here, that we have to create some new names. +// TODO: problem is here, that we have to create some new names. String sBasename1 = FileHelper.getBasename(sOldGfx); String sNameNoSuffix1 = FileHelper.getNameNoSuffix(sBasename1); String sBasename2 = FileHelper.getBasename(sNewGfx); String sNameNoSuffix2 = FileHelper.getNameNoSuffix(sBasename2); - + String sTmpDir = util.utils.getUsersTempDir(); String fs = System.getProperty("file.separator"); @@ -488,11 +488,11 @@ public class PRNCompare BorderRemover a = new BorderRemover(); a.createNewImageWithoutBorder(sOldGfx, sOld_BM_Gfx); a.createNewImageWithoutBorder(sNewGfx, sNew_BM_Gfx); - + String sDiff_BM_Gfx = compareJPEGs( sOld_BM_Gfx, sNew_BM_Gfx ); - + aStatus.setFilesForBorderMove(sOld_BM_Gfx, sNew_BM_Gfx, sDiff_BM_Gfx); - + // if (FileHelper.exists(sDiff_BM_Gfx)) if (sDiff_BM_Gfx.length() > 0) { @@ -524,9 +524,9 @@ public class PRNCompare GlobalLogWriter.get().println(e.getMessage()); } } - + // checkDiff(sOldGfx, sNewGfx, sDiffGfx); - // if (i >= _nMaxDiffs) + // if (i >= _nMaxDiffs) // { // break; // } @@ -535,7 +535,7 @@ public class PRNCompare } return aList; } - + public static String compareJPEGs(String _sOldGfx, String _sNewGfx) { String sBasename1 = FileHelper.getBasename(_sOldGfx); @@ -547,10 +547,10 @@ public class PRNCompare String fs = System.getProperty("file.separator"); String sDiffName = sTmpDir + fs + sNameNoSuffix1 + "-" + sNameNoSuffix2 + "-diff.jpg"; - + return compareJPEGs(_sOldGfx, _sNewGfx, sDiffName); } - + public static String compareJPEGs(String _sOldGfx, String _sNewGfx, String _sDiffGfx) { String sComposite = "composite"; @@ -558,13 +558,13 @@ public class PRNCompare { sComposite = "composite.exe"; } - - // String sCommand = sComposite + " -compose difference " + + + // String sCommand = sComposite + " -compose difference " + // StringHelper.doubleQuoteIfNeed(_sOldGfx) + " " + // StringHelper.doubleQuoteIfNeed(_sNewGfx) + " " + // StringHelper.doubleQuoteIfNeed(_sDiffGfx); - String[] sCommandArray = + String[] sCommandArray = { sComposite, "-compose", @@ -573,9 +573,9 @@ public class PRNCompare _sNewGfx, _sDiffGfx }; - + ProcessHandler aHandler = new ProcessHandler(sCommandArray); - boolean bBackValue = aHandler.executeSynchronously(); + boolean bBackValue = aHandler.executeSynchronously(); String sBack = aHandler.getOutputText(); GlobalLogWriter.get().println("'" + sBack + "'"); @@ -587,7 +587,7 @@ public class PRNCompare } return ""; } - + /** * wrapper for ImageMagick identify, * function checks how many different colors a picture contains. @@ -602,13 +602,13 @@ public class PRNCompare // { // sIM_Format = "%%k"; // } - + String sIdentify = "identify"; if (OSHelper.isWindows()) { sIdentify = "identify.exe"; } - + // String sCommand = sIdentify + " " + sIM_Format + " " + StringHelper.doubleQuoteIfNeed(_sDiffGfx); String[] sCommandArray = @@ -631,7 +631,7 @@ public class PRNCompare { sBack = sBack.substring(0, nIdx); } - + nResult = Integer.valueOf(sBack).intValue(); } catch(java.lang.NumberFormatException e) @@ -641,22 +641,22 @@ public class PRNCompare } return nResult; } - + /* * Check 2 different differ files * return 1 if there is no difference between both diff files. */ -// TODO: Maybe a StatusHelper is a better return value +// TODO: Maybe a StatusHelper is a better return value public StatusHelper checkDiffDiff(String _sOutputPath, String _sSourcePath1, String _sSourceFile1, String _sSourcePath2, String _sSourceFile2) { String sNewGfx = _sSourcePath1 + fs + _sSourceFile1; String sOldGfx = _sSourcePath2 + fs + _sSourceFile2; - + int nNumber = 1; String sDiffGfx; sDiffGfx = getJPEGName(_sOutputPath, _sSourceFile1 + ".diff", StringHelper.createValueString(nNumber, 4)); - + StatusHelper aCurrentStatus = new StatusHelper(sOldGfx, sNewGfx, sDiffGfx); // String sComposite = "composite"; @@ -664,20 +664,20 @@ public class PRNCompare // { // sComposite = "composite.exe"; // } - // - // String sCommand = sComposite +" -compose difference " + + // + // String sCommand = sComposite +" -compose difference " + // StringHelper.doubleQuoteIfNeed(sOldGfx) + " " + // StringHelper.doubleQuoteIfNeed(sNewGfx) + " " + // StringHelper.doubleQuoteIfNeed(sDiffGfx); - // - // + // + // // // System.out.println(sCommand); // // executeSynchronously(sCommand); // ProcessHandler aHandler = new ProcessHandler(sCommand); // boolean bBackValue = aHandler.executeSynchronously(); compareJPEGs(sOldGfx, sNewGfx, sDiffGfx); - + if (FileHelper.exists(sDiffGfx)) { int nResult = identify(sDiffGfx); @@ -709,7 +709,7 @@ public class PRNCompare return aCurrentStatus; } - + // ----------------------------------------------------------------------------- /** * count how much pixel differ and between Old or New and the Difference graphics @@ -727,9 +727,9 @@ public class PRNCompare * text like outlined or the text is little bit move left, right up or down. * * >100% Yes it's possible that there is a difference more then 100%, maybe a font problem - * between old and new graphics. The font of the new graphics is little bit bigger, + * between old and new graphics. The font of the new graphics is little bit bigger, * so the pixel count between old graphics and new graphics is twice the more. - * + * */ public int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx) throws java.io.IOException @@ -738,9 +738,9 @@ public class PRNCompare int nNotWhiteCount_OldGraphic = PixelCounter.countNotWhitePixelsFromImage(_sOldGfx); int nNotWhiteCount_NewGraphic = PixelCounter.countNotWhitePixelsFromImage(_sNewGfx); int nNotBlackCount_DiffGraphic = PixelCounter.countNotBlackPixelsFromImage(_sDiffGfx); - + int nMinNotWhiteCount = Math.min(nNotWhiteCount_NewGraphic, nNotWhiteCount_OldGraphic); - + // check if not zero if (nMinNotWhiteCount == 0) { @@ -750,15 +750,15 @@ public class PRNCompare nMinNotWhiteCount = 1; } } - + int nPercent = Math.abs(nNotBlackCount_DiffGraphic * 100 / nMinNotWhiteCount); GlobalLogWriter.get().println( "Graphics check, pixel based:" + String.valueOf(nPercent) + "% pixel differ "); return nPercent; } + - - -/* + +/* * Some selftest functionallity */ // public static void main(String[] args) @@ -781,10 +781,10 @@ public class PRNCompare // LLA: 20040804 sample how to build jpegs from reference files // a.createJPEGFromPostscript("/tmp/convwatch_java", // "/home/apitest/WorkFromHome/20040804/reference", "worddoc.prn" ); -// +// // a.createJPEGFromPostscript("/tmp/convwatch_java", // "/home/apitest/WorkFromHome/20040804/reference", "worddoc.ps" ); - + // Status[] aList = a.createDiffs("/tmp/convwatch_java", // "/tmp/convwatch_java", "worddoc.prn", // "/tmp/convwatch_java", "worddoc.ps", @@ -799,7 +799,7 @@ public class PRNCompare // { // System.out.println("There is no difference between both diff files."); // } - + // a.setOldDiff( "/olddiffs"); // } } diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index d0c1e0fb5ed1..002813235034 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class PerformanceContainer /* extends *//* implements */ { { m_nStartTime = _nStartTime; } - + /* return the time, which is done until last startTime() */ @@ -61,7 +61,7 @@ public class PerformanceContainer /* extends *//* implements */ { long nMeanTime = System.currentTimeMillis(); return nMeanTime - _nCurrentTimer; } - + /* public long stopTimer() { @@ -80,10 +80,10 @@ public class PerformanceContainer /* extends *//* implements */ { final static int Print = 2; final static int OfficeStart = 3; final static int StoreAsPDF = 4; - + private long m_nTime[]; private String m_sMSOfficeVersion; - + public PerformanceContainer() { m_nTime = new long[5]; @@ -93,7 +93,7 @@ public class PerformanceContainer /* extends *//* implements */ { m_nTime[i] = 0; } } - + public void setTime(int _nIndex, long _nValue) { m_nTime[_nIndex] = _nValue; @@ -102,12 +102,12 @@ public class PerformanceContainer /* extends *//* implements */ { { return m_nTime[_nIndex]; } - + public void startTime(int _nIndex) { m_nTime[_nIndex] = getStartTime(); } - + public void stopTime(int _nIndex) { m_nTime[_nIndex] = meanTime(m_nTime[_nIndex]); @@ -141,12 +141,12 @@ public class PerformanceContainer /* extends *//* implements */ { } return nValue; } - + public static long secondsToMilliSeconds(double _nSeconds) { return (long)(_nSeconds * 1000.0); } - + /* Helper function, which read some values from a given file @@ -192,7 +192,7 @@ public class PerformanceContainer /* extends *//* implements */ { { String sTime = sLine.substring(14); m_nTime[Print] = secondsToMilliSeconds(stringToDouble(sTime)); - } + } else if (sLine.startsWith("WordVersion=")) { String sMSOfficeVersion = sLine.substring(12); @@ -223,7 +223,7 @@ public class PerformanceContainer /* extends *//* implements */ { } try { - aRandomAccessFile.close(); + aRandomAccessFile.close(); } catch (java.io.IOException ie) { diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 116b07e48d8e..9df41f540083 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ class CountNotWhite extends CountPixel { // System.out.println("CountWhite()"); } - + public void count(int pixel) { int alpha = (pixel >> 24) & 0xff; int red = (pixel >> 16) & 0xff; int green = (pixel >> 8) & 0xff; int blue = (pixel ) & 0xff; - + // System.out.println(String.valueOf(red) + ":" + String.valueOf(green) + ":" + String.valueOf(blue)); if (red == 0xff && green == 0xff && blue == 0xff) { @@ -69,14 +69,14 @@ class CountNotBlack extends CountPixel { // System.out.println("CountBlack()"); } - + public void count(int pixel) { int alpha = (pixel >> 24) & 0xff; int red = (pixel >> 16) & 0xff; int green = (pixel >> 8) & 0xff; int blue = (pixel ) & 0xff; - + if (red == 0x00 && green == 0x00 && blue == 0x00) { return; @@ -97,7 +97,7 @@ class graphics_stuff int blue = rgba & 0xff; int alpha = (rgba >> 24) & 0xff; // (2) now modify red, green, blue and alpha as you like; -// make sure that each of the four values stays in the +// make sure that each of the four values stays in the // interval 0 to 255 // ... // (3) and encode back to an int, e.g. to give it to MemoryImageSource or @@ -105,7 +105,7 @@ class graphics_stuff rgba = (alpha << 24) | (red << 16) | (green << 8) | blue; return 0; } - + public static void handlesinglepixel(int x, int y, int pixel) { int alpha = (pixel >> 24) & 0xff; @@ -133,7 +133,7 @@ class graphics_stuff countPixel(_aImage, 0, 0, w, h, aCountNotWhite); return aCountNotWhite.getCount(); } - + public static int countNotBlackPixel(ImageHelper _aImage) { int w = _aImage.getWidth(); @@ -150,8 +150,8 @@ class graphics_stuff public class PixelCounter { // private Image m_aImage; ImageHelper m_aImage; - - + + public int countNotWhitePixel(String _sFile) throws java.io.IOException { @@ -167,14 +167,14 @@ public class PixelCounter { int nw = graphics_stuff.countNotBlackPixel(m_aImage); return nw; } - + public static int countNotWhitePixelsFromImage(String _sFile) throws java.io.IOException { PixelCounter a = new PixelCounter(); return a.countNotWhitePixel(_sFile); } - + public static int countNotBlackPixelsFromImage(String _sFile) throws java.io.IOException { @@ -202,5 +202,5 @@ public class PixelCounter { // } } - + diff --git a/qadevOOo/runner/convwatch/PropertyName.java b/qadevOOo/runner/convwatch/PropertyName.java index 00130faf50e3..36e06b9670a9 100644 --- a/qadevOOo/runner/convwatch/PropertyName.java +++ b/qadevOOo/runner/convwatch/PropertyName.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index 076d5f5804f4..11c5377f181b 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase log.println("found " + PropertyName.DOC_COMPARATOR_INPUT_PATH + " " + sINPATH); m_sInputPath = sINPATH; } - + // REFERENCE_PATH ---------- String sREF = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_PATH ); if (sREF == null || sREF.length() == 0) @@ -122,21 +122,21 @@ public class ReferenceBuilder extends EnhancedComplexTestCase log.println("found " + PropertyName.DOC_COMPARATOR_REFERENCE_PATH + " " + sREF); m_sReferencePath = sREF; } - + if (bQuit == true) { // log.println("must quit."); assure("Must quit, Parameter problems.", false); } - + if (m_sInputPath.startsWith("file:") || m_sReferencePath.startsWith("file:")) { assure("We can't handle file: URL right, use system path instead.", false); } - + } - + /** * Function returns a List of software which must accessable as an external executable */ @@ -148,7 +148,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase } // the test ====================================================================== - public void buildreference() + public void buildreference() { GlobalLogWriter.set(log); String sDBConnection = (String)param.get( PropertyName.DB_CONNECTION_STRING ); @@ -168,7 +168,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase { return; } - + initMember(); DB.init(aGTA.getDBInfoString() + "," + sDBConnection); File aInputPath = new File(m_sInputPath); @@ -182,18 +182,18 @@ public class ReferenceBuilder extends EnhancedComplexTestCase Object[] aList = DirectoryHelper.traverse(m_sInputPath, aFileFilter, aGTA.includeSubDirectories()); // fill into DB - // DB.filesRemove(aGTA.getDBInfoString()); + // DB.filesRemove(aGTA.getDBInfoString()); // for (int j=0;j<aList.length;j++) // { // String sEntry = (String)aList[j]; // DB.fileInsert(aGTA.getDBInfoString(), sEntry, sRemovePath); // } - + // normal run. for (int i=0;i<aList.length;i++) { String sEntry = (String)aList[i]; - + String sNewReferencePath = m_sReferencePath + fs + FileHelper.removeFirstDirectorysAndBasenameFrom(sEntry, m_sInputPath); log.println("- next file is: ------------------------------"); log.println(sEntry); @@ -247,7 +247,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase aGTA = getGraphicalTestArguments(); aGTA.getPerformance().setTime(PerformanceContainer.OfficeStart, nStartTime); } - + // Watcher Object is need in log object to give a simple way to say if a running office is alive. // As long as a log comes, it pings the Watcher and says the office is alive, if not an // internal counter increase and at a given point (300 seconds) the office is killed. @@ -278,7 +278,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase assure(e.getMessage(), false, true); DB.source_failed(e.getMessage()); } - + // Office shutdown if (aProvider != null) { diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 703a2b2f3073..fe144ef3330c 100755 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -2,7 +2,7 @@ ************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,15 +63,15 @@ import helper.OfficeWatcher; // import java.text.SimpleDateFormat; // import java.text.ParsePosition; // import java.sql.Time; -// +// // import java.io.BufferedReader; // import java.io.File; // import java.io.FileReader; // import java.io.IOException; // import java.io.FilenameFilter; -// +// // import java.util.Vector; -// +// // import helper.AppProvider; // import java.text.DecimalFormat; // import util.DynamicClassLoader; @@ -87,7 +87,7 @@ class PropertySetHelper { m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj); } - + /** get a property and don't convert it @param _sName the string name of the property @@ -154,14 +154,14 @@ class PropertyHelper } public class ReportDesignerTest extends ComplexTestCase { - + String mTestDocumentPath; - + /** * This method returns a list of Strings, each string must be a function name in this class. * @return */ - public String[] getTestMethodNames() + public String[] getTestMethodNames() { return new String[] {"ReportDesignTest"}; // MAIN } @@ -182,7 +182,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7); } } - + // if (sOfficePath.startsWith("\"") || // sOfficePath.startsWith("'")) // { @@ -198,20 +198,20 @@ public class ReportDesignerTest extends ComplexTestCase { System.exit(0); } } - - + + private static XDesktop m_xDesktop = null; public static XDesktop getXDesktop() { - if (m_xDesktop == null) + if (m_xDesktop == null) { - try + try { XInterface xInterface = (XInterface) m_xXMultiServiceFactory.createInstance( "com.sun.star.frame.Desktop" ); m_xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface); } - catch (com.sun.star.uno.Exception e) + catch (com.sun.star.uno.Exception e) { log.println("ERROR: uno.Exception caught"); log.println("Message: " + e.getMessage()); @@ -219,7 +219,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return m_xDesktop; } - + private void showElements(XNameAccess _xNameAccess) { if (_xNameAccess != null) @@ -235,8 +235,8 @@ public class ReportDesignerTest extends ComplexTestCase { System.out.println("Warning: Given object is null."); } } - - + + private OfficeProvider m_aProvider = null; private static XMultiServiceFactory m_xXMultiServiceFactory = null; private void startOffice() @@ -261,7 +261,7 @@ public class ReportDesignerTest extends ComplexTestCase { } TimeHelper.waitInSeconds(2, "Give close Office some time."); } - + private String m_sMailAddress = null; private String m_sParentDistinct = null; @@ -279,7 +279,7 @@ public class ReportDesignerTest extends ComplexTestCase { /** * This is the main test Function of current ReportDesignerTest */ - public void ReportDesignTest() + public void ReportDesignTest() { convwatch.GlobalLogWriter.set(log); @@ -289,15 +289,15 @@ public class ReportDesignerTest extends ComplexTestCase { try { - + // -------------------- preconditions, try to find an office -------------------- - + String sAppExecutionCommand = (String) param.get("AppExecutionCommand"); log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); String sUser = System.getProperty("user.name"); log.println("user.name='" + sUser + "'"); - + // String sVCSID = System.getProperty("VCSID"); // log.println("VCSID='" + sVCSID + "'"); // m_sMailAddress = sVCSID + "@openoffice.org"; @@ -319,24 +319,24 @@ public class ReportDesignerTest extends ComplexTestCase { System.out.println("Error, Sourceversion is null."); System.exit(1); } - + sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); - + // an other way to replace strings // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser); - + checkIfOfficeExists(sAppExecutionCommand); param.put("AppExecutionCommand", new String(sAppExecutionCommand)); - + // System.exit(1); // --------------------------- Start the given Office --------------------------- - + startOffice(); - + // ------------------------------ Start a test run ------------------------------ - + // String sCurrentDirectory = System.getProperty("user.dir"); // log.println("Current Dir: " + sCurrentDirectory); String sDocument = (String) param.get(convwatch.PropertyName.DOC_COMPARATOR_INPUT_PATH); @@ -360,57 +360,57 @@ public class ReportDesignerTest extends ComplexTestCase { stopOffice(); throw new AssureException(e.getMessage()); } - + // ------------------------------ Office shutdown ------------------------------ stopOffice(); } - + // ----------------------------------------------------------------------------- private void startTestForFile(String _sDocument /*, int _nType*/) { File aFile = new File(_sDocument); assure("Test File '" + _sDocument + "' doesn't exist.", aFile.exists()); - + String sFileURL = URLHelper.getFileURLFromSystemPath(_sDocument); log.println("File URL: " + sFileURL); - + XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null); log.println("Load done"); -// context = createUnoService("com.sun.star.sdb.DatabaseContext") +// context = createUnoService("com.sun.star.sdb.DatabaseContext") // oDataBase = context.getByName("hh") // oDBDoc = oDataBase.DatabaseDocument -// -// dim args(1) as new com.sun.star.beans.PropertyValue -// args(0).Name = "ActiveConnection" -// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") -// reportContainer = oDBDoc.getReportDocuments() +// +// dim args(1) as new com.sun.star.beans.PropertyValue +// args(0).Name = "ActiveConnection" +// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") +// reportContainer = oDBDoc.getReportDocuments() // report = reportContainer.loadComponentFromURL("Report40","",0,args) - + try { XInterface x = (XInterface)m_xXMultiServiceFactory.createInstance("com.sun.star.sdb.DatabaseContext"); assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null); log.println("createInstance com.sun.star.sdb.DatabaseContext done"); - + XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); // log.println("1"); - + // PropertySetHelper aHelper = new PropertySetHelper(aObj); XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); // Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument"); XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - + // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument); assure("can't access DatabaseDocument", xOfficeDBDoc != null); // log.println("2"); - + XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); assure("Controller of xOfficeDatabaseDocument is empty!", aController != null); // log.println("3"); - + XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); aDBDocUI.connect(); // if (aDBDocUI.isConnected()) @@ -422,28 +422,28 @@ public class ReportDesignerTest extends ComplexTestCase { // System.out.println("false"); // } // log.println("4"); - + // aHelper = new PropertySetHelper(aController); - + // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); - Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); + Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assure("ActiveConnection is empty", aActiveConnectionObj != null); // log.println("5"); - + XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); // log.println("5"); - + showElements(xNameAccess); - + ArrayList aPropertyList = new ArrayList(); - + PropertyValue aActiveConnection = new PropertyValue(); aActiveConnection.Name = "ActiveConnection"; aActiveConnection.Value = aActiveConnectionObj; aPropertyList.add(aActiveConnection); - + loadAndStoreReports(xNameAccess, aPropertyList /*, _nType*/ ); createDBEntry(/*_nType*/); } @@ -452,12 +452,12 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("ERROR: Exception caught"); log.println("Message: " + e.getMessage()); } - + // String mTestDocumentPath = (String) param.get("TestDocumentPath"); // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); // // workaround for issue using deprecated "DOCPTH" prop // System.setProperty("DOCPTH", mTestDocumentPath); - + // Close the document closeComponent(xDocComponent); } @@ -467,7 +467,7 @@ public class ReportDesignerTest extends ComplexTestCase { return "AutogenReportDesignTest"; // return getFileFormat(_nType); } - + // ----------------------------------------------------------------------------- private void createDBEntry(/*int _nType*/) { @@ -503,7 +503,7 @@ public class ReportDesignerTest extends ComplexTestCase { // DB.test(); // System.exit(1); } - + private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList /*, int _nType*/ ) { if (_xNameAccess != null) @@ -540,7 +540,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return sExtension; } - + // switch(_nType) // { // case WRITER: @@ -570,7 +570,7 @@ public class ReportDesignerTest extends ComplexTestCase { // } // return sFileType; // } - + private String m_sOutputPath = null; private String getOutputPath(/*int _nType*/) @@ -588,17 +588,17 @@ public class ReportDesignerTest extends ComplexTestCase { // sOutputPath += "tmp_123"; sOutputPath += DateHelper.getDateTimeForFilename(); sOutputPath += System.getProperty("file.separator"); - + // sOutputPath += getFileFormat(_nType); // sOutputPath += System.getProperty("file.separator"); - + File aOutputFile = new File(sOutputPath); // create the directory of the given output path aOutputFile.mkdirs(); m_sOutputPath = sOutputPath; } return m_sOutputPath; } - + /* store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH */ @@ -615,7 +615,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOutputPath += _sName; sOutputPath += getFormatExtension(_xComponent /*_nType*/); - + String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath); ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL @@ -647,7 +647,7 @@ public class ReportDesignerTest extends ComplexTestCase { } } } - + private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList) { XComponent xDocComponent = null; @@ -690,5 +690,5 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("Message: " + e.getMessage()); } } - + } diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java index 9d608bdb332b..cbcf2468af2b 100644 --- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java +++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ String m_sInternSemaphoreFile; File m_aInternSemaphoreFile; GlobalLogWriter m_aLog; - + public static void sleep( int _nSeconds) { // wait a second here @@ -48,7 +48,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ { } } - + public SimpleFileSemaphore() throws IllegalArgumentException { String sInternFileName; @@ -65,7 +65,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ m_sInternSemaphoreFile = null; throw new IllegalArgumentException("Unknown System, can't initialise SimpleFileSemaphore"); } - + m_sInternSemaphoreFile = sInternFileName; m_aInternSemaphoreFile = new File(sInternFileName); } @@ -80,7 +80,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ { int nCount = 0; int nCheckLoop = 1; - + while ( nCheckLoop == 1) { // check if resource is available, if not, wait. @@ -104,7 +104,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ } } } - + // block resource by ourself try { @@ -112,7 +112,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ aWriter.writeByte((int)1); aWriter.close(); } - + catch (java.io.FileNotFoundException fne) { m_aLog.get().println( "caught: FileNotFoundException"); @@ -156,7 +156,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ System.out.println("FAILED"); } } - + private static void testSemaphoreFile(SimpleFileSemaphore a, boolean _bShouldFileExists) { System.out.println("Check if semaphore file exists."); @@ -171,8 +171,8 @@ public class SimpleFileSemaphore /* extends *//* implements */ assure(_bShouldFileExists == SEMAPHORE_SHOULD_NOT_EXIST, "Semaphore should not exist!"); } } - - public static void main( String[] argv ) + + public static void main( String[] argv ) { SimpleFileSemaphore a = new SimpleFileSemaphore(); diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java index d37fa4a79af4..797c683c6a51 100644 --- a/qadevOOo/runner/convwatch/StatusHelper.java +++ b/qadevOOo/runner/convwatch/StatusHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ public class StatusHelper final static public int DIFF_DIFFERENCES_FOUND = 3; final static public int DIFF_AFTER_MOVE_DONE_NO_PROBLEMS = 4; final static public int DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND = 5; - + // public String m_sOutputPath; public String m_sMainName; @@ -61,9 +61,9 @@ public class StatusHelper m_sOld_BM_Gfx = _sOldGfx; m_sNew_BM_Gfx = _sNewGfx; m_sDiff_BM_Gfx = _sDiffGfx; - + } - + public void printStatus() { GlobalLogWriter.get().println(" Original file: " + m_sOldGfx); @@ -96,10 +96,10 @@ public class StatusHelper } + - -// TODO: stream output +// TODO: stream output // public stream& statusline(stream) // { // stream << name << "PASS" << nDiff==0?"PASS":"FAIL" << endl; diff --git a/qadevOOo/runner/convwatch/StringHelper.java b/qadevOOo/runner/convwatch/StringHelper.java index b20e3b6bea01..671c0a2eeeaa 100644 --- a/qadevOOo/runner/convwatch/StringHelper.java +++ b/qadevOOo/runner/convwatch/StringHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,30 +26,30 @@ ************************************************************************/ // LLA: moved to helper.StringHelper package convwatch; -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper public class StringHelper { -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper public static String doubleQuote(String _sStr) // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper return "\"" + _sStr + "\""; -// LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper } +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper public static String singleQuote(String _sStr) // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper return "'" + _sStr + "'"; // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper public static String removeQuoteIfNeed(String _sPath) // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper String sNewPath = _sPath; -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper if (_sPath.startsWith("\"") || // LLA: moved to helper.StringHelper _sPath.startsWith("'")) // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper // remove trailing quotes, if exists // LLA: moved to helper.StringHelper sNewPath = sNewPath.substring(1); // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper if (_sPath.endsWith("\"") || // LLA: moved to helper.StringHelper _sPath.endsWith("'")) // LLA: moved to helper.StringHelper { @@ -58,7 +58,7 @@ // LLA: moved to helper.StringHelper } // LLA: moved to helper.StringHelper return sNewPath; // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper public static String doubleQuoteIfNeed(String _sStr) // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper if (_sStr.startsWith("\"") && _sStr.endsWith("\"")) @@ -75,17 +75,17 @@ // LLA: moved to helper.StringHelper { // LLA: moved to helper.StringHelper return singleQuote(_sStr); // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper return doubleQuote(_sStr); // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper /** // LLA: moved to helper.StringHelper * Convert a value to a string with a given length, if the len is greater the len of the value string representation // LLA: moved to helper.StringHelper * fill it's front with '0' // LLA: moved to helper.StringHelper * So ("5", 4) will result in a string "0005" // LLA: moved to helper.StringHelper * @param _nValue // LLA: moved to helper.StringHelper * @param _nLen -// LLA: moved to helper.StringHelper * @return +// LLA: moved to helper.StringHelper * @return // LLA: moved to helper.StringHelper */ // LLA: moved to helper.StringHelper public static String createValueString(int _nValue, int _nLen) // LLA: moved to helper.StringHelper { @@ -99,5 +99,5 @@ // LLA: moved to helper.StringHelper a.append(sValue); // LLA: moved to helper.StringHelper return a.toString(); // LLA: moved to helper.StringHelper } -// LLA: moved to helper.StringHelper +// LLA: moved to helper.StringHelper // LLA: moved to helper.StringHelper } diff --git a/qadevOOo/runner/convwatch/TimeHelper.java b/qadevOOo/runner/convwatch/TimeHelper.java index 923568db51c8..4ca320a9a66f 100755 --- a/qadevOOo/runner/convwatch/TimeHelper.java +++ b/qadevOOo/runner/convwatch/TimeHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 7a9e9312c6bb..1d713b9bd12c 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ public class TriState int m_nValue; /** - Allocates a <code>TriState</code> object representing the - <code>value</code> argument. - + Allocates a <code>TriState</code> object representing the + <code>value</code> argument. + @param value the value of the <code>TriState</code>. */ public TriState(int value) @@ -55,22 +55,22 @@ public class TriState return m_nValue; } /** - Returns <code>true</code> if and only if the argument is not - <code>null</code> and is a <code>TriState</code> object that - contains the same <code>int</code> value as this object. - + Returns <code>true</code> if and only if the argument is not + <code>null</code> and is a <code>TriState</code> object that + contains the same <code>int</code> value as this object. + @param obj the object to compare with. @return <code>true</code> if the objects are the same; <code>false</code> otherwise. */ - - public boolean equals(Object obj) + + public boolean equals(Object obj) { if ((obj != null) && (obj instanceof TriState)) { return m_nValue == ((TriState)obj).intValue(); - } + } return false; } } diff --git a/qadevOOo/runner/convwatch/ValueNotFoundException.java b/qadevOOo/runner/convwatch/ValueNotFoundException.java index 04957187d126..9ee7c9365ee7 100644 --- a/qadevOOo/runner/convwatch/ValueNotFoundException.java +++ b/qadevOOo/runner/convwatch/ValueNotFoundException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index cf9188d84a47..ed6ebaba6ec2 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/qadevOOo/runner/graphical/BuildID.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ public class BuildID { GlobalLogWriter.println("soffice executable not found."); } - + // int dummy = 0; return sBuildID; } @@ -164,10 +164,10 @@ public class BuildID // // sApp = "/opt/staroffice8_net/program/soffice"; // // sBuildID = getBuildID(sApp); // // System.out.println("BuildID is: " + sBuildID); -// // +// // // // sApp = "\"/opt/staroffice8_net/program/soffice\" test blah"; // // sBuildID = getBuildID(sApp); -// // +// // // // System.out.println("BuildID is: " + sBuildID); // System.exit(1); // } diff --git a/qadevOOo/runner/graphical/DateHelper.java b/qadevOOo/runner/graphical/DateHelper.java index 07a5c5844099..1be49e1701a1 100644 --- a/qadevOOo/runner/graphical/DateHelper.java +++ b/qadevOOo/runner/graphical/DateHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ public class DateHelper { return getDateString("yyyyMMdd-HHmmss"); } - + public static String getDateTimeForHumanreadableLog() { return getDateString("[yyyy/MM/dd HH:mm:ss]"); @@ -48,7 +48,7 @@ public class DateHelper { GregorianCalendar aCalendar = new GregorianCalendar(); StringBuffer aBuf = new StringBuffer(); - + Locale aLocale = new Locale("en","US"); SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale); aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) ); diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index 46930d19425f..83d47103592c 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import java.util.ArrayList; * @author lla@openoffice.org */ public class DirectoryHelper -{ +{ ArrayList<String> m_aFileList = new ArrayList<String>(); boolean m_bRecursiveIsAllowed = true; @@ -45,12 +45,12 @@ public class DirectoryHelper { m_bRecursiveIsAllowed = _bValue; } - + /** * Traverse over a given directory, and filter with a given FileFilter * object and gives back the deep directory as a Object[] list, which * contain a String object for every directory entry. - * + * * <B>Example</B> * List directory /bin, filter out all files which ends with '.prn' * @@ -65,16 +65,16 @@ public class DirectoryHelper * return true; * } * }; - * + * * Object[] aList = DirectoryHelper.traverse("/bin", aFileFilter); * for (int i=0;i<aList.length;i++) * { * String aEntry = (String)aList[i]; * System.out.println(aEntry); * } - * - * @param _sDirectory - * @param _aFileFilter + * + * @param _sDirectory + * @param _aFileFilter * @param _bRecursiveIsAllowed * @return list of directories */ @@ -85,7 +85,7 @@ public class DirectoryHelper a.traverse_impl(_sDirectory, _aFileFilter); return a.m_aFileList.toArray(); } - + public static Object[] traverse( String _sDirectory, boolean _bRecursiveIsAllowed ) { DirectoryHelper a = new DirectoryHelper(); @@ -93,8 +93,8 @@ public class DirectoryHelper a.traverse_impl(_sDirectory, null); return a.m_aFileList.toArray(); } - - void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) + + void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) { File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception @@ -102,7 +102,7 @@ public class DirectoryHelper { throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); } - + // Getting all files and directories in the current directory File[] aDirEntries; if (_aFileFilter != null) @@ -113,7 +113,7 @@ public class DirectoryHelper { aDirEntries = fileDirectory.listFiles(); } - + // Iterating for each file and directory for ( int i = 0; i < aDirEntries.length; ++i ) { @@ -125,7 +125,7 @@ public class DirectoryHelper traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter ); } } - else + else { // adding file to List try @@ -149,7 +149,7 @@ public class DirectoryHelper // { // String sDirectory = "/misc/convwatch/gfxcmp/data/doc-pool/demo"; // Object[] aDirectoryList = DirectoryHelper.traverse( sDirectory, false ); - // + // // for (int i=0;i<aDirectoryList.length;i++) // { // String sEntry = (String)aDirectoryList[i]; diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index c3ec2b3e8336..020016111bfa 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import java.util.ArrayList; abstract public class EnhancedComplexTestCase extends ComplexTestCase implements IDocument { - + private void callEntry(String _sEntry, ParameterHelper _aParam) { // log.println("- next file is: ------------------------------"); @@ -96,7 +96,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) } } - + /** * Run through all documents found in Inputpath. * Call the IDocument interface function call(...); @@ -200,7 +200,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) else { String sInputPathWithPS = sInputPath + ".ps"; - + File aInputPathWithPS = new File(sInputPathWithPS); if (aInputPathWithPS.exists()) { @@ -237,7 +237,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) for (int i=0;i<nFileCount;i++) { String sValue = aIniFile.getValue(_sBasename, "report" + i); - + String sPSorPDFName = getPSorPDFNameFromIniFile(aIniFile, sValue); if (sPSorPDFName.length() > 0) { @@ -250,12 +250,12 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) int nOkStatus = 0; String sStatusRunThrough = ""; String sStatusInfo = ""; - // get the bad status and store it into the + // get the bad status and store it into the for (int i=0;i<aList.size();i++) { String sEntry = aList.get(i); callEntry(sEntry, _aParam); - + // we want to know the current status of the run through // if the status is greater (more bad) then the current, // we will remember this. Only the very bad status will @@ -278,7 +278,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) { // runThroughOneFileInIndex(); String sPSorPDFName = getPSorPDFNameFromIniFile(aIniFile, _sBasename); - + aIniFile.close(); if (sPSorPDFName.length() > 0) @@ -293,7 +293,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) assure("File '" + sIndexFile + "' doesn't exists.", aIndexFile.exists(), true); } } - + private String getPSorPDFNameFromIniFile(IniFile _aIniFile, String _sName) { boolean bHasPostscriptOrPDF = false; @@ -316,10 +316,10 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) } return ""; } - + public void runThroughOneFileInIndex(String _sPath, String _sBasename, ParameterHelper _aParam) { - + } /** * Run through a given index.ini or run through a given directory, @@ -371,26 +371,26 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) else { // check if there exists a ini file - String sPath = FileHelper.getPath(sInputPath); + String sPath = FileHelper.getPath(sInputPath); String sBasename = FileHelper.getBasename(sInputPath); runThroughEveryReportInIndex(sPath, sBasename, _aParam); - + String sStatusRunThrough = (String)_aParam.getTestParameters().get("last_state"); String sStatusInfo = (String)_aParam.getTestParameters().get("last_info"); if (sStatusRunThrough != null && sStatusInfo != null ) { - // store the bad status in the <Name>.odb.ps.ini file + // store the bad status in the <Name>.odb.ps.ini file String sOutputPath = _aParam.getOutputPath(); String sBasenameIni = FileHelper.appendPath(sOutputPath, sBasename + ".ps.ini"); IniFile aBasenameIni = new IniFile(sBasenameIni); aBasenameIni.insertValue("global", "state", sStatusRunThrough); - aBasenameIni.insertValue("global", "info", sStatusInfo); + aBasenameIni.insertValue("global", "info", sStatusInfo); aBasenameIni.close(); } - + } } catch (OfficeException e) @@ -402,7 +402,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) } } } - + /** * Run through a given index.ini or run through a given directory, @@ -429,18 +429,18 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) else { // check if there exists an ini file - String sPath = FileHelper.getPath(sInputPath); + String sPath = FileHelper.getPath(sInputPath); String sBasename = FileHelper.getBasename(sInputPath); runThroughEveryReportInIndex(sPath, sBasename, _aParam); - + // Create a HTML page which shows locally to all files in .odb if (sInputPath.toLowerCase().endsWith(".odb")) { String sIndexFile = FileHelper.appendPath(sPath, "index.ini"); File aIndexFile = new File(sIndexFile); if (aIndexFile.exists()) - { + { IniFile aIniFile = new IniFile(sIndexFile); if (aIniFile.hasSection(sBasename)) @@ -464,7 +464,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) HTMLResult aOutputter = new HTMLResult(sPath, sBasename + ".ps.html" ); aOutputter.header("content of DB file: " + sBasename); aOutputter.indexSection(sBasename); - + for (int i=0;i<aList.size();i++) { String sPSFile = aList.get(i); @@ -504,7 +504,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) // } // catch (java.io.IOException e) // { -// +// // } } } @@ -514,6 +514,6 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) } } } - - + + } diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 892f652567c1..9599e6190c1a 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ public class FileHelper String sOSName = System.getProperty("os.name"); String sOSArch = System.getProperty("os.arch"); String sOSVersion = System.getProperty("os.version"); - + GlobalLogWriter.println(sOSName); GlobalLogWriter.println(sOSArch); GlobalLogWriter.println(sOSVersion); } - + public static void MessageBox(String _sStr) { String sVersion = System.getProperty("java.version"); @@ -83,17 +83,17 @@ public class FileHelper // System.out.println( _sFile ); // System.out.println( aFile.getAbsolutePath() ); // MessageBox("Der JavaProzess wartet auf eine interaktion ihrerseits."); - // + // // File aFile2 = new File(_sFile); // if (aFile2.exists()) // { // System.out.println("Thanks, file exists." ); // return true; // } - // } + // } return false; } - + public static boolean isDir(String _sDir) { if (_sDir == null) @@ -115,7 +115,7 @@ public class FileHelper } return false; } - + public static String getBasename(String _sFilename) { if (_sFilename == null) @@ -149,7 +149,7 @@ public class FileHelper } return _sFilename; } - + public static String getSuffix(String _sFilename) { if (_sFilename == null) @@ -163,7 +163,7 @@ public class FileHelper } return ""; } - + public static String getPath(String _sFilename) { if (_sFilename == null) @@ -186,19 +186,19 @@ public class FileHelper /* static ArrayList files = new ArrayList(); - public static Object[] traverse( String afileDirectory ) + public static Object[] traverse( String afileDirectory ) { - + File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception if ( !fileDirectory.isDirectory() ) { throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); } - + // Getting all files and directories in the current directory File[] entries = fileDirectory.listFiles(); - + // Iterating for each file and directory for ( int i = 0; i < entries.length; ++i ) { @@ -237,7 +237,7 @@ public class FileHelper first = path.substring(0, n); path = path.substring(n + 1); } - + String already_done = null; StringTokenizer path_tokenizer = new StringTokenizer(path,fs,false); already_done = first; @@ -249,7 +249,7 @@ public class FileHelper // System.out.println(already_done); //create the directory new_dir.mkdirs(); - if (OSHelper.isUnix() && + if (OSHelper.isUnix() && _sMode.length() > 0) { try @@ -268,7 +268,7 @@ public class FileHelper public static void chmod(File file, String mode) throws java.io.IOException { Runtime.getRuntime().exec - (new String[] + (new String[] {"chmod", mode, file.getAbsolutePath()}); } @@ -305,7 +305,7 @@ public class FileHelper sSubDirs = sSubDirs.substring(1); } } - + return sSubDirs; } @@ -380,11 +380,11 @@ public class FileHelper } } - public static void copy(String _sSource, String _sDestination) + public static void copy(String _sSource, String _sDestination) { FileInputStream aFIS = null; FileOutputStream aFOS = null; - + try { aFIS = new FileInputStream(_sSource); @@ -416,11 +416,11 @@ public class FileHelper } catch (java.io.IOException e) { - System.out.println("Error: caught Exception: " + e.getMessage()); + System.out.println("Error: caught Exception: " + e.getMessage()); } } } - + // try // { // File inputFile = new File(_sSource); @@ -429,12 +429,12 @@ public class FileHelper // java.io.FileReader in = new java.io.FileReader(inputFile); // java.io.FileWriter out = new java.io.FileWriter(outputFile); // int c; -// +// // while ((c = in.read()) != -1) // { // out.write(c); // } -// +// // in.close(); // out.close(); // } @@ -445,12 +445,12 @@ public class FileHelper // } } - + /** * Within the directory run through, it's possible to say which file extension types should not * consider like '*.prn' because it's not a document. * - * @return a FileFilter function + * @return a FileFilter function */ public static FileFilter getFileFilter() { @@ -462,7 +462,7 @@ public class FileHelper if (pathname.getName().startsWith("~$")) { return false; - } + } // leave out files starts with '.~lock.' these are OpenOffice.org lock files if (pathname.getName().startsWith(".~lock.")) { @@ -490,7 +490,7 @@ public class FileHelper if (pathname.getName().endsWith("_")) { return false; - } + } return true; } }; @@ -500,7 +500,7 @@ public class FileHelper * Within the directory run through, it's possible to say which file extension types should not * consider like '*.prn' because it's not a document. * - * @return a FileFilter function + * @return a FileFilter function */ public static FileFilter getFileFilterPSorPDF() { @@ -511,7 +511,7 @@ public class FileHelper if (pathname.getName().endsWith(".ps")) { return true; - } + } if (pathname.getName().endsWith(".pdf")) { return true; @@ -525,7 +525,7 @@ public class FileHelper * Within the directory run through, it's possible to say which file extension types should not * consider like '*.prn' because it's not a document. * - * @return a FileFilter function + * @return a FileFilter function */ public static FileFilter getFileFilterJPEG() { @@ -536,7 +536,7 @@ public class FileHelper if (pathname.getName().toLowerCase().endsWith(".jpg")) { return true; - } + } if (pathname.getName().toLowerCase().endsWith(".jpeg")) { return true; @@ -550,7 +550,7 @@ public class FileHelper * Within the directory run through, it's possible to say which file extension types should not * consider like '*.ini' because it's not a document. * - * @return a FileFilter function + * @return a FileFilter function */ public static FileFilter getFileFilterINI() { @@ -567,7 +567,7 @@ public class FileHelper if (sPathname.endsWith(".ini")) { return true; - } + } return false; } }; @@ -595,7 +595,7 @@ public class FileHelper { createInfoFile(_sFile, _aGTA, ""); } - + public static void createInfoFile(String _sFile, ParameterHelper _aGTA, String _sSpecial) { String sFilename; @@ -616,7 +616,7 @@ public class FileHelper IniFile aIniFile = new IniFile(sIniFile); // OLD INFO FILE - + // String fs = System.getProperty("file.separator"); String ls = System.getProperty("line.separator"); String sInfoFilename = FileHelper.appendPath(sFileDir, sNameNoSuffix + ".info"); @@ -628,7 +628,7 @@ public class FileHelper { FileOutputStream out2 = new FileOutputStream(aInfoFile.toString()); PrintStream out = new PrintStream(out2); - + out.println("# automatically created file by graphical compare"); if (_aGTA != null) { @@ -645,7 +645,7 @@ public class FileHelper out.println("buildid=" + sBuildID); } aIniFile.insertValue("global", "buildid", sBuildID); - + // if (_sSpecial != null && _sSpecial.length() > 0) // { // out.write("special=" + _sSpecial + ls); @@ -667,7 +667,7 @@ public class FileHelper // out.write("# time is given in milli seconds" + ls); // out.write("time=" + nTime + ls); // } - + out.println(); out.println("# Values out of System.getProperty(...)"); out.println("os.name=" + System.getProperty("os.name")); @@ -685,7 +685,7 @@ public class FileHelper _aGTA.getPerformance().print(out); _aGTA.getPerformance().print(aIniFile, "global"); } - + out.flush(); out.close(); out2.close(); @@ -696,13 +696,13 @@ public class FileHelper e.printStackTrace(); } aIniFile.close(); - + // String sExtension = FileHelper.getSuffix(_aGTA.getInputFile()); // if (sExtension.startsWith(".")) // { // sExtension = sExtension.substring(1); // } -// +// // DB.writeToDB(_aGTA.getInputFile(), // sNameNoSuffix, // sExtension, @@ -711,7 +711,7 @@ public class FileHelper // _aGTA.getResolutionInDPI() // ); } - + public static void addBasenameToFile(String _sIndexFilename, String _sBasename, String _sCreator, String _sType, String _sSource) { // String sOutputDir = FileHelper.getPath(_sOutputFilename); @@ -762,6 +762,6 @@ public class FileHelper // String sBasename = FileHelper.getBasename(_sOutputFilename); addBasenameToFile(sIndexFilename, _sBasename, _sCreator, _sType, _sSource); } - + } diff --git a/qadevOOo/runner/graphical/GlobalLogWriter.java b/qadevOOo/runner/graphical/GlobalLogWriter.java index 478d3323abda..75f61e92ed02 100644 --- a/qadevOOo/runner/graphical/GlobalLogWriter.java +++ b/qadevOOo/runner/graphical/GlobalLogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,16 +57,16 @@ public class GlobalLogWriter } return m_aGlobalLogWriter; } - + // public static synchronized void initialize() // { // get().initialize(null, true); // } - + protected static synchronized void set(LogWriter _aLog) { m_aGlobalLogWriter = _aLog; } - + } diff --git a/qadevOOo/runner/graphical/GraphicalComparator.java b/qadevOOo/runner/graphical/GraphicalComparator.java index c10bbff8b49e..cba02f78b819 100644 --- a/qadevOOo/runner/graphical/GraphicalComparator.java +++ b/qadevOOo/runner/graphical/GraphicalComparator.java @@ -11,7 +11,7 @@ package graphical; * * @author ll93751 */ -public class GraphicalComparator extends EnhancedComplexTestCase +public class GraphicalComparator extends EnhancedComplexTestCase { // @Override @@ -22,7 +22,7 @@ public class GraphicalComparator extends EnhancedComplexTestCase public void check() { } - + public void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/qadevOOo/runner/graphical/HTMLResult.java b/qadevOOo/runner/graphical/HTMLResult.java index af2a31a308ea..6bb78afd8e25 100644 --- a/qadevOOo/runner/graphical/HTMLResult.java +++ b/qadevOOo/runner/graphical/HTMLResult.java @@ -2,7 +2,7 @@ ************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ public class HTMLResult private FileWriter m_aOut; // private String m_sFilename; // private String m_sNamePrefix; // the HTML files used a suffix to build it's right name - + /** * ls is the current line separator (carridge return) */ @@ -66,9 +66,9 @@ public class HTMLResult // a.m_sNamePrefix = _sNamePrefix; // return a; } - + // public String getFilename() {return m_sFilename;} - + private void writeln(String _sStr) { try @@ -91,7 +91,7 @@ public class HTMLResult } } - + /** * create the HTML header * @param _sTitle @@ -105,14 +105,14 @@ public class HTMLResult writeln( "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"/gfxcmp_ui/style.css\" media=\"screen\" />"); writeln( "</HEAD>"); writeln( "<BODY bgcolor=white>"); - flush(); + flush(); } - + final static String TEST_TABLETITLE = "Document"; final static String VISUAL_STATUS_TABLETITLE = "Visual status"; final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message"; final static String FIRSTGFX_TABLETITLE = "Original print file as jpeg"; - + public void indexSection(String _sOfficeInfo) { writeln( "<H2>Results for " + _sOfficeInfo + "</H2>"); @@ -160,7 +160,7 @@ public class HTMLResult a.append("</TD>"); return a.toString(); } - + /** * Returns the given _sValue as a HTML Table header cell with _sValue as content * @param _sValue @@ -174,18 +174,18 @@ public class HTMLResult a.append("</TH>"); return a.toString(); } - + public void indexLine(String _sHTMLFile, String _sHTMLName, String _sStatusRunThrough, String _sStatusMessage) { writeln( "<TR>"); writeln(tableDataCell( getHREF(_sHTMLFile, _sHTMLName) ) ); - writeln(tableDataCell( "" ) ); + writeln(tableDataCell( "" ) ); writeln( tableDataCell(_sStatusRunThrough) ); writeln( tableDataCell(_sStatusMessage) ); writeln( "</TR>"); flush(); } - + public void close() { writeln( "</TABLE>"); @@ -198,7 +198,7 @@ public class HTMLResult { } } - + // ----------------------------------------------------------------------------- private String stronghtml(String _sValue) { @@ -208,5 +208,5 @@ public class HTMLResult a.append("</STRONG>"); return a.toString(); } - + } diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/runner/graphical/IDocument.java index e23ddd4b91a1..da6135559154 100644 --- a/qadevOOo/runner/graphical/IDocument.java +++ b/qadevOOo/runner/graphical/IDocument.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ public interface IDocument * @param _sDocument * @param _sResult * @param _aParams - * @throws OfficeException + * @throws OfficeException */ public void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException; } diff --git a/qadevOOo/runner/graphical/IOffice.java b/qadevOOo/runner/graphical/IOffice.java index ec1dc3b7371f..6d2d316aac12 100644 --- a/qadevOOo/runner/graphical/IOffice.java +++ b/qadevOOo/runner/graphical/IOffice.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ public interface IOffice * @throws graphical.OfficeException */ public void start() throws OfficeException; - + /** * Load a document by it's Name - * @param Name + * @param Name * @throws graphical.OfficeException */ public void load(String Name) throws OfficeException; diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index e016e08f0df1..4aa77224c7e2 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class ImageHelper int m_w = 0; int m_h = 0; boolean m_bGrabbed = false; - + private ImageHelper(Image _aImage) { m_aImage = _aImage; @@ -79,7 +79,7 @@ class ImageHelper // Write down the current image to a file. // public void storeImage(String _sFilename) - // { + // { // } public static ImageHelper createImageHelper(String _sFilename) @@ -114,7 +114,7 @@ class ImageHelper "Cannot construct object with current Java version " + javaVersion + ": " + ex.getMessage()); } -// aImage = ImageIO.read(aFile); +// aImage = ImageIO.read(aFile); return new ImageHelper(aImage); } } diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index bd54a66b65fd..397f457569f5 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -562,7 +562,7 @@ public class IniFile implements Enumeration // } // sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue); // sLocalValue = replaceEvaluatedKey("global", sLocalValue); - // + // // return sLocalValue; // } public void removeSection(String _sSectionToRemove) diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index a643b2b333c3..3e872281ef82 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -309,7 +309,7 @@ public class JPEGComparator extends EnhancedComplexTestCase // Failure matrix // 0 1 // ugly OK FAILED - // bad OK + // bad OK // good OK if (ugly > 0) @@ -425,7 +425,7 @@ public class JPEGComparator extends EnhancedComplexTestCase String sDestination = FileHelper.appendPath(sDestinationPath, sNewSourceBasename); FileHelper.copy(sSource, sDestination); sSourceBasename = sNewSourceBasename; - // + // JPEGCreator.convertToNearSameFileWithWidth340(sDestination); } String sDifferenceBasename = "Difference_between_" + FileHelper.getNameNoSuffix(sSourceBasename) + "_and_" + FileHelper.getNameNoSuffix(sDestinationBasename) + ".jpg"; @@ -530,14 +530,14 @@ public class JPEGComparator extends EnhancedComplexTestCase //// String sHTMLFile = _sFilenamePrefix + sNameNoSuffix + ".html"; //// HTMLOutputter HTMLoutput = HTMLOutputter.create(_sOutputPath, sHTMLFile, "", ""); //// HTMLoutput.header(sNameNoSuffix); -//// TODO: version info was fine +//// TODO: version info was fine //// HTMLoutput.checkSection(sBasename); // // Status end // // String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; // INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, "", ""); // INIoutput.createHeader(); -//// TODO: version info was fine +//// TODO: version info was fine // // INIoutput.writeSection("global"); // INIoutput.writeValue("pages", String.valueOf(aList.length)); @@ -551,7 +551,7 @@ public class JPEGComparator extends EnhancedComplexTestCase // { // INIoutput.writeSection("page" + String.valueOf(i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1) // aList[i].printStatus(); -// +// // boolean bCurrentResult = true; // result over exact one page // // int nCurrentDiffStatus = aList[i].nDiffStatus; @@ -605,9 +605,9 @@ public class JPEGComparator extends EnhancedComplexTestCase * text like outlined or the text is little bit move left, right up or down. * * >>100% Yes it's possible that there is a difference more then 100%, maybe a font problem - * between old and new graphics. The font of the new graphics is little bit bigger, + * between old and new graphics. The font of the new graphics is little bit bigger, * so the pixel count between old graphics and new graphics is twice the more. - * + * * @param _sOldGfx path & name to the jpeg file (1) * @param _sNewGfx path & name to the other jpeg file (2) * @param _sDiffGfx path & name to the new difference file which shows the difference between (1) and (2) diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index a4336229e448..922af500e7f1 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ import java.io.File; * * @author ll93751 */ -public class JPEGCreator extends EnhancedComplexTestCase +public class JPEGCreator extends EnhancedComplexTestCase { // @Override public String[] getTestMethodNames() @@ -53,11 +53,11 @@ public class JPEGCreator extends EnhancedComplexTestCase { GlobalLogWriter.set(log); ParameterHelper aParam = new ParameterHelper(param); - + // run through all documents found in Inputpath foreachPSorPDFinInputPath(aParam); } - + public void checkOneFile(String _sDocumentName, String _sResult, ParameterHelper _aParams) throws OfficeException { @@ -68,7 +68,7 @@ public class JPEGCreator extends EnhancedComplexTestCase // aOffice.storeAsPostscript(); // aOffice.close(); String sJPEGNameSchema = createJPEG(_sDocumentName, "", _aParams); - + // store information only if jpeg files exists int nPages = countPages(sJPEGNameSchema); if (nPages > 0) @@ -263,20 +263,20 @@ private static void convertToWidth340(String _sFrom, String _To) String sFileDir = FileHelper.getPath(_sFile); String sBasename = FileHelper.getBasename(_sFile); // String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); - + String sTmpDir = util.utils.getUsersTempDir(); if (_aParam.getOutputPath() != null) { sTmpDir = _aParam.getOutputPath(); } - + String sJPEGNameSchema = ""; if (_sFile.toLowerCase().endsWith("ps") || _sFile.toLowerCase().endsWith("prn") || _sFile.toLowerCase().endsWith("pdf")) { // seems to be a Postscript of PDF file - + sJPEGNameSchema = createJPEGsFromPostscript(sTmpDir, sFileDir, sBasename, _aParam.getResolutionInDPI()); } else if (_sFile.toLowerCase().endsWith("jpg") || @@ -292,11 +292,11 @@ private static void convertToWidth340(String _sFrom, String _To) } return sJPEGNameSchema; } - + private String getJPEGName(String _sOutputPath, String _sBasename, int _nResolutionInDPI, String _sGS_PageOutput) { // String fs = System.getProperty("file.separator"); - String sName = _sBasename + "_" + String.valueOf(_nResolutionInDPI) + "DPI_" + _sGS_PageOutput + ".jpg"; + String sName = _sBasename + "_" + String.valueOf(_nResolutionInDPI) + "DPI_" + _sGS_PageOutput + ".jpg"; String sJPEGName = FileHelper.appendPath(_sOutputPath, sName); return sJPEGName; } @@ -304,16 +304,16 @@ private static void convertToWidth340(String _sFrom, String _To) /** * Create via ghostscript (gs) from the reference file for every page a JPEG file * - * MUST set: + * MUST set: * m_sOutputPath, m_sReferenceFile, m_sReferencePath * * return exit code from gs command */ private static final String m_sGS_PageOutput = "%04d"; - + private String createJPEGsFromPostscript(String _sOutputPath, String _sSourcePath, String _sSourceFile, int _nResolutionInDPI) - { + { FileHelper.makeDirectories("", _sOutputPath); // create a jpeg from original prn @@ -336,9 +336,9 @@ private static void convertToWidth340(String _sFrom, String _To) sGhostscriptEXE = FileHelper.appendPath(sGhostscriptPath, sGhostscriptEXE); } } - + // String sCommand = sGhostscriptEXE + " -dNOPROMPT -dBATCH -sDEVICE=jpeg -r" + String.valueOf(_nResolutionInDPI) + " -dNOPAUSE -sOutputFile=" + StringHelper.doubleQuoteIfNeed(sJPGFilename) + " " + StringHelper.doubleQuoteIfNeed(sOriginalFile); - String[] sCommandArray = + String[] sCommandArray = { sGhostscriptEXE, "-dNOPROMPT", @@ -347,10 +347,10 @@ private static void convertToWidth340(String _sFrom, String _To) "-r" + String.valueOf(_nResolutionInDPI), "-dNOPAUSE", "-sOutputFile=" + sJPEGNameSchema, - sPostscriptOrPDFFile - - - + sPostscriptOrPDFFile + + + }; // System.out.println("Start Command array"); // try @@ -360,7 +360,7 @@ private static void convertToWidth340(String _sFrom, String _To) // System.out.println("FAILED"); // } // System.out.println("done"); - + // TODO: gives ghostscript an error we can handle? ProcessHandler aHandler = new ProcessHandler(sCommandArray); boolean bBackValue = aHandler.executeSynchronously(); @@ -371,7 +371,7 @@ private static void convertToWidth340(String _sFrom, String _To) // String sJPEGNameSchema = ""; if (nExitCode == 0) { - // TODO: return a real filename, due to the fact we don't know how much files are created, maybe better to return a list + // TODO: return a real filename, due to the fact we don't know how much files are created, maybe better to return a list int nPages = countPages(sJPEGNameSchema); if (nPages == 0) { @@ -389,7 +389,7 @@ private static void convertToWidth340(String _sFrom, String _To) // aList = (String[])m_aFileList.toArray(aList); return sJPEGNameSchema; // sNewJPEGFilename; } - + public static String getFilenameForJPEGSchema(String _sJPEGSchema, int _nPage) { if (_nPage < 1 || _nPage > 9999) @@ -429,7 +429,7 @@ private static void convertToWidth340(String _sFrom, String _To) } return nPages; } - + // public static void main(String [] _args) // { //// DONE: give an index.ini file ok diff --git a/qadevOOo/runner/graphical/JPEGEvaluator.java b/qadevOOo/runner/graphical/JPEGEvaluator.java index 07b265b62355..c7de83cc0ce7 100644 --- a/qadevOOo/runner/graphical/JPEGEvaluator.java +++ b/qadevOOo/runner/graphical/JPEGEvaluator.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ package graphical; * * @author ll93751 */ -public class JPEGEvaluator extends EnhancedComplexTestCase +public class JPEGEvaluator extends EnhancedComplexTestCase { // @Override public String[] getTestMethodNames() @@ -50,7 +50,7 @@ public class JPEGEvaluator extends EnhancedComplexTestCase { GlobalLogWriter.set(log); ParameterHelper aParam = new ParameterHelper(param); - + // run through all documents found in Inputpath foreachResultCreateHTML(aParam); } @@ -59,16 +59,16 @@ public class JPEGEvaluator extends EnhancedComplexTestCase { // throw new UnsupportedOperationException("Not supported yet."); // int dummy = 0; - + String sBasename = FileHelper.getBasename(_sDocument); String sResultIniFile = _sDocument + ".ini"; // File aFile = new File(sResultIniFile); // assure("Result file doesn't exists " + sResultIniFile, aFile.exists()); -// +// // int good = 0; // int bad = 0; // int ugly = 0; -// +// // IniFile aResultIniFile = new IniFile(sResultIniFile); // int nPages = aResultIniFile.getIntValue("global", "pages", 0); // for (int i=0;i<nPages;i++) @@ -90,11 +90,11 @@ public class JPEGEvaluator extends EnhancedComplexTestCase // } // // assure("Error: document doesn't contains pages", nPages > 0); - + HTMLResult aOutputter = new HTMLResult(_sResult, sBasename + ".html" ); aOutputter.header(_sResult); aOutputter.indexSection(sBasename); - + IniFile aResultIniFile = new IniFile(sResultIniFile); String sStatusRunThrough = aResultIniFile.getValue("global", "state"); String sStatusMessage = aResultIniFile.getValue("global", "info"); @@ -102,12 +102,12 @@ public class JPEGEvaluator extends EnhancedComplexTestCase // // TODO: this information has to come out of the ini files // String sStatusRunThrough = "PASSED, "; // String sPassed = "OK"; -// +// // String sStatusMessage = "From " + nPages + " page(s) are: "; // String sGood = ""; // String sBad = ""; // String sUgly = ""; -// +// // if (good > 0) // { // sGood = " good:=" + good; @@ -123,13 +123,13 @@ public class JPEGEvaluator extends EnhancedComplexTestCase // sUgly = " ugly:=" + ugly; // sStatusMessage += sUgly; // } -// +// // // Failure matrix // // 0 1 // // ugly OK FAILED -// // bad OK +// // bad OK // // good OK -// +// // if (ugly > 0) // { // sPassed = "FAILED"; @@ -149,14 +149,14 @@ public class JPEGEvaluator extends EnhancedComplexTestCase // aResultIniFile.insertValue("global", "state", sStatusRunThrough); // aResultIniFile.insertValue("global", "info", sStatusMessage); // aResultIniFile.close(); - + String sHTMLFile = _aParams.getHTMLPrefix(); // "http://so-gfxcmp-lin/gfxcmp_ui/cw.php?inifile="; sHTMLFile += _sDocument + ".ini"; aOutputter.indexLine(sHTMLFile, sBasename, sStatusRunThrough, sStatusMessage); aOutputter.close(); // IniFile aIniFile = new IniFile(_sDocument); // aIniFile. - + } diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 86eb28143ed2..8a07436ac502 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ import org.w3c.dom.Node; public class MSOfficePostscriptCreator implements IOffice { private String m_sPrinterName; // within Windows the tools need a printer name; - + public void setPrinterName(String _s) { m_sPrinterName = _s; @@ -63,7 +63,7 @@ public class MSOfficePostscriptCreator implements IOffice private ParameterHelper m_aParameterHelper; private String m_sDocumentName; private String m_sResult; - + // CTor public MSOfficePostscriptCreator(ParameterHelper _aParam, String _sResult) { @@ -245,7 +245,7 @@ public class MSOfficePostscriptCreator implements IOffice realStartCommand(aStartCommand); } } - + // ----------------------------------------------------------------------------- /** * print the given file (_sInputFile) to the file name (_sPrintFile) @@ -326,14 +326,14 @@ public class MSOfficePostscriptCreator implements IOffice FileHelper.createInfoFile(_sPrintFilename, _aGTA, "msoffice"); TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print."); } - + public void realStartCommand(ArrayList _aStartCommand) throws OfficeException - { + { if (_aStartCommand.isEmpty()) { throw new OfficeException/*WrongEnvironmentException*/("Given list is empty."); - } - + } + try { // Convert the StartCommand ArrayList to a String List @@ -359,7 +359,7 @@ public class MSOfficePostscriptCreator implements IOffice // TODO: use a better Exception!!! throw new WrongEnvironmentException("We doesn't work within windows environment."); } - + ProcessHandler aHandler = new ProcessHandler(aList); boolean bBackValue = aHandler.executeSynchronously(); @@ -368,10 +368,10 @@ public class MSOfficePostscriptCreator implements IOffice { throw new WrongEnvironmentException("Given list is too short."); } - + // return aHandler.getExitCode(); } - + private String getPerlExe() { @@ -392,7 +392,7 @@ public class MSOfficePostscriptCreator implements IOffice { return aList; } - + String sFileName = FileHelper.appendPath(sTmpPath, sPrintViaWord); File aFile = new File(sFileName); FileWriter out = new FileWriter(aFile); @@ -494,14 +494,14 @@ public class MSOfficePostscriptCreator implements IOffice { GlobalLogWriter.println("Search for local existance of " + aPerlScript.getAbsolutePath()); } - + if (aPerlScript.exists()) { if (FileHelper.isDebugEnabled()) { GlobalLogWriter.println("OK, found it, use this instead the internal one."); } - + String sName = aPerlScript.getAbsolutePath(); // String sCommand = "perl " + sName; // System.out.println(sCommand); @@ -511,13 +511,13 @@ public class MSOfficePostscriptCreator implements IOffice } return aList; } - + ArrayList<String> createWordStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); String ls = System.getProperty("line.separator"); - + // ArrayList aList = new ArrayList(); String sSaveViaWord = "saveViaWord.pl"; @@ -526,13 +526,13 @@ public class MSOfficePostscriptCreator implements IOffice { return aList; } - + String sName = FileHelper.appendPath(sTmpPath, sSaveViaWord); if (FileHelper.isDebugEnabled()) { GlobalLogWriter.println("No local found, create a perl script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile); @@ -592,7 +592,7 @@ public class MSOfficePostscriptCreator implements IOffice aList.add(sName); return aList; } - + ArrayList<String> createExcelPrintHelper() throws java.io.IOException { @@ -612,7 +612,7 @@ public class MSOfficePostscriptCreator implements IOffice { GlobalLogWriter.println("No local found, create a perl script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile); @@ -715,10 +715,10 @@ public class MSOfficePostscriptCreator implements IOffice { GlobalLogWriter.println("No local found, create a script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile); - + out.write( "eval 'exec perl -wS $0 ${1+\"$@\"}' " + ls ); out.write( " if 0; " + ls ); out.write( "use strict; " + ls ); @@ -785,7 +785,7 @@ public class MSOfficePostscriptCreator implements IOffice aList.add(sName); return aList; } - + ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException { // create a program in tmp file @@ -793,7 +793,7 @@ public class MSOfficePostscriptCreator implements IOffice String ls = System.getProperty("line.separator"); String sPrintViaPowerPoint = "printViaPowerPoint.pl"; - + ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint); if (aList.isEmpty() == false) { @@ -804,7 +804,7 @@ public class MSOfficePostscriptCreator implements IOffice { GlobalLogWriter.println("No local found, create a script: " + sName); } - + File aFile = new File(sName); FileWriter out = new FileWriter(aFile); @@ -912,7 +912,7 @@ public class MSOfficePostscriptCreator implements IOffice { aLine = aLine.trim(); if ( (! (aLine.length() < 2) ) && - (! aLine.startsWith("#")) && + (! aLine.startsWith("#")) && (! aLine.startsWith(";")) ) { int nIdx = aLine.indexOf("mso-application"); @@ -947,7 +947,7 @@ public class MSOfficePostscriptCreator implements IOffice } try { - aReader.close(); + aReader.close(); } catch (java.io.IOException ie) { diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java index 8ecee36cc742..23bd040cf4bb 100644 --- a/qadevOOo/runner/graphical/Office.java +++ b/qadevOOo/runner/graphical/Office.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ public class Office implements IOffice private String m_sDocumentName; private String m_sResult; private IOffice m_aOffice = null; - + public Office(ParameterHelper _aParam, String _sResult) { m_aParameterHelper = _aParam; @@ -76,8 +76,8 @@ public class Office implements IOffice sDocumentSuffix.toLowerCase().endsWith(".bmp")) { throw new OfficeException("The given document is not a document type."); - } - + } + // TODO: we should start the office after we know if we really need an Office. if (m_aOffice != null) { @@ -106,7 +106,7 @@ public class Office implements IOffice String sDocumentName = (String)aList.get(i); m_aOffice.load(sDocumentName); m_aOffice.storeAsPostscript(); - + // foreach Report found in the .odb file, create an entry 'report'<number> in the original <name>.odb Section // so it is possible to run through all reports by the given .odb name diff --git a/qadevOOo/runner/graphical/OfficeException.java b/qadevOOo/runner/graphical/OfficeException.java index bc5a24fd5b97..49895ed39f3f 100644 --- a/qadevOOo/runner/graphical/OfficeException.java +++ b/qadevOOo/runner/graphical/OfficeException.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ package graphical; * Exception which occur if something goes wrong at load document. */ -public class OfficeException extends Exception +public class OfficeException extends Exception { public OfficeException(String _aMessage) { diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java index a0592d5ce143..f347af3245e6 100644 --- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java +++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ class PropertySetHelper { m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj); } - + /** get a property and don't convert it @param _sName the string name of the property @@ -100,24 +100,24 @@ class PropertySetHelper public class OpenOfficeDatabaseReportExtractor extends Assurance { private ParameterHelper m_aParameterHelper; - + public OpenOfficeDatabaseReportExtractor(ParameterHelper _aParameter) { m_aParameterHelper = _aParameter; } - + private XDesktop m_xDesktop = null; private XDesktop getXDesktop() { - if (m_xDesktop == null) + if (m_xDesktop == null) { - try + try { XInterface xInterface = (XInterface) getMultiServiceFactory().createInstance( "com.sun.star.frame.Desktop" ); m_xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface); } - catch (com.sun.star.uno.Exception e) + catch (com.sun.star.uno.Exception e) { GlobalLogWriter.println("ERROR: uno.Exception caught"); GlobalLogWriter.println("Message: " + e.getMessage()); @@ -125,7 +125,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance } return m_xDesktop; } - + private void showElements(XNameAccess _xNameAccess) { if (_xNameAccess != null) @@ -141,8 +141,8 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance System.out.println("Warning: Given object is null."); } } - - + + private OfficeProvider m_aProvider = null; private XMultiServiceFactory m_xMultiServiceFactory = null; private XMultiServiceFactory getMultiServiceFactory() @@ -175,7 +175,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // } // TimeHelper.waitInSeconds(2, "Give close Office some time."); // } - + private String m_sMailAddress = null; private String m_sParentDistinct = null; @@ -192,10 +192,10 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance /** * This is the main test Function of current ReportDesignerTest - * @param _sDocument + * @param _sDocument * @return */ - + public ArrayList<String> load(String _sDocument /*, int _nType*/) { // We need to copy the database file to a place where we have write access, NEVER use the docpool for this @@ -206,13 +206,13 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance String sFilename = FileHelper.getBasename(_sDocument); String sDestinationFile = FileHelper.appendPath(sOutputPath, sFilename); FileHelper.copy(_sDocument, sDestinationFile); - + // now the fix reference of the AbsoluteReferenceFile should exist. assure("There exists no file: " + sDestinationFile, FileHelper.exists(sDestinationFile)); String sFileURL = URLHelper.getFileURLFromSystemPath(sDestinationFile); GlobalLogWriter.println("File URL: " + sFileURL); - + ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); // FYI: it is not allowed to open the document read only @@ -222,46 +222,46 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // aPropertyList.add(aReadOnly); XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), aPropertyList); - + GlobalLogWriter.println("Load done"); -// context = createUnoService("com.sun.star.sdb.DatabaseContext") +// context = createUnoService("com.sun.star.sdb.DatabaseContext") // oDataBase = context.getByName("hh") // oDBDoc = oDataBase.DatabaseDocument -// -// dim args(1) as new com.sun.star.beans.PropertyValue -// args(0).Name = "ActiveConnection" -// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") -// reportContainer = oDBDoc.getReportDocuments() +// +// dim args(1) as new com.sun.star.beans.PropertyValue +// args(0).Name = "ActiveConnection" +// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") +// reportContainer = oDBDoc.getReportDocuments() // report = reportContainer.loadComponentFromURL("Report40","",0,args) - + ArrayList<String> aList = null; try { // XInterface x = (XInterface)getMultiServiceFactory().createInstance("com.sun.star.sdb.DatabaseContext"); // assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null); // GlobalLogWriter.println("createInstance com.sun.star.sdb.DatabaseContext done"); - + // XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); // showElements(xNameAccess); // Object aObj = xNameAccess.getByName(sFileURL); // GlobalLogWriter.println("1"); - + // PropertySetHelper aHelper = new PropertySetHelper(aObj); // XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); // Object aDatabaseDocument = aHelper.getPropertyValueAsObject("DatabaseDocument"); // XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - + XOfficeDatabaseDocument xOfficeDBDoc = UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, xDocComponent); - + // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, xDataSource); assure("can't access DatabaseDocument", xOfficeDBDoc != null); // GlobalLogWriter.println("2"); - + XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); assure("Controller of xOfficeDatabaseDocument is empty!", aController != null); // GlobalLogWriter.println("3"); - + XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); aDBDocUI.connect(); boolean isConnect = aDBDocUI.isConnected(); @@ -273,28 +273,28 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance { GlobalLogWriter.println("Connection is false"); } - - // aHelper = new PropertySetHelper(aController); - + + // aHelper = new PropertySetHelper(aController); + XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); XNameAccess xNameAccess = xSupplier.getReportDocuments(); assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); // GlobalLogWriter.println("5"); - + showElements(xNameAccess); - + // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); - Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); + Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assure("ActiveConnection is empty", aActiveConnectionObj != null); // GlobalLogWriter.println("5"); ArrayList<PropertyValue> aPropertyList2 = new ArrayList<PropertyValue>(); - + PropertyValue aActiveConnection = new PropertyValue(); aActiveConnection.Name = "ActiveConnection"; aActiveConnection.Value = aActiveConnectionObj; aPropertyList2.add(aActiveConnection); - + aList = loadAndStoreReports(xNameAccess, aPropertyList2 /*, _nType*/ ); createDBEntry(/*_nType*/); } @@ -303,12 +303,12 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance GlobalLogWriter.println("ERROR: Exception caught"); GlobalLogWriter.println("Message: " + e.getMessage()); } - + // String mTestDocumentPath = (String) param.get("TestDocumentPath"); // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); // // workaround for issue using deprecated "DOCPTH" prop // System.setProperty("DOCPTH", mTestDocumentPath); - + // Close the document // util.utils.shortWait(2000); @@ -321,14 +321,14 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance return "AutogenReportDesignTest"; // return getFileFormat(_nType); } - + // ----------------------------------------------------------------------------- private void createDBEntry(/*int _nType*/) { // try to connect the database String sDBConnection = (String)m_aParameterHelper.getTestParameters().get( convwatch.PropertyName.DB_CONNECTION_STRING ); if (sDBConnection != null && sDBConnection.length() > 0) - { + { GlobalLogWriter.println("DBConnection: " + sDBConnection); // TODO: DB // DB.init(sDBConnection); @@ -362,7 +362,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // System.exit(1); } } - + private ArrayList<String> loadAndStoreReports(XNameAccess _xNameAccess, ArrayList<PropertyValue> _aPropertyList /*, int _nType*/ ) { ArrayList<String> aList = new ArrayList<String>(); @@ -406,7 +406,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance } return sExtension; } - + // switch(_nType) // { // case WRITER: @@ -436,7 +436,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // } // return sFileType; // } - + private String m_sOutputPath = null; private String getOutputPath(/*int _nType*/) @@ -449,17 +449,17 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // sOutputPath += "tmp_123"; sOutputPath = FileHelper.appendPath(sOutputPath, DateHelper.getDateTimeForFilename()); // sOutputPath += System.getProperty("file.separator"); - + // sOutputPath += getFileFormat(_nType); // sOutputPath += System.getProperty("file.separator"); - + File aOutputFile = new File(sOutputPath); // create the directory of the given output path aOutputFile.mkdirs(); m_sOutputPath = sOutputPath; } return m_sOutputPath; } - + /* store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH */ @@ -474,10 +474,10 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance // File aOutputFile = new File(sOutputPath); // create the directory of the given output path // aOutputFile.mkdirs(); - + String sName = _sName + getFormatExtension(_xComponent /*_nType*/); sOutputPath = FileHelper.appendPath(sOutputPath, sName); - + // we need the name and path String sBackPathName = sOutputPath; @@ -513,7 +513,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance } return sBackPathName; } - + private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList) { XComponent xDocComponent = null; @@ -556,5 +556,5 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance GlobalLogWriter.println("Message: " + e.getMessage()); } } - + } diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index d918634f8d30..077ee4bd0134 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,11 +80,11 @@ public class OpenOfficePostscriptCreator implements IOffice m_aDocument = null; } - + public void load(String _sDocumentName) throws OfficeException { m_sDocumentName = _sDocumentName; - + String sInputFileURL = URLHelper.getFileURLFromSystemPath(m_sDocumentName); m_aDocument = loadFromURL(m_aParameterHelper, sInputFileURL); if (m_aDocument == null) @@ -92,7 +92,7 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("loadDocumentFromURL() failed with document: " + sInputFileURL); throw new OfficeException("load(): failed with document" + sInputFileURL); } - + m_sBasename = FileHelper.getBasename(m_sDocumentName); } @@ -137,10 +137,10 @@ public class OpenOfficePostscriptCreator implements IOffice stopOffice(); } - - - - + + + + private void showProperty(PropertyValue _aValue) { String sName = _aValue.Name; @@ -155,8 +155,8 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("showProperty: can't convert a object to string. " + e.getMessage()); } } - - /** + + /** * shows the FilterName and MediaType from the given XComponent */ private String getDocumentType( XComponent _aDoc ) @@ -193,7 +193,7 @@ public class OpenOfficePostscriptCreator implements IOffice String _sInputURL) { XComponent aDoc = null; - try + try { if (_aGTA.getMultiServiceFactory() == null) { @@ -202,7 +202,7 @@ public class OpenOfficePostscriptCreator implements IOffice } Object oDsk = _aGTA.getMultiServiceFactory().createInstance("com.sun.star.frame.Desktop"); XDesktop aDesktop = UnoRuntime.queryInterface(XDesktop.class, oDsk); - + if (aDesktop != null) { GlobalLogWriter.println("com.sun.star.frame.Desktop created."); @@ -210,7 +210,7 @@ public class OpenOfficePostscriptCreator implements IOffice // String sOutputURL = aCurrentParameter.sOutputURL; // String sPrintFileURL = aCurrentParameter.sPrintToFileURL; // System.out.println(_sInputURL); - + // set here the loadComponentFromURL() properties // at the moment only 'Hidden' is set, so no window is opened at work @@ -253,12 +253,12 @@ public class OpenOfficePostscriptCreator implements IOffice ReadOnly.Value = Boolean.TRUE; aPropertyList.add(ReadOnly); showProperty(ReadOnly); - + GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Load document"); // GlobalLogWriter.flush(); - + XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop); - + // XComponent aDoc = null; _aGTA.getPerformance().startTime(PerformanceContainer.Load); @@ -296,14 +296,14 @@ public class OpenOfficePostscriptCreator implements IOffice } return aDoc; } - + private boolean exportToPDF(XComponent _xComponent, String _sDestinationName) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _xComponent ); - + ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); PropertyValue aFiltername = new PropertyValue(); aFiltername.Name = "FilterName"; @@ -311,7 +311,7 @@ public class OpenOfficePostscriptCreator implements IOffice aPropertyList.add(aFiltername); showProperty(aFiltername); boolean bWorked = true; - + // TODO: TimeHelper.waitInSeconds(20, "Wait before storeToURL. Maybe helps due to layouting problems."); try { @@ -327,15 +327,15 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("Message: " + e.getMessage()); bWorked = false; } - + return bWorked; } - + private String getFilterName_forPDF(XServiceInfo xServiceInfo) { String filterName = ""; - + if (xServiceInfo.supportsService("com.sun.star.text.TextDocument")) { //writer @@ -371,9 +371,9 @@ public class OpenOfficePostscriptCreator implements IOffice //math document filterName = "math_pdf_Export"; } - + return filterName; - } + } // ----------------------------------------------------------------------------- @@ -396,7 +396,7 @@ public class OpenOfficePostscriptCreator implements IOffice // aDoc.dispose(); // return bBack; // } - + public boolean storeAsPDF(ParameterHelper _aGTA, XComponent _aDoc, String _sOutputURL) throws OfficeException @@ -419,7 +419,7 @@ public class OpenOfficePostscriptCreator implements IOffice } return bBack; } - + // ----------------------------------------------------------------------------- /** @@ -439,7 +439,7 @@ public class OpenOfficePostscriptCreator implements IOffice // { // // waitInSeconds(1); // boolean bBack = false; -// +// // XComponent aDoc = loadFromURL(_aGTA, _sInputURL); // if (aDoc != null) // { @@ -451,7 +451,7 @@ public class OpenOfficePostscriptCreator implements IOffice // disallowStore(); // } // bBack = impl_printToFileWithOOo(_aGTA, aDoc, _sOutputURL, _sPrintFileURL); -// +// // GlobalLogWriter.println("Close document."); // aDoc.dispose(); // } @@ -462,7 +462,7 @@ public class OpenOfficePostscriptCreator implements IOffice // return bBack; // } - + // ----------------------------------------------------------------------------- private boolean impl_printToFileWithOOo(ParameterHelper _aGTA, @@ -477,8 +477,8 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("No document is given."); return bBack; } - - try + + try { if (_sOutputURL != null) { @@ -489,7 +489,7 @@ public class OpenOfficePostscriptCreator implements IOffice if (aStorable != null) { PropertyValue [] szEmptyArgs = new PropertyValue [0]; - + GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Store document."); _aGTA.getPerformance().startTime(PerformanceContainer.Store); aStorable.storeAsURL(_sOutputURL, szEmptyArgs); @@ -520,7 +520,7 @@ public class OpenOfficePostscriptCreator implements IOffice } else { - // make sure to create the directory in + // make sure to create the directory in String sOutputFilename = FileHelper.getSystemPathFromFileURL(_sOutputURL); String sOutputPath = FileHelper.getPath(sOutputFilename); File aFile = new File(sOutputPath); @@ -538,12 +538,12 @@ public class OpenOfficePostscriptCreator implements IOffice bBack = false; } - try + try { - + // System.out.println("Document loaded."); // Change Pagesettings to DIN A4 - + GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Print document."); XPrintable aPrintable = UnoRuntime.queryInterface( XPrintable.class, _aDoc); if (aPrintable != null) @@ -561,9 +561,9 @@ public class OpenOfficePostscriptCreator implements IOffice // aPrinterProps[nPropIndex].Value = com.sun.star.view.PaperFormat.A4; // aPrintable.setPrinter(aPrinterProps); // } - + // configure Office to allow to execute macos - + // TODO: We need a possiblity to set the printer name also for StarOffice/OpenOffice if (OSHelper.isWindows()) { @@ -580,7 +580,7 @@ public class OpenOfficePostscriptCreator implements IOffice aPrintable.setPrinter(PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList)); } } - + // set property values for XPrintable.print() // more can be found at "http://api.openoffice.org/docs/common/ref/com/sun/star/view/PrintOptions.html" @@ -591,7 +591,7 @@ public class OpenOfficePostscriptCreator implements IOffice // nProperties ++; // } // int nPropsCount = 0; - + // If we are a SpreadSheet (calc), we need to set PrintAllSheets property to 'true' XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _aDoc ); if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) @@ -605,7 +605,7 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("PrintAllSheets := true"); } } - + ArrayList<PropertyValue> aPrintProps = new ArrayList<PropertyValue>(); // GlobalLogWriter.println("Property FileName:=" + _sPrintFileURL); @@ -617,7 +617,7 @@ public class OpenOfficePostscriptCreator implements IOffice aPrintProps.add(Arg); showProperty(Arg); - + // generate pages string if (_aGTA.printAllPages() == false) { @@ -634,20 +634,20 @@ public class OpenOfficePostscriptCreator implements IOffice } sPages += String.valueOf(_aGTA.getOnlyPages()); } - + Arg = new PropertyValue(); Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); showProperty(Arg); } - + // GlobalLogWriter.println("Start printing."); _aGTA.getPerformance().startTime(PerformanceContainer.Print); aPrintable.print(PropertyHelper.createPropertyValueArrayFormArrayList(aPrintProps)); TimeHelper.waitInSeconds(1, "Start waiting for print ready."); - + GlobalLogWriter.println("Wait until document is printed."); boolean isBusy = true; int nPrintCount = 0; @@ -675,7 +675,7 @@ public class OpenOfficePostscriptCreator implements IOffice _aGTA.getPerformance().stopTime(PerformanceContainer.Print); GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Print document done."); - + // Create a .info file near the printed '.ps' or '.prn' file. FileHelper.createInfoFile(_sPrintFileURL, _aGTA); } @@ -695,7 +695,7 @@ public class OpenOfficePostscriptCreator implements IOffice e.printStackTrace(); bBack = false; } - + if (bFailed == true) { GlobalLogWriter.println("convwatch.OfficePrint: FAILED"); @@ -707,7 +707,7 @@ public class OpenOfficePostscriptCreator implements IOffice return bBack; } - + /** * @param _aGTA * @param _sAbsoluteOutputPath @@ -724,7 +724,7 @@ public class OpenOfficePostscriptCreator implements IOffice // throw new ConvWatchCancelException("Input file: " + _sAbsoluteInputFile + " does not exist."); return false; } - + // String fs = System.getProperty("file.separator"); // String sInputFileURL = URLHelper.getFileURLFromSystemPath(_sAbsoluteInputFile); @@ -744,7 +744,7 @@ public class OpenOfficePostscriptCreator implements IOffice } // sOutputFileURL = URLHelper.getFileURLFromSystemPath(sOutputPath + fs + sInputFileBasename); // sOutputFileURL = null; - + String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename); // String sPrintFileURL; @@ -756,17 +756,17 @@ public class OpenOfficePostscriptCreator implements IOffice } return false; } - + // ----------------------------------------------------------------------------- /** * create a reference file - * _sAbsoluteInputPath contains the source file, if not exists, return with failure. + * _sAbsoluteInputPath contains the source file, if not exists, return with failure. * _sAbsoluteOutputPath contains the destination, where the file will store after load with StarOffice/OpenOffice.org * if is null, print only near the Input file path * _sPrintType ".prn" Print input file with StarOffice/OpenOffice.org and the default printer as PostScript - * + * * @param _aGTA - * @return + * @return */ // public static boolean buildReference(ParameterHelper _aGTA, // String _sAbsoluteOutputPath, @@ -797,7 +797,7 @@ public class OpenOfficePostscriptCreator implements IOffice // } // // sOutputFileURL = URLHelper.getFileURLFromSystemPath(sOutputPath + fs + sInputFileBasename); // sOutputFileURL = null; -// +// // String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename); // String sPrintFileURL; // @@ -807,14 +807,14 @@ public class OpenOfficePostscriptCreator implements IOffice // GlobalLogWriter.println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); // return true; // } -// +// // if (_aGTA.getReferenceType().toLowerCase().equals("msoffice")) // { // sPrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFilename); // } // else if (_aGTA.getReferenceType().toLowerCase().equals("pdf")) // { -//// TODO: If we rename the stored file to *.pdf, we have to be sure that we use *.pdf also as a available reference +//// TODO: If we rename the stored file to *.pdf, we have to be sure that we use *.pdf also as a available reference // sPrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFilename ); // } // else if (_aGTA.getReferenceType().toLowerCase().equals("ooo")) @@ -828,12 +828,12 @@ public class OpenOfficePostscriptCreator implements IOffice // } // return printToFile(_aGTA, sInputFileURL, sOutputFileURL, sPrintFileURL); // } + - - + // TODO: Das Teil muss hier raus! - - + + // public static boolean printToFile(ParameterHelper _aGTA, // String _sInputFileURL, // String _sOutputFileURL, @@ -842,10 +842,10 @@ public class OpenOfficePostscriptCreator implements IOffice // boolean bBack = false; // String sPrintFileURL = null; // -// +// // // remember the current timer, to know how long a print process need. // // startTimer(); -// +// // if (_aGTA.getReferenceType().toLowerCase().equals("ooo")) // { // bBack = printToFileWithOOo(_aGTA, _sInputFileURL, _sOutputFileURL, _sPrintFileURL); @@ -892,7 +892,7 @@ public class OpenOfficePostscriptCreator implements IOffice // } // return bBack; // } - + // ----------------------------------------------------------------------------- // TODO: move this away! // ----------------------------------------------------------------------------- @@ -902,7 +902,7 @@ public class OpenOfficePostscriptCreator implements IOffice { return; } - + if (_xMSF == null) { GlobalLogWriter.println("MultiServiceFactory not set."); @@ -928,14 +928,14 @@ public class OpenOfficePostscriptCreator implements IOffice // ----------------------------------------------------------------------------- - public String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + public String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.println("MultiServiceFactory not set."); @@ -957,7 +957,7 @@ public class OpenOfficePostscriptCreator implements IOffice XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) { - + // if (_sFilterName.toLowerCase().equals("help")) // { // System.out.println("Show all possible ElementNames from current version." ); @@ -969,13 +969,13 @@ public class OpenOfficePostscriptCreator implements IOffice // System.out.println("Must quit."); // System.out.exit(1); // } - + if (! aNameAccess.hasByName(_sFilterName)) { GlobalLogWriter.println("FilterFactory.hasByName() says there exist no '" + _sFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1016,17 +1016,17 @@ public class OpenOfficePostscriptCreator implements IOffice } return null; } - + // ----------------------------------------------------------------------------- - String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.println("MultiServiceFactory not set."); @@ -1047,13 +1047,13 @@ public class OpenOfficePostscriptCreator implements IOffice { XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) - { + { if (! aNameAccess.hasByName(_sFilterName)) { GlobalLogWriter.println("FilterFactory.hasByName() says there exist no '" + _sFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1096,14 +1096,14 @@ public class OpenOfficePostscriptCreator implements IOffice } // ----------------------------------------------------------------------------- - public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) + public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) { if (_sInternalFilterName.length() == 0) { // System.out.println("No FilterName set."); return null; } - + if (_xMSF == null) { GlobalLogWriter.println("MultiServiceFactory not set."); @@ -1125,20 +1125,20 @@ public class OpenOfficePostscriptCreator implements IOffice XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aTypeDetection); if (aNameAccess != null) { - + // System.out.println("Show ElementNames" ); // String[] aElementNames = aNameAccess.getElementNames(); // for (int i = 0; i<aElementNames.length; i++) // { // System.out.println(aElementNames[i]); // } - + if (! aNameAccess.hasByName(_sInternalFilterName)) { GlobalLogWriter.println("TypeDetection.hasByName() says there exist no '" + _sInternalFilterName + "'" ); return null; } - + Object[] aElements = null; String[] aExtensions; try @@ -1187,7 +1187,7 @@ public class OpenOfficePostscriptCreator implements IOffice } return null; } - + // ----------------------------------------------------------------------------- public void convertDocument(String _sInputFile, String _sOutputPath, ParameterHelper _aGTA) throws OfficeException { @@ -1197,7 +1197,7 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("MultiServiceFactory in GraphicalTestArgument not set."); return; } - + String sInputURL = URLHelper.getFileURLFromSystemPath(_sInputFile); // showType(sInputURL, xMSF); XComponent aDoc = loadFromURL( _aGTA, sInputURL); @@ -1206,13 +1206,13 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("Can't load document '"+ sInputURL + "'"); return; } - + if (_sOutputPath == null) { GlobalLogWriter.println("Outputpath not set."); return; } - + if (! isStoreAllowed()) { GlobalLogWriter.println("It's not allowed to store, check Input/Output path."); @@ -1232,7 +1232,7 @@ public class OpenOfficePostscriptCreator implements IOffice GlobalLogWriter.println("com.sun.star.frame.XStorable is null"); return; } - + String sFilterName = _aGTA.getExportFilterName(); // check how many Properties should initialize @@ -1241,19 +1241,19 @@ public class OpenOfficePostscriptCreator implements IOffice // { // nPropertyCount ++; // } - + // initialize PropertyArray // PropertyValue [] aStoreProps = new PropertyValue[ nPropertyCount ]; // int nPropertyIndex = 0; ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); - + String sExtension = ""; if (sFilterName != null && sFilterName.length() > 0) { String sInternalFilterName = getInternalFilterName(sFilterName, xMSF); String sServiceName = getServiceNameFromFilterName(sFilterName, xMSF); - + GlobalLogWriter.println("Filter detection:"); // check if service name from file filter is the same as from the loaded document boolean bServiceFailed = false; @@ -1292,7 +1292,7 @@ public class OpenOfficePostscriptCreator implements IOffice showProperty(Arg); GlobalLogWriter.println("FilterName is set to: " + sFilterName); } - + String sOutputURL = ""; try { @@ -1315,7 +1315,7 @@ public class OpenOfficePostscriptCreator implements IOffice { sOutputFile += sInputFileBasename; } - + if (FileHelper.exists(sOutputFile) && _aGTA.getOverwrite() == false) { GlobalLogWriter.println("File already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite."); @@ -1323,7 +1323,7 @@ public class OpenOfficePostscriptCreator implements IOffice } sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputFile); - + GlobalLogWriter.println("Store document as '" + sOutputURL + "'"); xStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList)); GlobalLogWriter.println("Document stored."); @@ -1334,7 +1334,7 @@ public class OpenOfficePostscriptCreator implements IOffice } // TODO: Do we need to wait? // TimeHelper.waitInSeconds(1, "unknown in OfficePrint.convertDocument()"); - + } /** @@ -1365,7 +1365,7 @@ public class OpenOfficePostscriptCreator implements IOffice // aSemaphore.P(aSemaphore.getSemaphoreFile()); // } m_aParameterHelper.getTestParameters().put(util.PropertyName.DONT_BACKUP_USERLAYER, Boolean.TRUE); - + m_aParameterHelper.getPerformance().startTime(PerformanceContainer.OfficeStart); m_aProvider = new OfficeProvider(); XMultiServiceFactory xMSF = (XMultiServiceFactory) m_aProvider.getManager(m_aParameterHelper.getTestParameters()); @@ -1424,4 +1424,4 @@ public class OpenOfficePostscriptCreator implements IOffice } } - + diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 598ee6c53007..2450ce97cce3 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,11 +87,11 @@ public class ParameterHelper private String m_sInputPath = null; private String m_sOutputPath = null; // private String m_sReferencePath = null; - + private TestParameters m_aCurrentParams; // private GlobalLogWriter m_aLog; - + // CONSTRUCTOR private ParameterHelper(){} @@ -100,10 +100,10 @@ public class ParameterHelper m_aCurrentParams = param; // m_aLog = log; // interpretReferenceType(); - // interpretPrinterName(); + // interpretPrinterName(); } - + protected TestParameters getTestParameters() { return m_aCurrentParams; @@ -120,7 +120,7 @@ public class ParameterHelper String sInputPath = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); if (sInputPath == null || sInputPath.length() == 0) { - GlobalLogWriter.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); + GlobalLogWriter.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); } else { @@ -129,7 +129,7 @@ public class ParameterHelper } return m_sInputPath; } - + public String getOutputPath() { if (m_sOutputPath == null) @@ -137,7 +137,7 @@ public class ParameterHelper String sOutputPath = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); if (sOutputPath == null || sOutputPath.length() == 0) { - GlobalLogWriter.println("Please set output path (path where to store document results) " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + "=path."); + GlobalLogWriter.println("Please set output path (path where to store document results) " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + "=path."); } else { @@ -163,7 +163,7 @@ public class ParameterHelper // } // return m_sReferencePath; // } - + public boolean isIncludeSubDirectories() { @@ -189,7 +189,7 @@ public class ParameterHelper if (m_sReferenceType == null) { // REFERENCE_TYPE ---------- - + String sReferenceType = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_REFERENCE_TYPE ); if (sReferenceType == null || sReferenceType.length() == 0) { @@ -209,7 +209,7 @@ public class ParameterHelper if (m_sPrinterName == null) { // PRINTER_NAME ---------- - + String sPrinterName = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_PRINTER_NAME ); if (sPrinterName == null || sPrinterName.length() == 0) { @@ -223,11 +223,11 @@ public class ParameterHelper } return m_sPrinterName; } - + PerformanceContainer m_aPerformanceContainer = null; /** * helper class for performance analyser features - * @return + * @return */ public PerformanceContainer getPerformance() { @@ -237,17 +237,17 @@ public class ParameterHelper } return m_aPerformanceContainer; } - + /** * Helper function to get the buildid of the current used OpenOffice.org * out of the AppExecutionCommand the build ID - * @return + * @return */ public String getBuildID() { String sAPP = (String)m_aCurrentParams.get(util.PropertyName.APP_EXECUTION_COMMAND); // return getBuildID(sAPP); -// TODO: here we need the getBuildID(string) method +// TODO: here we need the getBuildID(string) method String sBuildID = BuildID.getBuildID(sAPP); return sBuildID; } @@ -260,10 +260,10 @@ public class ParameterHelper return m_nResolutionInDPI; } // get methods - public XMultiServiceFactory getMultiServiceFactory() + public XMultiServiceFactory getMultiServiceFactory() { XMultiServiceFactory xMSF = (XMultiServiceFactory)m_aCurrentParams.getMSF(); - + // check if MultiServiceFactory is given if (getReferenceType().toLowerCase().equals("pdf") || getReferenceType().toLowerCase().equals("ps") || @@ -285,7 +285,7 @@ public class ParameterHelper public boolean isHidden() { // HIDDEN - + String sOfficeViewable = (String)m_aCurrentParams.get(PropertyName.OFFICE_VIEWABLE); if (sOfficeViewable != null) { @@ -341,7 +341,7 @@ public class ParameterHelper // if (m_sDefaultXMLFormatApplication == null) // { // // DEFAULT_XML_FORMAT_APP ------ -// +// // String sDefaultXMLFormatApp = (String)m_aCurrentParams.get( PropertyName.DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP ); // if (sDefaultXMLFormatApp == null || sDefaultXMLFormatApp.length() == 0) // { @@ -355,7 +355,7 @@ public class ParameterHelper // return m_sDefaultXMLFormatApplication; // } - + // Pages ------------------------------------------------------------------- /** @@ -394,7 +394,7 @@ public class ParameterHelper } return true; } - + public boolean getOverwrite() { boolean bOverwrite = m_aCurrentParams.getBool( PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE); @@ -409,7 +409,7 @@ public class ParameterHelper String sPrefix = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX ); if (sPrefix == null || sPrefix.length() == 0) { - GlobalLogWriter.println("Please set html prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); + GlobalLogWriter.println("Please set html prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); } else { diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java index ab3b292926e5..2b6fc4047408 100644 --- a/qadevOOo/runner/graphical/PerformanceContainer.java +++ b/qadevOOo/runner/graphical/PerformanceContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public class PerformanceContainer /* extends *//* implements */ { { m_nStartTime = _nStartTime; } - + /* return the time, which is done until last startTime() */ @@ -65,7 +65,7 @@ public class PerformanceContainer /* extends *//* implements */ { long nMeanTime = System.currentTimeMillis(); return nMeanTime - _nCurrentTimer; } - + /* public long stopTimer() { @@ -90,7 +90,7 @@ public class PerformanceContainer /* extends *//* implements */ { private long m_nTime[]; private String m_sMSOfficeVersion; - + public PerformanceContainer() { m_nTime = new long[LAST_VALUE]; @@ -100,7 +100,7 @@ public class PerformanceContainer /* extends *//* implements */ { m_nTime[i] = 0; } } - + public void setTime(int _nIndex, long _nValue) { m_nTime[_nIndex] = _nValue; @@ -109,12 +109,12 @@ public class PerformanceContainer /* extends *//* implements */ { { return m_nTime[_nIndex]; } - + public void startTime(int _nIndex) { m_nTime[_nIndex] = getStartTime(); } - + public void stopTime(int _nIndex) { m_nTime[_nIndex] = meanTime(m_nTime[_nIndex]); @@ -164,12 +164,12 @@ public class PerformanceContainer /* extends *//* implements */ { } return nValue; } - + public static long secondsToMilliSeconds(double _nSeconds) { return (long)(_nSeconds * 1000.0); } - + /* Helper function, which read some values from a given file @@ -215,7 +215,7 @@ public class PerformanceContainer /* extends *//* implements */ { { String sTime = sLine.substring(14); m_nTime[Print] = secondsToMilliSeconds(stringToDouble(sTime)); - } + } else if (sLine.startsWith("WordVersion=")) { String sMSOfficeVersion = sLine.substring(12); @@ -246,7 +246,7 @@ public class PerformanceContainer /* extends *//* implements */ { } try { - aRandomAccessFile.close(); + aRandomAccessFile.close(); } catch (java.io.IOException ie) { diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java index e625c2a75b12..b18c9d89d9a6 100644 --- a/qadevOOo/runner/graphical/PixelCounter.java +++ b/qadevOOo/runner/graphical/PixelCounter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,14 +43,14 @@ class CountNotWhite extends CountPixel { // System.out.println("CountWhite()"); } - + public void countold(final int pixel) { // final int alpha = (pixel >> 24) & 0xff; final int red = (pixel >> 16) & 0xff; final int green = (pixel >> 8) & 0xff; final int blue = (pixel ) & 0xff; - + // System.out.println(String.valueOf(red) + ":" + String.valueOf(green) + ":" + String.valueOf(blue)); if (red == 0xff && green == 0xff && blue == 0xff) { @@ -89,14 +89,14 @@ class CountNotBlack extends CountPixel { // System.out.println("CountBlack()"); } - + public void countold(final int pixel) { // final int alpha = (pixel >> 24) & 0xff; final int red = (pixel >> 16) & 0xff; final int green = (pixel >> 8) & 0xff; final int blue = (pixel ) & 0xff; - + if (red == 0x00 && green == 0x00 && blue == 0x00) { return; @@ -139,7 +139,7 @@ class graphics_stuff // int blue = rgba & 0xff; // int alpha = (rgba >> 24) & 0xff; //// (2) now modify red, green, blue and alpha as you like; -//// make sure that each of the four values stays in the +//// make sure that each of the four values stays in the //// interval 0 to 255 //// ... //// (3) and encode back to an int, e.g. to give it to MemoryImageSource or @@ -147,7 +147,7 @@ class graphics_stuff // rgba = (alpha << 24) | (red << 16) | (green << 8) | blue; // return 0; // } - + // public static void handlesinglepixel(int x, int y, int pixel) // { // int alpha = (pixel >> 24) & 0xff; @@ -175,7 +175,7 @@ class graphics_stuff countPixel(_aImage, 0, 0, w, h, aCountNotWhite); return aCountNotWhite.getCount(); } - + public static int countNotBlackPixel(ImageHelper _aImage) { final int w = _aImage.getWidth(); @@ -192,8 +192,8 @@ class graphics_stuff public class PixelCounter { // private Image m_aImage; // ImageHelper m_aImage; - - + + public int countNotWhitePixel(String _sFile) throws java.io.IOException { @@ -209,14 +209,14 @@ public class PixelCounter { final int nw = graphics_stuff.countNotBlackPixel(aImage); return nw; } - + public static int countNotWhitePixelsFromImage(String _sFile) throws java.io.IOException { PixelCounter a = new PixelCounter(); return a.countNotWhitePixel(_sFile); } - + public static int countNotBlackPixelsFromImage(String _sFile) throws java.io.IOException { @@ -243,5 +243,5 @@ public class PixelCounter { // */ // } } - + diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/runner/graphical/PostscriptCreator.java index ab7ad4536fa6..33511df1e6b1 100644 --- a/qadevOOo/runner/graphical/PostscriptCreator.java +++ b/qadevOOo/runner/graphical/PostscriptCreator.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,12 +50,12 @@ public class PostscriptCreator extends EnhancedComplexTestCase { GlobalLogWriter.set(log); ParameterHelper aParam = new ParameterHelper(param); - + param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, 2000); // run through all documents found in Inputpath foreachDocumentinInputPath(aParam); } - + public void checkOneFile(String _sDocumentName, String _sResult, ParameterHelper _aParams) throws OfficeException { @@ -69,9 +69,9 @@ public class PostscriptCreator extends EnhancedComplexTestCase a.startTime(PerformanceContainer.OfficeStart); aOffice.start(); a.stopTime(PerformanceContainer.OfficeStart); - + // _aParams.getTestParameters().put(util.PropertyName.DEBUG_IS_ACTIVE, Boolean.FALSE); - + // This force an error! _sDocumentName = helper.StringHelper.doubleQuote(_sDocumentName); try { @@ -95,9 +95,9 @@ public class PostscriptCreator extends EnhancedComplexTestCase } } - - - + + + // public static void main(String [] _args) // { // String args[] = { diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index 729fd0c33c38..3bad8536c8ed 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java index 057f9cd19494..016cd3154a2c 100644 --- a/qadevOOo/runner/graphical/TimeHelper.java +++ b/qadevOOo/runner/graphical/TimeHelper.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public class TimeHelper public TimeHelper() {} - + public void start() { m_bIsStopped = false; @@ -77,7 +77,7 @@ public class TimeHelper // add a minute m_nSeconds += 60; } - + int nMilliSeconds = cal.get(Calendar.MILLISECOND); m_nMilliSeconds = nMilliSeconds - m_nMilliSeconds; m_nRealMilliSeconds = m_nSeconds * 1000 + m_nMilliSeconds; diff --git a/qadevOOo/runner/graphical/WrongEnvironmentException.java b/qadevOOo/runner/graphical/WrongEnvironmentException.java index 24ab5532b2e7..49ba0afca098 100644 --- a/qadevOOo/runner/graphical/WrongEnvironmentException.java +++ b/qadevOOo/runner/graphical/WrongEnvironmentException.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ package graphical; * * @author ll93751 */ -public class WrongEnvironmentException extends OfficeException +public class WrongEnvironmentException extends OfficeException { public WrongEnvironmentException(String _aMessage) { diff --git a/qadevOOo/runner/graphical/WrongSuffixException.java b/qadevOOo/runner/graphical/WrongSuffixException.java index d8632ea50e72..e99ce9bcd972 100644 --- a/qadevOOo/runner/graphical/WrongSuffixException.java +++ b/qadevOOo/runner/graphical/WrongSuffixException.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ package graphical; * * @author ll93751 */ -public class WrongSuffixException extends OfficeException +public class WrongSuffixException extends OfficeException { public WrongSuffixException(String _aMessage) { diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 9e980b273896..879eb3e35fe5 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/runner/helper/AppProvider.java index f8cf7e9737db..f1da2bbcec5e 100644 --- a/qadevOOo/runner/helper/AppProvider.java +++ b/qadevOOo/runner/helper/AppProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,24 +32,24 @@ package helper; * Interface to get a Manager to access the application to check */ public interface AppProvider { - + /** * Method to get the desired Manager */ public Object getManager(lib.TestParameters param); - + /** * Method to dispose the desired Manager */ - public boolean disposeManager(lib.TestParameters param); + public boolean disposeManager(lib.TestParameters param); /** * Close an office. * @param param The test parameters. - * @param closeIfPossible If true, close even if + * @param closeIfPossible If true, close even if * it was running before the test * @return True, if close worked. */ - public boolean closeExistingOffice(lib.TestParameters param, + public boolean closeExistingOffice(lib.TestParameters param, boolean closeIfPossible); } diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java index 296b56877717..d8d17b116b23 100644 --- a/qadevOOo/runner/helper/BuildEnvTools.java +++ b/qadevOOo/runner/helper/BuildEnvTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ import share.LogWriter; import util.*; /** - * This class support you to execute some shell commands in a buld environment. At ervery call of commands + * This class support you to execute some shell commands in a buld environment. At ervery call of commands * a build environment was created and the commands will be executed. - * + * */ public class BuildEnvTools { @@ -78,7 +78,7 @@ public class BuildEnvTools { } if( (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLS)) && - (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLI)) && + (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLI)) && (!mPlatform.equalsIgnoreCase(PropertyName.UNXLNGI)) && (!mPlatform.equalsIgnoreCase(PropertyName.UNXMACXI))&& (!mPlatform.equalsIgnoreCase(PropertyName.WNTMSCI)) ){ @@ -96,7 +96,7 @@ public class BuildEnvTools { } mCygwin = (param.getBool(PropertyName.CYGWIN)); - + if (error) { throw new ParameterNotFoundException(msg); } diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index f4f919c5cfc4..68e803731d75 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java index 583aea56f977..ec9f4d8631bc 100644 --- a/qadevOOo/runner/helper/ClParser.java +++ b/qadevOOo/runner/helper/ClParser.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index 287c0402fb77..23a393485f77 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public class ComplexDescGetter extends DescGetter public DescEntry[] getDescriptionFor(String entry, String DescPath, boolean debug) { - // read scenario file + // read scenario file if (entry.startsWith("-sce")) { DescEntry[] entries = getScenario(entry.substring(5), null, debug); @@ -156,7 +156,7 @@ public class ComplexDescGetter extends DescGetter * @param testObjectName the name of the object * @param className the class name of the class to load * @param testMethodNames list of all methods to test - * @param log + * @param log * @return filled description entry */ public DescEntry createTestDesc(String testObjectName, String className, String[] testMethodNames, LogWriter log) diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java index 088b927376f6..66db0024d886 100644 --- a/qadevOOo/runner/helper/ConfigHelper.java +++ b/qadevOOo/runner/helper/ConfigHelper.java @@ -7,7 +7,7 @@ import com.sun.star.beans.*; import com.sun.star.util.*; /** - * This <CODE>ConfigHelper</CODE> makes it possible to access the + * This <CODE>ConfigHelper</CODE> makes it possible to access the * configuration and change their content.<P> * <P> * Example: <P> @@ -32,15 +32,15 @@ import com.sun.star.util.*; * <P> * <CODE>Definition</CODE><P> * <ul> - * <li><CODE><node oor:name="Windows"></CODE> + * <li><CODE><node oor:name="Windows"></CODE> * represents a <CODE>Set</CODE> and is a <CODE>XNameContainer</CODE></LI> - * <li><CODE><node oor:name="SplitWindow0"></CODE> + * <li><CODE><node oor:name="SplitWindow0"></CODE> * represents a <CODE>Group</CODE> and is a <CODE>XNameReplace</CODE></LI> - * <li><CODE><prop oor:name="Visible"></CODE> + * <li><CODE><prop oor:name="Visible"></CODE> * represents a pr<CODE></CODE>operty of the group</li> - * <li><CODE><node oor:name="UserData"></CODE> + * <li><CODE><node oor:name="UserData"></CODE> * represents a <CODE>extensible group</CODE> and is a <CODE>XNameContainer</CODE></LI> - * <li><CODE><prop oor:name="UserItem"></CODE> + * <li><CODE><prop oor:name="UserItem"></CODE> * represents a <CODE>property</CODE> of the extensible group</LI> * </UL> * We assume in the following examples the existance of:<P> @@ -48,9 +48,9 @@ import com.sun.star.util.*; * <ul> * <li>If you like to insert a new <CODE>Group</CODE> into the <CODE>Set</CODE> "Windows":<p> * <CODE>XNameReplace xMyGroup = aConfig.getOrInsertGroup("Windows", "myGroup");</CODE><P> - * The method <CODE>getOrInsertGroup()</CODE> uses the + * The method <CODE>getOrInsertGroup()</CODE> uses the * <CODE>XSingleServiceFactory</CODE> to create the skeleton of a new group. - * + * * </li> * <li>If you like to change the property "WindowState" of "myGroup" * of the Set "Windows"<p> @@ -58,7 +58,7 @@ import com.sun.star.util.*; * "Windows","myGroup", "WindowState", "952,180,244,349;1;0,0,0,0;");</CODE> * </li> * <li>If you like to change the property "myProp" of the extensible group - * "myExtGroup" which is an extensible group of "my2ndGroup" of the + * "myExtGroup" which is an extensible group of "my2ndGroup" of the * Set "Windows":<p> * <CODE>aConfig.insertOrUpdateExtensibleGroupProperty( * "Windows", "my2ndGroup", "myExtGroup", "myProp","TheValue");</CODE> @@ -147,7 +147,7 @@ public class ConfigHelper //----------------------------------------------- /** * Updates the configuration.<p> - * This must be called after you have changed the configuration + * This must be called after you have changed the configuration * else you changes will be lost. */ public void flush() @@ -186,10 +186,10 @@ public class ConfigHelper aConfig.writeRelativeKey(sRelPath, sKey, aValue); aConfig.flush(); } - - + + /** - * Insert a structured node (group) in a name container (set) + * Insert a structured node (group) in a name container (set) * or else update it and retrun the <CODE>XNameReplace</CODE> of it.<P> * The <CODE>XSingleServiceFacttory</CODE> of the <CODE>set</CODE> will be used * to create a new group. This group is specific to its set and @@ -197,15 +197,15 @@ public class ConfigHelper * @return The [inserted] group of the set * @param groupName The name of the goup which should be returned * @param setName The name of the set - * @throws com.sun.star.uno.Exception throws + * @throws com.sun.star.uno.Exception throws * <CODE>com.sun.star.uno.Exeception</CODE> on any error. */ - public XNameReplace getOrInsertGroup(String setName, String groupName) + public XNameReplace getOrInsertGroup(String setName, String groupName) throws com.sun.star.uno.Exception - + { XNameContainer xSetCont = this.getSet(setName); - + XNameReplace xChildAccess = null; try { @@ -215,19 +215,19 @@ public class ConfigHelper } catch(com.sun.star.container.NoSuchElementException e) { // proceed with inserting } - + if (xChildAccess == null) { - XSingleServiceFactory xChildfactory = (XSingleServiceFactory) + XSingleServiceFactory xChildfactory = (XSingleServiceFactory) UnoRuntime.queryInterface(XSingleServiceFactory.class,xSetCont); Object xNewChild = xChildfactory.createInstance(); xSetCont.insertByName(groupName, xNewChild); - xChildAccess = (XNameReplace) - UnoRuntime.queryInterface(XNameContainer.class,xNewChild); + xChildAccess = (XNameReplace) + UnoRuntime.queryInterface(XNameContainer.class,xNewChild); } - + return xChildAccess; } @@ -240,13 +240,13 @@ public class ConfigHelper * @throws com.sun.star.uno.Exception throws <CODE>com.sun.star.uno.Exeception</CODE> on any error. */ public void updateGroupProperty(String setName, - String groupName, - String propName, + String groupName, + String propName, Object propValue) throws com.sun.star.uno.Exception { XNameContainer xSetCont = this.getSet(setName); - + XPropertySet xProp = null; try { xProp = (XPropertySet)UnoRuntime.queryInterface( @@ -254,7 +254,7 @@ public class ConfigHelper xSetCont.getByName(groupName)); } catch (com.sun.star.container.NoSuchElementException e){ throw new com.sun.star.uno.Exception( - "could not get group '" + groupName + + "could not get group '" + groupName + "' from set '"+ setName +"':\n" + e.toString()); } try{ @@ -265,14 +265,14 @@ public class ConfigHelper "' from group '"+ groupName + "' from set '"+ setName +"':\n" + e.toString()); } - } - + } + /** * Insert a property in an extensible group container or else update it * @param setName the name of the <CODE>set</CODE> which containes the <CODE>group</CODE> * @param group The name of the <CODE>group</CODE> which conatins the <CODE>extensible group</CODE>. - * @param extGroup The name of the <CODE>extensible group</CODE> which + * @param extGroup The name of the <CODE>extensible group</CODE> which * [should] contain the property * @param propName The name of the property. * @param propValue The value of the property. @@ -281,13 +281,13 @@ public class ConfigHelper public void insertOrUpdateExtensibleGroupProperty( String setName, String group, - String extGroup, - String propName, - Object propValue) + String extGroup, + String propName, + Object propValue) throws com.sun.star.uno.Exception { XNameContainer xSetCont = this.getSet(setName); - + XNameReplace xGroupAccess = null; XNameContainer xExtGroupCont = null; @@ -297,10 +297,10 @@ public class ConfigHelper XNameReplace.class,xGroup); } catch(com.sun.star.container.NoSuchElementException e) { throw new com.sun.star.uno.Exception( - "could not get group '" + group + + "could not get group '" + group + "' from set '"+ setName +"':\n" + e.toString()); } - + try { Object xGroup=xGroupAccess.getByName(extGroup); xExtGroupCont = (XNameContainer) UnoRuntime.queryInterface( @@ -311,17 +311,17 @@ public class ConfigHelper "' from group '"+ group + "' from set '"+ setName +"':\n" + e.toString()); } - + try { xExtGroupCont.insertByName(propName, propValue); } catch(com.sun.star.container.ElementExistException e) { xExtGroupCont .replaceByName(propName, propValue); } - + } - - + + /** * Returns a <CODE>XNameContainer</CODE> of the <CODE>Set</CODE> * of the <CODE>Configuration</CODE> @@ -332,17 +332,17 @@ public class ConfigHelper public XNameContainer getSet(String setName) throws com.sun.star.uno.Exception { - XNameReplace xCont = (XNameReplace) + XNameReplace xCont = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, m_xConfig); Object oSet = xCont.getByName(setName); - + if (oSet == null) throw new com.sun.star.uno.Exception( "could not get set '" + setName + ": null"); - + return (XNameContainer) UnoRuntime.queryInterface( XNameContainer.class, oSet); - + } } diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/runner/helper/ConfigurationRead.java index e82fe6141b72..20d2ae322fb6 100644 --- a/qadevOOo/runner/helper/ConfigurationRead.java +++ b/qadevOOo/runner/helper/ConfigurationRead.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ import com.sun.star.uno.UnoRuntime; public class ConfigurationRead { XHierarchicalNameAccess root = null; - - /** + + /** * Creates new ConfigurationRead - * @param xMSF An instance of service + * @param xMSF An instance of service * "com.sun.star.configuration.ConfigurationProvider" * @param rootnode The root of the configuration nodes. */ public ConfigurationRead(XMultiServiceFactory xMSF, String rootnode) { - + PropertyValue [] nodeArgs = new PropertyValue [1]; PropertyValue nodepath = new PropertyValue(); nodepath.Name = "nodepath"; @@ -64,7 +64,7 @@ public class ConfigurationRead { root = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, rootObject); + XHierarchicalNameAccess.class, rootObject); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(); @@ -74,25 +74,25 @@ public class ConfigurationRead { /** * Creates new ConfigurationRead. This uses "org.openoffice.Setup" * as default root name. - * @param xMSF An instance of service + * @param xMSF An instance of service * "com.sun.star.configuration.ConfigurationProvider" */ public ConfigurationRead(XMultiServiceFactory xMSF) { this(xMSF, "org.openoffice.Setup"); } - + /** * Does the node with this hierarchical name exist? * @param name The hierarchical name of a subnode. * @return True, if the node exists. */ - public boolean hasByHieracrhicalName(String name) throws NoSuchElementException, + public boolean hasByHieracrhicalName(String name) throws NoSuchElementException, com.sun.star.lang.WrappedTargetException { return root.hasByHierarchicalName(name); - + } - + /** * Get the elements of the root node. @@ -101,19 +101,19 @@ public class ConfigurationRead { public String[] getRootNodeNames() { XNameAccess xName = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, root); + UnoRuntime.queryInterface(XNameAccess.class, root); String[]names = xName.getElementNames(); return names; } - + /** * Get all elements of this node * @param name The name of the node * @return All elements of this node (as hierarchical names). - */ + */ public String[] getSubNodeNames(String name) { String[]names = null; - try { + try { Object next = root.getByHierarchicalName(name); XNameAccess x = (XNameAccess)UnoRuntime.queryInterface( @@ -128,7 +128,7 @@ public class ConfigurationRead { } return names; } - + /** * Get contents of a node by its hierarchical name. * @param The hierarchical name of the node. diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/runner/helper/ContextMenuInterceptor.java index a14685365c74..9564142e8dff 100644 --- a/qadevOOo/runner/helper/ContextMenuInterceptor.java +++ b/qadevOOo/runner/helper/ContextMenuInterceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ import com.sun.star.ui.XContextMenuInterceptor; import com.sun.star.uno.UnoRuntime; public class ContextMenuInterceptor implements XContextMenuInterceptor { - + public ContextMenuInterceptorAction notifyContextMenuExecute( com.sun.star.ui.ContextMenuExecuteEvent aEvent ) throws RuntimeException { try { @@ -48,15 +48,15 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { XMultiServiceFactory xMenuElementFactory = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class, xContextMenu ); - + if ( xMenuElementFactory != null ) { - + // create root menu entry for sub menu and sub menu XPropertySet xRootMenuEntry = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); - + // create a line separator for our new help sub menu XPropertySet xSeparator = (XPropertySet)UnoRuntime.queryInterface( @@ -64,19 +64,19 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); xSeparator.setPropertyValue( "SeparatorType", (Object)aSeparatorType ); - + // query sub menu for index container to get access XIndexContainer xSubMenuContainer = (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer" )); - + // intialize root menu entry "Help" xRootMenuEntry.setPropertyValue( "Text", new String( "Help" )); xRootMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5410" )); xRootMenuEntry.setPropertyValue( "HelpURL", new String( "5410" )); xRootMenuEntry.setPropertyValue( "SubContainer", (Object)xSubMenuContainer ); - + // create menu entries for the new sub menu // intialize help/content menu entry // entry "Content" @@ -86,10 +86,10 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "Text", new String( "Content" )); xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5401" )); xMenuEntry.setPropertyValue( "HelpURL", new String( "5401" )); - + // insert menu entry to sub menu xSubMenuContainer.insertByIndex( 0, (Object)xMenuEntry ); - + // intialize help/help agent // entry "Help Agent" xMenuEntry = (XPropertySet)UnoRuntime.queryInterface( @@ -98,7 +98,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "Text", new String( "Help Agent" )); xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5962" )); xMenuEntry.setPropertyValue( "HelpURL", new String( "5962" )); - + // insert menu entry to sub menu xSubMenuContainer.insertByIndex( 1, (Object)xMenuEntry ); // intialize help/tips @@ -109,16 +109,16 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "Text", new String( "Tips" )); xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5404" )); xMenuEntry.setPropertyValue( "HelpURL", new String( "5404" )); - + // insert menu entry to sub menu xSubMenuContainer.insertByIndex( 2, (Object)xMenuEntry ); - + // add separator into the given context menu xContextMenu.insertByIndex( 1, (Object)xSeparator ); - + // add new sub menu into the given context menu xContextMenu.insertByIndex( 1, (Object)xRootMenuEntry ); - + // The controller should execute the modified context menu and stop notifying other // interceptors. return ContextMenuInterceptorAction.EXECUTE_MODIFIED ; @@ -134,7 +134,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { } catch ( Throwable ex ) { // catch java exceptions and do something useful } - + return ContextMenuInterceptorAction.IGNORED; } }
\ No newline at end of file diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java index 15292f20d725..39b8dbdb41cd 100644 --- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java +++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java @@ -2,7 +2,7 @@ ************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/runner/helper/FileTools.java index 0a6b4dd96577..f76231c06d49 100644 --- a/qadevOOo/runner/helper/FileTools.java +++ b/qadevOOo/runner/helper/FileTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ import java.io.OutputStream; * This class deliver some functionality to copy files. */ public class FileTools { - + /** * Copies all files under srcDir to dstDir. * If dstDir does not exist, it will be created. * @param srcDir the source directory * @param dstDir the destination direcotry * @throws java.io.IOException throws java.io.IOException if something failes - */ + */ public static void copyDirectory(File srcDir, File dstDir) - throws java.io.IOException { + throws java.io.IOException { copyDirectory(srcDir, dstDir, new String[]{}); } /** @@ -57,7 +57,7 @@ public class FileTools { * @param dstDir the destination direcotry * @param ignore a list of files which should not be copied * @throws java.io.IOException throws java.io.IOException if something failes - */ + */ public static void copyDirectory(File srcDir, File dstDir, String[] ignore) throws java.io.IOException { @@ -66,12 +66,12 @@ public class FileTools { return; } } - + if (srcDir.isDirectory()) { if (!dstDir.exists()) { dstDir.mkdir(); } - + String[] files = srcDir.list(); for (int i=0; i< files.length; i++) { copyDirectory(new File(srcDir, files[i]), new File(dstDir, files[i]), ignore); @@ -81,17 +81,17 @@ public class FileTools { copyFile(srcDir, dstDir); } } - + /** * Copies src file to dst file. If the dst file does not exist, it is created * @param src the source file * @param dst the destination file * @throws java.io.IOException throws java.io.IOException if something failes - */ + */ public static void copyFile(File src, File dst) throws java.io.IOException { InputStream in = new FileInputStream(src); OutputStream out = new FileOutputStream(dst); - + // Transfer bytes from in to out byte[] buf = new byte[1024]; int len; @@ -100,37 +100,37 @@ public class FileTools { } in.close(); out.close(); - } + } /** * Deletes all files and subdirectories under dir and the directory itself. * Returns true if all deletions were successful. - * If the deletion fails, the method the method continues to delete rest + * If the deletion fails, the method the method continues to delete rest * of the files and returns false. * @return Returns true if all deletions were successful, else false. * @param dir the directory to delete - */ + */ public static boolean deleteDir(File dir) { - + // if (! cleanDir(dir)) return false; - + // The directory is now empty so delete it // return dir.delete(); return cleanDir(dir); } - + /** * Deletes all files and subdirectories under dir. * Returns true if all deletions were successful. * If a deletion fails, the method continues to delete rest of the files. * @return Returns true if all deletions were successful, else false. * @param dir the directory to clean from content - */ + */ // public static boolean cleanDir(File dir){ - // + // // boolean success = true; // if (dir.isDirectory()){ // File [] theFiles = dir.listFiles(); - // + // // if (theFiles.length != 0 ) // for (int i = 0; i < theFiles.length; i++){ // success &= theFiles[i].delete(); @@ -147,13 +147,13 @@ public class FileTools { for (int i=0; i<children.length; i++) { boolean success = cleanDir(new File(dir, children[i])); - if (!success) + if (!success) { return false; } } } - + // The directory is now empty so delete it return dir.delete(); } diff --git a/qadevOOo/runner/helper/InetTools.java b/qadevOOo/runner/helper/InetTools.java index 56c964c8f4db..ace571892239 100644 --- a/qadevOOo/runner/helper/InetTools.java +++ b/qadevOOo/runner/helper/InetTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ import lib.TestParameters; public class InetTools { /** - * Helper method: sets the HTTP-Proxy to values from + * Helper method: sets the HTTP-Proxy to values from * <code>lib.TestParameters</code> */ public static boolean setHTTPProxy(TestParameters param){ @@ -55,11 +55,11 @@ public class InetTools { "com.sun.star.configuration.ConfigurationProvider"); XMultiServiceFactory oProviderMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, oProvider); Object oInet = oProviderMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", + "com.sun.star.configuration.ConfigurationUpdateAccess", ProvArgs); XPropertySet oInetProps = (XPropertySet) UnoRuntime.queryInterface( diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 39536179545c..a1a5ec2eadc9 100644 --- a/qadevOOo/runner/helper/LoggingThread.java +++ b/qadevOOo/runner/helper/LoggingThread.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import util.utils; * logger.start(); * oObj.longRunningFunction(); * logger.finish(); - * + * */ public class LoggingThread extends Thread { @@ -51,7 +51,7 @@ public class LoggingThread extends Thread { boolean debug = false; /** - * + * * @param log * @param tParam */ diff --git a/qadevOOo/runner/helper/OSHelper.java b/qadevOOo/runner/helper/OSHelper.java index d8e467ae4584..5f05fe9aed11 100644 --- a/qadevOOo/runner/helper/OSHelper.java +++ b/qadevOOo/runner/helper/OSHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ public class OSHelper return true; } return false; - } + } // not need // public static boolean isUnix() public static boolean isSolarisIntel() @@ -84,5 +84,5 @@ public class OSHelper } return false; } - + } diff --git a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java index 5075c50e795b..d1e67c0aad9f 100644 --- a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java +++ b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 8589de47ea82..54588117fd17 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,9 +183,9 @@ public class OfficeProvider implements AppProvider XMultiServiceFactory msf = connectOffice(cncstr); // if the office is running and the office crashes while testing it could - // be usesfull to restart the office if possible and continuing the tests. + // be usesfull to restart the office if possible and continuing the tests. // Example: The UNO-API-Tests in the projects will be executed by calling - // 'damke'. This connects to an existing office. If the office crashes + // 'damke'. This connects to an existing office. If the office crashes // it is usefull to restart the office and continuing the tests. if ((param.getBool(util.PropertyName.AUTO_RESTART)) && (msf != null)) { @@ -710,7 +710,7 @@ public class OfficeProvider implements AppProvider /** * If the office is connected but the <CODE>AppExecutionCommand</CODE> is not set, - * this function asks the office for its location and fill the + * this function asks the office for its location and fill the * <CODE>AppExecutionCommand</CODE> with valid contet. * This function was only called if parameter <CODE>AutoRestart</CODE> is set. * @param msf the <CODE>MultiServiceFactory</CODE> @@ -814,20 +814,20 @@ public class OfficeProvider implements AppProvider } private void deleteFilesAndDirector(File file) - { - File f = file; + { + File f = file; if(f.isDirectory()) - { - File files[] = f.listFiles(); + { + File files[] = f.listFiles(); for(int i = 0; i < files.length; i++) - { - deleteFilesAndDirector(files[i]); - } - f.delete(); + { + deleteFilesAndDirector(files[i]); + } + f.delete(); } else if (f.isFile()) - { - f.delete(); - } - } + { + f.delete(); + } + } } diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index 2068a7f5246c..3305b1307345 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/helper/ParameterNotFoundException.java b/qadevOOo/runner/helper/ParameterNotFoundException.java index f1ea980e1533..5ba2579602ff 100644 --- a/qadevOOo/runner/helper/ParameterNotFoundException.java +++ b/qadevOOo/runner/helper/ParameterNotFoundException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ package helper; /** * This exception is thrown when a parameter could not be found. - * + * */ public class ParameterNotFoundException extends Exception { public ParameterNotFoundException(String message){ diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index c414accd44ac..ee7b0f079e7e 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,7 +138,7 @@ public class ProcessHandler * Creates instance with specified external command. * Debug info and output * of external command is printed to stdout. - * @param cmdLine + * @param cmdLine */ public ProcessHandler(String cmdLine) { @@ -146,11 +146,11 @@ public class ProcessHandler } /** - * Creates instance with specified external command + * Creates instance with specified external command * including parameters as an array. * Debug info and output * of external command is printed to stdout. - * @param cmdLines + * @param cmdLines */ public ProcessHandler(String[] cmdLines) { @@ -159,13 +159,13 @@ public class ProcessHandler } /** - * Creates instance with specified external command + * Creates instance with specified external command * including parameters as an array, with environment * variables. * Debug info and output * of external command is printed to stdout. - * @param cmdLines - * @param envVars + * @param cmdLines + * @param envVars * @see java.lang.Runtime exec(String[], String[]) */ public ProcessHandler(String[] cmdLines, String[] envVars) @@ -175,13 +175,13 @@ public class ProcessHandler } /** - * Creates instance with specified external command + * Creates instance with specified external command * including parameters as an array, with environment * variables. The command will be started in workDir. * Debug info and output * of external command is printed to stdout. - * @param cmdLines - * @param workDir + * @param cmdLines + * @param workDir */ public ProcessHandler(String[] cmdLines, File workDir) { @@ -194,9 +194,9 @@ public class ProcessHandler * Creates instance with specified external command and * log stream where debug info and output * of external command is printed out. The command will be started in workDir. - * @param cmdLines - * @param log - * @param workDir + * @param cmdLines + * @param log + * @param workDir */ public ProcessHandler(String[] cmdLines, PrintWriter log, File workDir) { @@ -206,10 +206,10 @@ public class ProcessHandler /** * Creates instance with specified external command and - * log stream where debug info and output + * log stream where debug info and output * of external command is printed out. * @param cmdLine - * @param log + * @param log */ public ProcessHandler(String cmdLine, PrintWriter log) { @@ -219,7 +219,7 @@ public class ProcessHandler /** * Creates instance with specified external command and set the time out for the command. * @param cmdLine - * @param timeOut + * @param timeOut */ public ProcessHandler(String cmdLine, int timeOut) { @@ -232,7 +232,7 @@ public class ProcessHandler * Debug info and output * of external commandis printed to stdout. * @param cmdLine - * @param workDir + * @param workDir */ public ProcessHandler(String cmdLine, File workDir) { @@ -245,7 +245,7 @@ public class ProcessHandler * Debug info and output printed in log stream. * @param cmdLine * @param log - * @param workDir + * @param workDir */ public ProcessHandler(String cmdLine, PrintWriter log, File workDir) { @@ -259,10 +259,10 @@ public class ProcessHandler * of external command is printed . * The specified environment variables are set for the new process. * If log stream is null, logging is printed to stdout. - * @param cmdLine - * @param log - * @param workDir - * @param envVars + * @param cmdLine + * @param log + * @param workDir + * @param envVars */ public ProcessHandler(String cmdLine, PrintWriter log, File workDir, String[] envVars) { @@ -348,7 +348,7 @@ public class ProcessHandler } /** - * This method do an asynchronous execution of the commands. To avoid a interruption on long running processes + * This method do an asynchronous execution of the commands. To avoid a interruption on long running processes * caused by <CODE>OfficeWatcher</CODE>, the OfficeWatcher get frequently a ping. * @see helper.OfficeWatcher */ @@ -747,7 +747,7 @@ public class ProcessHandler * The method can also be called before the command * starts its execution. Then the text is buffered * and transfered to command when it will be started. - * @param str + * @param str */ public void printInputText(String str) { @@ -800,7 +800,7 @@ public class ProcessHandler } /** Causes the thread to sleep some time. - * @param milliseconds + * @param milliseconds */ public static void shortWait(long milliseconds) { diff --git a/qadevOOo/runner/helper/PropertyHandlerFactroy.java b/qadevOOo/runner/helper/PropertyHandlerFactroy.java index 1dcdd3d3b2b3..8510787327d8 100644 --- a/qadevOOo/runner/helper/PropertyHandlerFactroy.java +++ b/qadevOOo/runner/helper/PropertyHandlerFactroy.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,19 +31,19 @@ package helper; import com.sun.star.lang.XSingleComponentFactory; public class PropertyHandlerFactroy implements XSingleComponentFactory{ - + /** Creates a new instance of PropertyHandlerFactroy */ public PropertyHandlerFactroy() { } - + public Object createInstanceWithArgumentsAndContext(Object[] obj, com.sun.star.uno.XComponentContext xComponentContext) throws com.sun.star.uno.Exception { return new PropertyHandlerImpl(); } - + public Object createInstanceWithContext(com.sun.star.uno.XComponentContext xComponentContext) throws com.sun.star.uno.Exception { return new PropertyHandlerImpl(); } - + } diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java index 01ab88e05e6b..e2ef9cab736c 100644 --- a/qadevOOo/runner/helper/PropertyHandlerImpl.java +++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ import com.sun.star.inspection.XPropertyHandler; * @see com.sun.star.inspection.XPropertyHandler */ public class PropertyHandlerImpl implements XPropertyHandler{ - + /** Creates a new instance of PropertyHandlerImpl */ public PropertyHandlerImpl() { } - + /** * This method currently do nothig * @param ActuatingPropertyName the id of the actuating property. @@ -62,14 +62,14 @@ public class PropertyHandlerImpl implements XPropertyHandler{ boolean FirstTimeInit) throws com.sun.star.lang.NullPointerException { } - + /** * This method currently do nothig * @param xEventListener the listener to notify about changes */ public void addEventListener(com.sun.star.lang.XEventListener xEventListener) { } - + /** * This method currently do nothig * @param xPropertyChangeListener the listener to notify about property changes @@ -77,7 +77,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ */ public void addPropertyChangeListener(com.sun.star.beans.XPropertyChangeListener xPropertyChangeListener) throws com.sun.star.lang.NullPointerException { } - + /** * This method currently do nothig * @param PropertyName The name of the property whose value is to be converted. @@ -95,7 +95,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ throws com.sun.star.beans.UnknownPropertyException { return null; } - + /** * This method currently do nothig * @param PropertyName The name of the conversion's target property. @@ -106,7 +106,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public Object convertToPropertyValue(String PropertyName, Object ControlValue) throws com.sun.star.beans.UnknownPropertyException { return null; } - + /** * This method currently do nothig * @param PropertyName the name of the property whose user interface is to be described @@ -123,13 +123,13 @@ public class PropertyHandlerImpl implements XPropertyHandler{ com.sun.star.lang.NullPointerException { return null; } - + /** * This method currently do nothig */ public void dispose() { } - + /** * This method currently do nothig * @return null @@ -137,7 +137,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public String[] getActuatingProperties() { return null; } - + /** * This method currently do nothig * @param PropertyName the name of the property whose state is to be retrieved @@ -148,7 +148,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ throws com.sun.star.beans.UnknownPropertyException { return null; } - + /** * This method currently do nothig * @param PropertyName the name of the property whose value is to be retrieved @@ -158,7 +158,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public Object getPropertyValue(String PropertyName) throws com.sun.star.beans.UnknownPropertyException { return null; } - + /** * This method currently do nothig * @return null @@ -166,7 +166,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public String[] getSupersededProperties() { return null; } - + /** * This method currently do nothig * @return null @@ -174,7 +174,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public com.sun.star.beans.Property[] getSupportedProperties() { return null; } - + /** * This method currently do nothig * @param Component the component to inspect. Must not be NULL @@ -182,7 +182,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ */ public void inspect(Object Component) throws com.sun.star.lang.NullPointerException { } - + /** * This method currently do nothig * @param PropertyName the name of the property whose composability is to be determined @@ -194,7 +194,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public boolean isComposable(String PropertyName) throws com.sun.star.beans.UnknownPropertyException { return false; } - + /** * This method currently do nothig * @param PropertyName The name of the property whose browse button has been clicked @@ -215,21 +215,21 @@ public class PropertyHandlerImpl implements XPropertyHandler{ com.sun.star.lang.NullPointerException { return null; } - + /** * This method currently do nothig * @param xEventListener the listener to be revoked */ public void removeEventListener(com.sun.star.lang.XEventListener xEventListener) { } - + /** * This method currently do nothig * @param xPropertyChangeListener the listener to be revoke */ public void removePropertyChangeListener(com.sun.star.beans.XPropertyChangeListener xPropertyChangeListener) { } - + /** * This method currently do nothig * @param PropertyName the name of the property whose value is to be set @@ -238,7 +238,7 @@ public class PropertyHandlerImpl implements XPropertyHandler{ */ public void setPropertyValue(String PropertyName, Object Value) throws com.sun.star.beans.UnknownPropertyException { } - + /** * This method currently do nothig * @param Suspend Whether the handler is to be suspended true or reactivated ( false ). The latter happens if a handler was successfully suspended, but an external instance vetoed the whole suspension process. @@ -254,5 +254,5 @@ public class PropertyHandlerImpl implements XPropertyHandler{ public void describePropertyLine(String string, LineDescriptor[] lineDescriptor, XPropertyControlFactory xPropertyControlFactory) throws UnknownPropertyException, com.sun.star.lang.NullPointerException { } - + } diff --git a/qadevOOo/runner/helper/PropertyHelper.java b/qadevOOo/runner/helper/PropertyHelper.java index 1b2bdbb9f175..934b573c2b34 100755 --- a/qadevOOo/runner/helper/PropertyHelper.java +++ b/qadevOOo/runner/helper/PropertyHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class PropertyHelper // showProperty(aProp); // } // } - + } return aSaveProperties; } diff --git a/qadevOOo/runner/helper/SimpleMailSender.java b/qadevOOo/runner/helper/SimpleMailSender.java index 221de9a75027..991e1b15bfc7 100644 --- a/qadevOOo/runner/helper/SimpleMailSender.java +++ b/qadevOOo/runner/helper/SimpleMailSender.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ public class SimpleMailSender { private String m_Subject = "unknown"; private String m_Message = "unknown"; - + public String getMailServer() { return m_MailServer; } @@ -83,7 +83,7 @@ public class SimpleMailSender { public void setMessage(String msg) { m_Message = msg; } - + public void sendMail() { if (m_MailServer.equals ("unknown")) { System.out.println("No Mailserver given ... exiting"); @@ -98,7 +98,7 @@ public class SimpleMailSender { public void sendMail(String server, String sender, String recipient, String subject, String msg) { - //setting member variables for reuse + //setting member variables for reuse m_MailServer = server; m_Sender = sender; m_Recipient = recipient; diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index 5e6554943e41..4c3d6d37f30b 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * in case the internal streams to the file on disk couldn't established. * They are neccessary. Otherwhise this simulator can't realy work. */ - public StreamSimulator( String sFileName , boolean bInput , + public StreamSimulator( String sFileName , boolean bInput , lib.TestParameters param ) throws com.sun.star.io.NotConnectedException { ////m_aProtocol = new ComplexTestEnvironment(); @@ -97,8 +97,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , try { - XSimpleFileAccess xHelper = (XSimpleFileAccess) - UnoRuntime.queryInterface(XSimpleFileAccess.class, + XSimpleFileAccess xHelper = (XSimpleFileAccess) + UnoRuntime.queryInterface(XSimpleFileAccess.class, ((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.ucb.SimpleFileAccess")); /* com.sun.star.ucb.XSimpleFileAccess xHelper = (com.sun.star.ucb.XSimpleFileAccess)OfficeConnect.createRemoteInstance( com.sun.star.ucb.XSimpleFileAccess.class, @@ -160,13 +160,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readBytes(lData,nBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -200,13 +200,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -238,13 +238,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.skipBytes(nBytesToSkip); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -271,11 +271,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nAvailable = m_xInStream.available(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -302,11 +302,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.closeInput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -338,13 +338,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.writeBytes(lData); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -371,13 +371,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.flush(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -403,13 +403,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.closeOutput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -447,11 +447,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xSeek.seek(nLocation); } - catch (com.sun.star.lang.IllegalArgumentException exArg ) { //m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw exArg; + catch (com.sun.star.lang.IllegalArgumentException exArg ) { //m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw exArg; } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -484,9 +484,9 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nPos = m_xSeek.getPosition(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } @@ -520,9 +520,9 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nLen = m_xSeek.getLength(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; } catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); } diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java index d2eb41606844..75142931af32 100644 --- a/qadevOOo/runner/helper/StringHelper.java +++ b/qadevOOo/runner/helper/StringHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,13 +27,13 @@ package helper; -public class StringHelper +public class StringHelper { public static String doubleQuote(String _sStr) { return "\"" + _sStr + "\""; - } + } public static String singleQuote(String _sStr) { @@ -60,7 +60,7 @@ public class StringHelper } return sNewPath; } - + public static String removeQuoteIfExists(String _sPath) { String sNewPath = _sPath; @@ -80,7 +80,7 @@ public class StringHelper } return sNewPath; } - + public static String doubleQuoteIfNeed(String _sStr) { if (_sStr.startsWith("\"") && _sStr.endsWith("\"")) @@ -97,17 +97,17 @@ public class StringHelper { return singleQuote(_sStr); } - + return doubleQuote(_sStr); } - + /** * Convert a value to a string with a given length, if the len is greater the len of the value string representation * fill it's front with '0' * So ("5", 4) will result in a string "0005" * @param _nValue * @param _nLen - * @return + * @return */ public static String createValueString(int _nValue, int _nLen) { diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java index 39bff1485747..587d7de8db05 100644 --- a/qadevOOo/runner/helper/URLHelper.java +++ b/qadevOOo/runner/helper/URLHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,9 +149,9 @@ public class URLHelper // cut last '/'! if (sServerURL.lastIndexOf('/')==(sServerURL.length()-1)) sServerURL = sServerURL.substring(0,sServerURL.length()-1); - + int index = sFileURL.indexOf(sBaseURL); - String sURL = sFileURL.substring(0,index) + sServerURL + + String sURL = sFileURL.substring(0,index) + sServerURL + sFileURL.substring(index+sBaseURL.length()); //String sURL = sFileURL.replaceFirst(sBaseURL,sServerURL); return sURL; diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index c1c3e63f5ef3..79dd2ef872e8 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ import util.utils; * </ol> */ public class UnoProvider implements AppProvider { - + public UnoProvider(){ - + } /** diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java index a19ae27c62c0..39a4bf635448 100644 --- a/qadevOOo/runner/helper/WindowListener.java +++ b/qadevOOo/runner/helper/WindowListener.java @@ -11,7 +11,7 @@ package helper; * */ public class WindowListener implements com.sun.star.awt.XWindowListener { - + // hidden called public boolean hiddenTrigger; // move called @@ -22,9 +22,9 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { public boolean shownTrigger; // dispose called public boolean disposeTrigger; - - /** - * Creates a new WindowListener + + /** + * Creates a new WindowListener */ public WindowListener() { resetTrigger(); @@ -36,35 +36,35 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { public void windowHidden(com.sun.star.lang.EventObject eventObject) { hiddenTrigger = true; } - + /** * The window move event */ public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) { movedTrigger = true; } - + /** * The window resize event */ public void windowResized(com.sun.star.awt.WindowEvent windowEvent) { resizedTrigger = true; } - + /** * The window show event */ public void windowShown(com.sun.star.lang.EventObject eventObject) { shownTrigger = true; } - + /** * The dispose event */ public void disposing(com.sun.star.lang.EventObject eventObject) { disposeTrigger = true; } - + /** * Reset all triggers to "not fired". */ diff --git a/qadevOOo/runner/lib/DynamicClassLoader.java b/qadevOOo/runner/lib/DynamicClassLoader.java index 2611ad965dfc..841cd119098f 100644 --- a/qadevOOo/runner/lib/DynamicClassLoader.java +++ b/qadevOOo/runner/lib/DynamicClassLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/lib/ExceptionStatus.java b/qadevOOo/runner/lib/ExceptionStatus.java index 198bded1e895..8c14572d6f69 100644 --- a/qadevOOo/runner/lib/ExceptionStatus.java +++ b/qadevOOo/runner/lib/ExceptionStatus.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index 884059bcfd88..5e28ec74e46b 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ public class MultiMethodTest String ifcName = getInterfaceName(); // System.out.println("checking : " + ifcName); System.out.print("checking: [" + entry.longName + "]"); - + // defining a name of the class corresponding to the tested interface // or service String testedClassName; diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index a02f93c04347..e766d13a4ad1 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -179,7 +179,7 @@ public class MultiPropertyTest extends MultiMethodTest try { Object oldValue = oObj.getPropertyValue(propName); - + if( (oldValue==null) || utils.isVoid(oldValue) ) { // #i111560# method getNewValue() does not work with an empty oldValue @@ -187,18 +187,18 @@ public class MultiPropertyTest extends MultiMethodTest if( (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0 ) { // todo: implement a new test independent from method getNewValue() - log.println("changing initially empty MAYBEVOID properties is not supported by the test framework so far - skip test of property: " + propName); + log.println("changing initially empty MAYBEVOID properties is not supported by the test framework so far - skip test of property: " + propName); tRes.tested(propName, true); return; } else { - log.println( "property '"+propName+"' is not set but is not MAYBEVOID"); + log.println( "property '"+propName+"' is not set but is not MAYBEVOID"); tRes.tested(propName, false); return; } } - + Object newValue; // trying to create new value diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 1c4a43c4fd3a..1f52b4b8a08b 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,16 +81,16 @@ public class Parameters implements XPropertySet { } } - + public String get(String paramName) { Object res = parameters.get(paramName); - + if (res != null && res instanceof String) return (String)res; - + if (defaults != null) return defaults.get(paramName); - + return null; } diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index 2c2304b5088e..faf579fe9604 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ class SimpleStatus { * This is a private indicator for a user defined runtime state */ private final static int USER_DEFINED = 4; - + /* Test states */ /** @@ -87,7 +87,7 @@ class SimpleStatus { * or user defined. Deriving classes can overwrite it for own run states. */ protected String runStateString; - + /** * The constructor initialize state and reason field. */ @@ -136,7 +136,7 @@ class SimpleStatus { public String getRunStateString() { return runStateString; } - + /** * Get the ressult: passed or failed. */ diff --git a/qadevOOo/runner/lib/Status.java b/qadevOOo/runner/lib/Status.java index 7cd65c380425..d4bf6afc03d3 100644 --- a/qadevOOo/runner/lib/Status.java +++ b/qadevOOo/runner/lib/Status.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public class Status extends SimpleStatus { public Status(int runState, boolean state ) { super(runState, state); } - + /** * Construct a status: use own message and state. * @parame messaeg An own message for the status. @@ -62,7 +62,7 @@ public class Status extends SimpleStatus { public Status(String message, boolean state) { super( message, state ); } - + /** * This is a factory method for creating a Status representing normal * actibity termination. @@ -110,7 +110,7 @@ public class Status extends SimpleStatus { * @param reason describes why the activity failed */ public static Status failed(final String reason) { - return new Status(reason, FAILED); + return new Status(reason, FAILED); } /** diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java index 4768a9229c8f..38f47ad0b07f 100644 --- a/qadevOOo/runner/lib/StatusException.java +++ b/qadevOOo/runner/lib/StatusException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java index 6b8b960c3014..e09e0609ea2d 100644 --- a/qadevOOo/runner/lib/TestCase.java +++ b/qadevOOo/runner/lib/TestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ import lib.TestParameters; * @see lib.TestEnvironment */ public abstract class TestCase { - + /** * Specifies the PrintWriter to log information. */ - public PrintWriter log; - + public PrintWriter log; + //public static TestCase tCase; /** @@ -67,7 +67,7 @@ public abstract class TestCase { */ public void setLogWriter( PrintWriter log ) { this.log = log; - } + } /** * Initializes the <code>TestCase</code>. Calls <code>initialize()</code> @@ -91,7 +91,7 @@ public abstract class TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { } - + /** * Cleans up the <code>TestCase</code>. Calls <code>cleanup()</code>. @@ -129,19 +129,19 @@ public abstract class TestCase { public synchronized TestEnvironment getTestEnvironment( TestParameters tParam ) { TestEnvironment tEnv = null; try { - tEnv = createTestEnvironment( tParam, log ); + tEnv = createTestEnvironment( tParam, log ); System.out.println("Environment created"); if (tEnv != null) { tEnv.setTestCase(this); } - } catch (Exception e) { + } catch (Exception e) { String message = e.getMessage(); if (message == null) message = e.toString(); System.out.println("Exception while getting Environment "+message); e.printStackTrace(); cleanup(tParam, log); - } + } return tEnv; } @@ -177,6 +177,6 @@ public abstract class TestCase { public String getObjectName() { String clName = this.getClass().getName(); return clName.substring( clName.lastIndexOf('.') + 1 ); - } + } } diff --git a/qadevOOo/runner/lib/TestEnvironment.java b/qadevOOo/runner/lib/TestEnvironment.java index 9848a5b2b633..a3fa76e22571 100644 --- a/qadevOOo/runner/lib/TestEnvironment.java +++ b/qadevOOo/runner/lib/TestEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ public final class TestEnvironment { * Makes the environment invalid, i.e. it should not be used for * testing anymore. */ - public void dispose() { + public void dispose() { disposed = true; } diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 9d1e171b95d9..75a8f8433cdb 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,14 +69,14 @@ public class TestParameters extends Hashtable { */ public String AppExecutionCommand=""; - + /** * If this parameter is <CODE>true</CODE> the <CODE>OfficeProvider</CODE> tries - * to get the URL to the binary of the office and to fill the + * to get the URL to the binary of the office and to fill the * <CODE>AppExecutionCommand</CODE> with usefull content if needet */ public boolean AutoRestart = false; - + /** * Shoert wait time for the Office: default is 500 milliseconds */ @@ -311,7 +311,7 @@ public class TestParameters extends Hashtable { } return (XComponentContext)context; } - + /** * Convert the system dependent operating system name to a name according * to OOo rules. diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java index b0c70954a6cc..8ea0f828d747 100644 --- a/qadevOOo/runner/lib/TestResult.java +++ b/qadevOOo/runner/lib/TestResult.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public class TestResult { * @throw java.lang.IllegalArgumentException if the method is not * available in the interface. */ - public boolean tested( String method, Status status ) { + public boolean tested( String method, Status status ) { testedMethods.put(method,status); return true; } @@ -102,5 +102,5 @@ public class TestResult { public Status getStatusFor( String method ) { return (Status)testedMethods.get( method ); } - + }
\ No newline at end of file diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index a3741774917e..cdcefc992bfe 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index cbe1787f2de1..4666be48b343 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ import java.util.Vector; * fill the TestParameters.<br> * Will then call the appropriate Testbase to run the tests. */ -public class RunnerService implements XJob, XServiceInfo, +public class RunnerService implements XJob, XServiceInfo, XTypeProvider, XPropertyAccess { static public final String __serviceName = "org.openoffice.Runner"; @@ -81,7 +81,7 @@ public class RunnerService implements XJob, XServiceInfo, TestParameters param = new TestParameters(); DynamicClassLoader dcl = new DynamicClassLoader(); - + // take the standard log writer String standardLogWriter = param.LogWriter; String standardOutProducer = param.OutProducer; @@ -109,9 +109,9 @@ public class RunnerService implements XJob, XServiceInfo, //parse the commandline arguments cli.getCommandLineParameter(param,arguments); - - // now compare the standard log writer with the parameters: - // if we have a new one, use the new, else use the internal + + // now compare the standard log writer with the parameters: + // if we have a new one, use the new, else use the internal // log writer if (((String)param.get("LogWriter")).equals(standardLogWriter)) param.put("LogWriter", "stats.InternalLogWriter"); @@ -119,7 +119,7 @@ public class RunnerService implements XJob, XServiceInfo, param.put("OutProducer", "stats.InternalLogWriter"); LogWriter log = (LogWriter) dcl.getInstance( (String)param.get("LogWriter")); - + param.put("ServiceFactory", xMSF); param.ServiceFactory = xMSF; //(XMultiServiceFactory) @@ -132,7 +132,7 @@ public class RunnerService implements XJob, XServiceInfo, boolean worked = toExecute.executeTest(param); if (!worked) log.println("Test did not execute correctly."); - + String returnString = ""; if (log instanceof InternalLogWriter) returnString = ((InternalLogWriter)log).getLog(); @@ -223,7 +223,7 @@ public class RunnerService implements XJob, XServiceInfo, Vector v = new Vector(600); try { // open connection to Jar - java.net.JarURLConnection con = + java.net.JarURLConnection con = (java.net.JarURLConnection)url.openConnection(); // get Jar file from connection java.util.jar.JarFile f = con.getJarFile(); @@ -236,7 +236,7 @@ public class RunnerService implements XJob, XServiceInfo, String module = null; String object = null; - + int startIndex = entry.indexOf("objdsc/") + 7; int endIndex = entry.lastIndexOf('/'); /* int endIndex = entry.indexOf('.'); @@ -244,7 +244,7 @@ public class RunnerService implements XJob, XServiceInfo, startIndex = 0; endIndex = module.lastIndexOf('/'); */ module = entry.substring(startIndex, endIndex); - + // special cases if (entry.indexOf("/file/") != -1 || entry.indexOf("/xmloff/") != -1) { endIndex = entry.indexOf(".csv"); @@ -273,15 +273,15 @@ public class RunnerService implements XJob, XServiceInfo, object = object.substring(startIndex+1); } v.add(module+"."+object); - } + } } } catch(java.io.IOException e) { e.printStackTrace(); - } + } int size = v.size(); - + String[] sTestCases = new String[size]; v.toArray(sTestCases); java.util.Arrays.sort(sTestCases); @@ -335,14 +335,14 @@ public class RunnerService implements XJob, XServiceInfo, /** * empty: not needed here. */ - public void setPropertyValues(PropertyValue[] propertyValue) - throws com.sun.star.beans.UnknownPropertyException, - com.sun.star.beans.PropertyVetoException, - com.sun.star.lang.IllegalArgumentException, + public void setPropertyValues(PropertyValue[] propertyValue) + throws com.sun.star.beans.UnknownPropertyException, + com.sun.star.beans.PropertyVetoException, + com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException { // empty implementation } - + } diff --git a/qadevOOo/runner/share/ComplexTest.java b/qadevOOo/runner/share/ComplexTest.java index ea1ab3c55850..739e2f5bc899 100644 --- a/qadevOOo/runner/share/ComplexTest.java +++ b/qadevOOo/runner/share/ComplexTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ package share; public interface ComplexTest { public String[] getTestMethodNames(); - + public String getTestObjectName(); - + } diff --git a/qadevOOo/runner/share/CwsDataExchange.java b/qadevOOo/runner/share/CwsDataExchange.java index 8f6c31943ad4..1aba6defcd8f 100644 --- a/qadevOOo/runner/share/CwsDataExchange.java +++ b/qadevOOo/runner/share/CwsDataExchange.java @@ -2,7 +2,7 @@ * ************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ import java.util.ArrayList; * */ public interface CwsDataExchange { - + /** * Retunrs all module names which are added to the specified childworkspace * @return a String array of all added modules */ public ArrayList getModules(); - + /** * Set the test status of cws related UnoAPI tests to the EIS dabase * @param status the status of the UnoAPI test diff --git a/qadevOOo/runner/share/DescEntry.java b/qadevOOo/runner/share/DescEntry.java index 6485cd840950..43ff7bd68bf3 100644 --- a/qadevOOo/runner/share/DescEntry.java +++ b/qadevOOo/runner/share/DescEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ package share; /** * * Structure to describe the entries to be tested - * + * */ public class DescEntry { @@ -41,15 +41,15 @@ public class DescEntry { public String entryName; /** * Contains the name that may be used by state writers - */ + */ public String longName; /** * Contains information if this entry is Optional - */ + */ public boolean isOptional; /** * Contains information if this entry should be tested - */ + */ public boolean isToTest; /** * Contains the information about the number of SubEntries @@ -57,41 +57,41 @@ public class DescEntry { public int SubEntryCount; /** * Contains the SubEntries - */ + */ public DescEntry[] SubEntries; - + /** * Contains information about the Type of the entry<br> * possible 'component', 'interface', 'service', 'method', 'property', 'unit' */ public String EntryType; - + /** * Contains the ErrorMsg is something went wrong while gaining<br> * the description - */ + */ public String ErrorMsg; - + /** * Contains information if errors occured while gaining the Description - */ - public boolean hasErrorMsg; - + */ + public boolean hasErrorMsg; + /** * Contains the state for this entry - */ - public String State = "UNKNOWN"; - + */ + public String State = "UNKNOWN"; + /** * Contains the LogWriter to be used by the entry-test */ - + public share.LogWriter Logger; - + /** * Contains an arbitrary set of parameters */ - + public java.util.Hashtable UserDefinedParams = new java.util.Hashtable(); - + } diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java index b032dda1eec3..2f6735c909f2 100644 --- a/qadevOOo/runner/share/DescGetter.java +++ b/qadevOOo/runner/share/DescGetter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public abstract class DescGetter } } // DescEntry aEntry = getDescriptionForSingleJob( -// line.substring(3).trim(), descPath, +// line.substring(3).trim(), descPath, // debug); if (aEntry != null) { diff --git a/qadevOOo/runner/share/LogWriter.java b/qadevOOo/runner/share/LogWriter.java index 67b8250f6f01..a5e9a2614da2 100644 --- a/qadevOOo/runner/share/LogWriter.java +++ b/qadevOOo/runner/share/LogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,41 +28,41 @@ package share; public interface LogWriter { - + /** - * Method to print + * Method to print */ public void println(String msg); - + /** * initialization - * + * */ - + public boolean initialize(share.DescEntry entry, boolean active); - + /** * will mostly be used by outproducers to sum up * the information, maybe write them to a db */ - + public boolean summary(share.DescEntry entry); - - + + /** * Returns the <CODE>Watcher</CODE> which is associated with this logger * @see share.Watcher * @return the associated <CODE>Watcher</CODE> - */ + */ public Object getWatcher(); - + /** * Set a <CODE>Watcher</CODE> to the <CODE>LogWriter</CODE> * This is usefull if a test starts a new office instance by itself. In this cases * the <CODE>LogWritter</CODE> could retrigger the <CODE>Watcher</CODE> * @see share.Watcher * @param watcher the new <CODE>Watcher</CODE> - */ + */ public void setWatcher(Object watcher); - + } diff --git a/qadevOOo/runner/share/Watcher.java b/qadevOOo/runner/share/Watcher.java index bf0c40d9dadf..723cce4138eb 100644 --- a/qadevOOo/runner/share/Watcher.java +++ b/qadevOOo/runner/share/Watcher.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ package share; public interface Watcher { - + /** * pings the watcher to check for changes */ - public void ping(); - + public void ping(); + /** * returns the amount of pings */ diff --git a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java index 7237fcc98dd8..1b2683b123b4 100644 --- a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -157,7 +157,7 @@ public class ComplexDataBaseOutProducer extends DataBaseOutProducer { String entryState = (String)mSqlInput.get("EntryState"); String status = (String)mSqlInput.get("test_state.status"); - + if (!entryState.equals("SKIPPED.FAILED")) { // occurs in case of misspellings: do not make an database entry. if (status == null) { executeSQLCommand("INSERT test_state (test_run_id, entry_id, status)"+ @@ -173,9 +173,9 @@ public class ComplexDataBaseOutProducer extends DataBaseOutProducer { public Object getWatcher() { return null; - } - + } + public void setWatcher(Object watcher) { } - + } diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 814135d553ca..8f7213738031 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index dce9c137810a..b768defcc5fb 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import java.util.GregorianCalendar; * */ public class FatDataBaseOutProducer extends DataBaseOutProducer { - + /** Creates a new instance of APIDataBaseOutProducer */ public FatDataBaseOutProducer(Hashtable param) { @@ -74,7 +74,7 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { protected boolean prepareDataBase(LogWriter log) { executeSQLCommand("SHOW TABLES"); - + executeSQLCommand("SELECT id AS \"test_run.id\", api_version_id, description, date FROM test_run" + " WHERE date = \"$date\" AND description = \"$test_run.description\";", true); String id = (String)mSqlInput.get("test_run.id"); @@ -133,15 +133,15 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { executeSQLCommand("UPDATE test_state SET status = \"$EntryState\""+ " WHERE test_run_id = $test_run.id AND entry_id = $entry.id;"); } - } + } return true; } public Object getWatcher() { return null; } - + public void setWatcher(Object watcher) { } - + } diff --git a/qadevOOo/runner/stats/FileLogWriter.java b/qadevOOo/runner/stats/FileLogWriter.java index cfa4ccc5a617..1232480790f1 100644 --- a/qadevOOo/runner/stats/FileLogWriter.java +++ b/qadevOOo/runner/stats/FileLogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,12 +40,12 @@ import java.util.Iterator; public class FileLogWriter extends PrintWriter implements LogWriter { - + HashMap mFileWriters = null; boolean logging = false; share.DescEntry entry = null; share.Watcher ow = null; - + public FileLogWriter() { super(System.out); Calendar cal = new GregorianCalendar(); @@ -65,38 +65,38 @@ public class FileLogWriter extends PrintWriter implements LogWriter { this.entry = entry; return true; } - - - public void addFileLog(String filePath){ + + + public void addFileLog(String filePath){ try{ if(mFileWriters == null) - mFileWriters = new HashMap(); - mFileWriters.put(filePath, new FileWriter(filePath)); + mFileWriters = new HashMap(); + mFileWriters.put(filePath, new FileWriter(filePath)); }catch(IOException e ){ e.printStackTrace(this); - } + } } - - - public void removeFileLog(String filePath){ + + + public void removeFileLog(String filePath){ if(filePath != null) - mFileWriters.remove(filePath); + mFileWriters.remove(filePath); } - - + + public void println(String msg) { - + this.ow = (share.Watcher) entry.UserDefinedParams.get("Watcher"); - + if (ow != null) { ow.ping(); } if (logging) { - + // logoutput to console super.println("LOG> "+msg); - super.flush(); - + super.flush(); + //logoutput to file if(mFileWriters != null && mFileWriters.size() > 0){ try{ @@ -110,7 +110,7 @@ public class FileLogWriter extends PrintWriter implements LogWriter { }catch(IOException e ){ e.printStackTrace(this); } - } + } } } @@ -124,7 +124,7 @@ public class FileLogWriter extends PrintWriter implements LogWriter { System.out.println("Whole "+entry.EntryType+": "+entry.State); } for (int i=0;i<header.length();i++) { - System.out.print("*"); + System.out.print("*"); } System.out.println(""); return true; @@ -133,9 +133,9 @@ public class FileLogWriter extends PrintWriter implements LogWriter { public Object getWatcher() { return this.ow; } - + public void setWatcher(Object watcher) { entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher); } - + } diff --git a/qadevOOo/runner/stats/InternalLogWriter.java b/qadevOOo/runner/stats/InternalLogWriter.java index b3c71217fb64..a5ba6a81316d 100644 --- a/qadevOOo/runner/stats/InternalLogWriter.java +++ b/qadevOOo/runner/stats/InternalLogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,13 +112,13 @@ public class InternalLogWriter extends PrintWriter writer = new StringWriter(); return message; } - + public Object getWatcher() { return null; } - + public void setWatcher(Object watcher) { } - + } diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index ca569631f409..a1a36c2a9183 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index c55da50327a6..19cc8b12316b 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/stats/SimpleFileOutProducer.java b/qadevOOo/runner/stats/SimpleFileOutProducer.java index e03cf374e187..b4427409778f 100644 --- a/qadevOOo/runner/stats/SimpleFileOutProducer.java +++ b/qadevOOo/runner/stats/SimpleFileOutProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,21 +32,21 @@ import java.io.File; import java.io.FileWriter; public class SimpleFileOutProducer implements LogWriter { - - + + /** initialization, here a filename might be given * or a dbUrL */ - public boolean initialize(share.DescEntry entry, boolean active) { + public boolean initialize(share.DescEntry entry, boolean active) { return true; } - + /** Method to print */ public void println(String msg) { } - + /** will mostly be used by outproducers to sum up * the information, maybe write them to a db */ @@ -61,9 +61,9 @@ public class SimpleFileOutProducer implements LogWriter { if (!entry.EntryType.equals("component")) { FileName = entry.longName.substring(0, entry.longName.indexOf(":")) + ".out"; - } + } util.utils.make_Directories("",outpath); - File outputFile = new File(outpath, FileName); + File outputFile = new File(outpath, FileName); FileWriter out = new FileWriter(outputFile.toString(),true); String ls = System.getProperty("line.separator"); String date = new java.util.Date().toString(); @@ -77,18 +77,18 @@ public class SimpleFileOutProducer implements LogWriter { } String bottom=""; for (int i=0;i<header.length();i++) { - bottom += "*"; + bottom += "*"; } out.write(bottom+ls); out.write(""+ls); out.close(); } catch (java.io.IOException e) { - + } return true; } - - public boolean summary_default(share.DescEntry entry) { + + public boolean summary_default(share.DescEntry entry) { String header = "***** State for "+entry.longName+" ******"; System.out.println(header); if (entry.hasErrorMsg) { @@ -98,17 +98,17 @@ public class SimpleFileOutProducer implements LogWriter { System.out.println("Whole "+entry.EntryType+": "+entry.State); } for (int i=0;i<header.length();i++) { - System.out.print("*"); + System.out.print("*"); } System.out.println(""); return true; - } + } public Object getWatcher() { return null; - } - + } + public void setWatcher(Object watcher) { } - + } diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index 9bdfb30fe223..ef338db36ba0 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/stats/SimpleOutProducer.java b/qadevOOo/runner/stats/SimpleOutProducer.java index 4c91233e6f67..24007efa3b3c 100644 --- a/qadevOOo/runner/stats/SimpleOutProducer.java +++ b/qadevOOo/runner/stats/SimpleOutProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ import share.LogWriter; * @author sw93809 */ public class SimpleOutProducer implements LogWriter { - + /** initialization, here a filename might be given * or a dbUrL @@ -41,13 +41,13 @@ public class SimpleOutProducer implements LogWriter { public boolean initialize(share.DescEntry entry, boolean active) { return true; } - + /** Method to print */ public void println(String msg) { } - + /** will mostly be used by outproducers to sum up * the information, maybe write them to a db */ @@ -61,7 +61,7 @@ public class SimpleOutProducer implements LogWriter { System.out.println("Whole "+entry.EntryType+": "+entry.State); } for (int i=0;i<header.length();i++) { - System.out.print("*"); + System.out.print("*"); } System.out.println(""); return true; @@ -69,9 +69,9 @@ public class SimpleOutProducer implements LogWriter { public Object getWatcher() { return null; - } - + } + public void setWatcher(Object watcher) { } - + } diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java index b1fe5fe61dd3..2d28ea1fe0fd 100644 --- a/qadevOOo/runner/stats/Summarizer.java +++ b/qadevOOo/runner/stats/Summarizer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ public class Summarizer /** * * gets the state for a SuperEntry according to its subentries - * @param entry + * @param entry */ public void summarizeUp(DescEntry entry) { diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 3fb964a2362b..c4bc428ed624 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,105 +44,105 @@ public class AccessibilityTools { public static XAccessibleContext SearchedContext = null; public static XAccessible SearchedAccessible = null; private static boolean debug = false; - + public AccessibilityTools() { //done = false; SearchedContext = null; } - + public static XAccessible getAccessibleObject(XInterface xObject) { return UnoRuntime.queryInterface(XAccessible.class, xObject); } - + public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf, XModel xModel) { return getWindow(msf, xModel, true); } - + public static XWindow getCurrentWindow(XMultiServiceFactory msf, XModel xModel) { return getWindow(msf, xModel, false); } - + private static XWindow getWindow(XMultiServiceFactory msf, XModel xModel, boolean containerWindow) { XWindow xWindow = null; - + try { if (xModel == null) { System.out.println("invalid model (==null)"); } - + XController xController = xModel.getCurrentController(); - + if (xController == null) { System.out.println("can't get controller from model"); } - + XFrame xFrame = xController.getFrame(); - + if (xFrame == null) { System.out.println("can't get frame from controller"); } - + if (containerWindow) xWindow = xFrame.getContainerWindow(); else xWindow = xFrame.getComponentWindow(); - + if (xWindow == null) { System.out.println("can't get window from frame"); } } catch (Exception e) { System.out.println("caught exception while getting current window" + e); } - + return xWindow; } - + public static XAccessibleContext getAccessibleObjectForRole(XAccessible xacc, short role) { SearchedContext = null; SearchedAccessible = null; getAccessibleObjectForRole_(xacc, role); - + return SearchedContext; } - + public static XAccessibleContext getAccessibleObjectForRole(XAccessible xacc, short role, boolean ignoreShowing) { SearchedContext = null; SearchedAccessible = null; - + if (ignoreShowing) { getAccessibleObjectForRoleIgnoreShowing_(xacc, role); } else { getAccessibleObjectForRole_(xacc, role); } - + return SearchedContext; } - + public static void getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc, short role) { XAccessibleContext ac = xacc.getAccessibleContext(); - + if (ac.getAccessibleRole() == role) { SearchedContext = ac; SearchedAccessible = xacc; } else { int k = ac.getAccessibleChildCount(); - + if (ac.getAccessibleChildCount() > 100) { k = 50; } - + for (int i = 0; i < k; i++) { try { getAccessibleObjectForRoleIgnoreShowing_( ac.getAccessibleChild(i), role); - + if (SearchedContext != null) { return; } @@ -152,27 +152,27 @@ public class AccessibilityTools { } } } - + public static void getAccessibleObjectForRole_(XAccessible xacc, short role) { XAccessibleContext ac = xacc.getAccessibleContext(); boolean isShowing = ac.getAccessibleStateSet() .contains(com.sun.star.accessibility.AccessibleStateType.SHOWING); - + if ((ac.getAccessibleRole() == role) && isShowing) { SearchedContext = ac; SearchedAccessible = xacc; } else { int k = ac.getAccessibleChildCount(); - + if (ac.getAccessibleChildCount() > 100) { k = 50; } - + for (int i = 0; i < k; i++) { try { getAccessibleObjectForRole_(ac.getAccessibleChild(i), role); - + if (SearchedContext != null) { return; } @@ -182,13 +182,13 @@ public class AccessibilityTools { } } } - + public static XAccessibleContext getAccessibleObjectForRole(XAccessible xacc, short role, String name) { return getAccessibleObjectForRole(xacc, role, name, ""); } - + public static XAccessibleContext getAccessibleObjectForRole(XAccessible xacc, short role, String name, @@ -200,7 +200,7 @@ public class AccessibilityTools { return getAccessibleObjectForRole(xacc, role, name, ""); } } - + public static XAccessibleContext getAccessibleObjectForRoleIgnoreShowing(XAccessible xacc, short role, String name, @@ -210,22 +210,22 @@ public class AccessibilityTools { (ac.getAccessibleName().indexOf(name) > -1) && (utils.getImplName(ac).indexOf(implName) > -1)) { SearchedAccessible = xacc; - + //System.out.println("FOUND the desired component -- "+ ac.getAccessibleName() +isShowing); return ac; } else { int k = ac.getAccessibleChildCount(); - + if (ac.getAccessibleChildCount() > 100) { k = 50; } - + for (int i = 0; i < k; i++) { try { XAccessibleContext ac1 = getAccessibleObjectForRoleIgnoreShowing( ac.getAccessibleChild(i), role, name, implName); - + if (ac1 != null) { return ac1; } @@ -234,10 +234,10 @@ public class AccessibilityTools { } } } - + return null; } - + public static XAccessibleContext getAccessibleObjectForRole(XAccessible xacc, short role, String name, @@ -245,7 +245,7 @@ public class AccessibilityTools { XAccessibleContext ac = xacc.getAccessibleContext(); boolean isShowing = ac.getAccessibleStateSet() .contains(com.sun.star.accessibility.AccessibleStateType.SHOWING); - + // hotfix for i91828: // if role to serach is 0 then ignore the role. if ( (role == 0 || ac.getAccessibleRole() == role) && @@ -257,17 +257,17 @@ public class AccessibilityTools { return ac; } else { int k = ac.getAccessibleChildCount(); - + if (ac.getAccessibleChildCount() > 100) { k = 50; } - + for (int i = 0; i < k; i++) { try { XAccessibleContext ac1 = getAccessibleObjectForRole( ac.getAccessibleChild(i), role, name, implName); - + if (ac1 != null) { return ac1; } @@ -276,10 +276,10 @@ public class AccessibilityTools { } } } - + return null; } - + /** * This methods retunrs the <CODE>XAccessibleContext</CODE> of a named Sheet-Cell like "G5".<p> * @param xSheetAcc The <CODE>XAccessibleContext</CODE> of a Sheet @@ -287,16 +287,16 @@ public class AccessibilityTools { * @return the <CODE>XAccessiblecontext</CODE> of the named cell */ public static XAccessibleContext getSheetCell(XAccessibleContext xSheetAcc, String cellName){ - + int cellIndex = 0; int column =0; int charMem = 0; for (int n=0; n<cellName.length(); n++){ String cha = cellName.substring(n,n+1); System.out.println("char: " + cha + " "); - + byte[] bytes = cha.getBytes(); - + if ((bytes[0] >= 'A') && (bytes[0] <= 'Z')){ charMem = bytes[0]-64; column++; @@ -310,47 +310,47 @@ public class AccessibilityTools { cellIndex += (iNumb-1) * 256; System.out.println("numb:" + (iNumb-1) * 256); } - + } - + //System.out.println("cellName: " + cellName + " cellIndex: " + cellIndex); - + try { XAccessibleContext ac = xSheetAcc.getAccessibleChild(cellIndex).getAccessibleContext(); System.out.println(ac.getAccessibleRole() + "," + ac.getAccessibleName() + "(" + ac.getAccessibleDescription() + "):" + utils.getImplName(ac)); - + return ac; } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { System.out.println("ERROR: could not get child at index " + cellIndex +"': " + ex.toString()); return null; } } - + public static void printAccessibleTree(PrintWriter log, XAccessible xacc, boolean debugIsActive) { debug = debugIsActive; if (debug) printAccessibleTree(log, xacc, ""); } - + public static void printAccessibleTree(PrintWriter log, XAccessible xacc) { printAccessibleTree(log, xacc, ""); } - + protected static void printAccessibleTree(PrintWriter log, XAccessible xacc, String indent) { - + XAccessibleContext ac = xacc.getAccessibleContext(); - + logging(log,indent + ac.getAccessibleRole() + "," + ac.getAccessibleName() + "(" + ac.getAccessibleDescription() + "):" + utils.getImplName(ac)); - + XAccessibleComponent aComp = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, xacc); - + if (aComp != null) { String bounds = "(" + aComp.getBounds().X + "," + aComp.getBounds().Y + ")" + " (" + @@ -359,18 +359,18 @@ public class AccessibilityTools { bounds = "The boundary Rectangle is " + bounds; logging(log,indent + indent + bounds); } - + boolean isShowing = ac.getAccessibleStateSet() .contains(com.sun.star.accessibility.AccessibleStateType.SHOWING); logging(log,indent + indent + "StateType contains SHOWING: " + isShowing); - + int k = ac.getAccessibleChildCount(); - + if (ac.getAccessibleChildCount() > 100) { k = 50; } - + for (int i = 0; i < k; i++) { try { printAccessibleTree(log, ac.getAccessibleChild(i), @@ -379,13 +379,13 @@ public class AccessibilityTools { System.out.println("Couldn't get Child"); } } - + if (ac.getAccessibleChildCount() > 100) { k = ac.getAccessibleChildCount(); - + int st = ac.getAccessibleChildCount() - 50; logging(log,indent + " " + " ...... [skipped] ......"); - + for (int i = st; i < k; i++) { try { printAccessibleTree(log, ac.getAccessibleChild(i), @@ -396,65 +396,65 @@ public class AccessibilityTools { } } } - + public static String accessibleToString(Object AC) { XAccessibleContext xAC = (XAccessibleContext) UnoRuntime.queryInterface( XAccessibleContext.class, AC); - + if (xAC != null) { return "" + xAC.getAccessibleRole() + "," + xAC.getAccessibleName() + "(" + xAC.getAccessibleDescription() + "):"; } - + XAccessible xA = (XAccessible) UnoRuntime.queryInterface( XAccessible.class, AC); - + if (xA == null) { return "(Not supported)"; } - + xAC = xA.getAccessibleContext(); - + return "" + xAC.getAccessibleRole() + "," + xAC.getAccessibleName() + "(" + xAC.getAccessibleDescription() + ")"; } - + public static boolean equals(XAccessible c1, XAccessible c2) { if ((c1 == null) || (c2 == null)) { return c1 == c2; } - + return AccessibilityTools.equals(c1.getAccessibleContext(), c2.getAccessibleContext()); } - + public static boolean equals(XAccessibleContext c1, XAccessibleContext c2) { if ((c1 == null) || (c2 == null)) { return c1 == c2; } - + if (c1.getAccessibleRole() != c2.getAccessibleRole()) { return false; } - + if (!c1.getAccessibleName().equals(c2.getAccessibleName())) { return false; } - + if (!c1.getAccessibleDescription() .equals(c2.getAccessibleDescription())) { return false; } - + if (c1.getAccessibleChildCount() != c2.getAccessibleChildCount()) { return false; } - + return AccessibilityTools.equals(c1.getAccessibleParent(), c2.getAccessibleParent()); } - + private static void logging(PrintWriter log, String content){ if (debug) log.println(content); } diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 0d64779137f7..5386be217403 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public class BasicMacroTools { /* *While initializing the Basic Libraries will be appendend to the Document */ - public BasicMacroTools(XMultiServiceFactory msf, XModel xModel, + public BasicMacroTools(XMultiServiceFactory msf, XModel xModel, XComponent xDoc) throws java.lang.Exception { try { mMSF = msf; @@ -72,14 +72,14 @@ public class BasicMacroTools { "Couldn't get BasicLibraries-Container from document: " + e.toString()); } - mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, DocLibCont); mLCxLC = (XLibraryContainer) UnoRuntime.queryInterface( XLibraryContainer.class, DocLibCont); } catch (Exception e) { - throw new Exception("could not initialize BasicMacros " + + throw new Exception("could not initialize BasicMacros " + e.toString()); } } @@ -104,19 +104,19 @@ public class BasicMacroTools { "Couldn't create ApplicationScriptLibraryContainer" + e.toString()); } - mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, ASLC); mLCxLC = (XLibraryContainer) UnoRuntime.queryInterface( XLibraryContainer.class, ASLC); } catch (Exception e) { - throw new Exception("could not initialize BasicMacros " + + throw new Exception("could not initialize BasicMacros " + e.toString()); } } - private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory mMSF, + private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory mMSF, XModel aModel) throws java.lang.Exception { XController xController = aModel.getCurrentController(); @@ -137,7 +137,7 @@ public class BasicMacroTools { XURLTransformer.class, mMSF.createInstance( "com.sun.star.util.URLTransformer")); } catch (Exception e) { - throw new Exception("could not create UTL-Transformer " + + throw new Exception("could not create UTL-Transformer " + e.toString()); } } @@ -148,7 +148,7 @@ public class BasicMacroTools { appendLibrary(LibraryName, LibraryURL); } catch (java.lang.Exception e) { e.printStackTrace(); - throw new Exception("ERROR: Could not append Library " + + throw new Exception("ERROR: Could not append Library " + LibraryName + e.toString()); } @@ -156,11 +156,11 @@ public class BasicMacroTools { mLCxLC.loadLibrary(LibraryName); } catch (com.sun.star.container.NoSuchElementException e) { e.printStackTrace(); - throw new Exception("ERROR: Could not load Library " + + throw new Exception("ERROR: Could not load Library " + LibraryName + e.toString()); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); - throw new Exception("ERROR: Could not load Library " + + throw new Exception("ERROR: Could not load Library " + LibraryName + e.toString()); } } @@ -176,11 +176,11 @@ public class BasicMacroTools { mLCxLC.createLibraryLink(LibraryName, LibraryURL, false); } catch (com.sun.star.container.ElementExistException e) { e.printStackTrace(); - throw new Exception("ERROR: Library " + LibraryName + + throw new Exception("ERROR: Library " + LibraryName + "already exist." + e.toString()); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); - throw new Exception("Could not link Basic library:" + + throw new Exception("Could not link Basic library:" + LibraryName + e.toString()); } } @@ -191,11 +191,11 @@ public class BasicMacroTools { mLCxLC.removeLibrary(LibraryName); } catch (com.sun.star.container.NoSuchElementException e) { e.printStackTrace(); - throw new Exception("Could not remove Basic library:" + + throw new Exception("Could not remove Basic library:" + LibraryName + ": Library does not exist" + e.toString()); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); - throw new Exception("Could not remove Basic library:" + + throw new Exception("Could not remove Basic library:" + LibraryName + e.toString()); } } @@ -216,7 +216,7 @@ public class BasicMacroTools { throw new Exception("Could not run Macro " + MacroName); } } - + /** * Set the given <CODE>secureURL</CODE> as secure URL for marco execution. * The macros of documents located in <CODE>secureURL</CODE> will be executed @@ -227,9 +227,9 @@ public class BasicMacroTools { */ public static void addSecureBasicMarcosURL(XMultiServiceFactory xMSF, String secureURL) throws Exception { - + secureURL = utils.getFullURL(secureURL); - + // configure Office to allow to execute macos PropertyValue[] ProvArgs = new PropertyValue [1]; PropertyValue Arg = new PropertyValue(); diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index 5929192ac1df..eb86c528cf0b 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/CalcTools.java b/qadevOOo/runner/util/CalcTools.java index 08a8b945839a..f5c91af06dce 100644 --- a/qadevOOo/runner/util/CalcTools.java +++ b/qadevOOo/runner/util/CalcTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ import com.sun.star.uno.UnoRuntime; * and its sheets. */ public class CalcTools { - + /** - * fills a range of a calc sheet with computed data of type + * fills a range of a calc sheet with computed data of type * <CODE>Double</CODE>. * @param xSheetDoc the Clac documents wich should be filled * @param sheetNumber the number of the sheet of <CODE>xSheetDoc</CODE> @@ -72,10 +72,10 @@ public class CalcTools { throw new Exception( "Couldn't fill CalcSheet with content: " + e.toString()); } - } - + } + /** - * fills a range of a calc sheet with computed data of type + * fills a range of a calc sheet with computed data of type * <CODE>Double</CODE>. * @param xSheet the sheet to fill with content * @param startCellX the cell number of the X start point (row) of the range to fill @@ -84,10 +84,10 @@ public class CalcTools { * @param rangeLengthY the size of the range expansion in Y-direction * @throws java.lang.Exception on any error an <CODE>java.lang.Exception</CODE> was thrown */ - public static void fillCalcSheetWithContent(XSpreadsheet xSheet, + public static void fillCalcSheetWithContent(XSpreadsheet xSheet, int startCellX, int startCellY, int rangeLengthX, int rangeLengthY) throws java.lang.Exception { - + try{ // create a range with content Object[][] newData = new Object[rangeLengthY][rangeLengthX]; @@ -98,7 +98,7 @@ public class CalcTools { } XCellRange xRange = null; try { - xRange = xSheet.getCellRangeByPosition(startCellX, startCellY, + xRange = xSheet.getCellRangeByPosition(startCellX, startCellY, startCellX+rangeLengthX-1, startCellY+rangeLengthY-1); } catch ( IndexOutOfBoundsException e){ throw new Exception( @@ -113,9 +113,9 @@ public class CalcTools { "Couldn't fill CalcSheet with content: " + e.toString()); } } - + /** - * + * * returns an <CODE>XSpreadsheet</CODE> from a Calc document. * @param xSheetDoc the Calc docuent which containes the sheet * @param sheetNumber the number of the sheet to return @@ -125,7 +125,7 @@ public class CalcTools { */ public static XSpreadsheet getSpreadSheetFromSheetDoc(XComponent xSheetDoc, int sheetNumber) throws java.lang.Exception { - + XSpreadsheet xSheet = null; try{ @@ -154,7 +154,7 @@ public class CalcTools { } catch (Exception e){ throw new Exception( "Couldn't get sheet '" +sheetNumber + "' : " + e.toString()); - } + } return xSheet; } } diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java index f2f1a82e63f4..ae8f17a7969f 100644 --- a/qadevOOo/runner/util/ControlDsc.java +++ b/qadevOOo/runner/util/ControlDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 440274d8fd9a..89575eef6382 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -328,7 +328,7 @@ public class DBTools { try { revokeDB(name) ; } catch (com.sun.star.uno.Exception e) {} - + XDocumentDataSource xDDS = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class, dataSource); XStorable store = (XStorable) UnoRuntime.queryInterface(XStorable.class, @@ -663,7 +663,7 @@ public class DBTools { } else retVal = "file:///" + retVal ; - } + } return retVal; } diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index 07a2cdd2c5cc..58656e388e74 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index 3384a8b83423..5574cd710a10 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class DesktopTools /** * Queries the XComponentLoader - * + * * @param xMSF the MultiServiceFactory * @return the gained XComponentLoader */ @@ -78,7 +78,7 @@ public class DesktopTools /** * Creates an Instance of the Desktop service - * + * * @param xMSF the MultiServiceFactory * @return the gained Object */ @@ -485,7 +485,7 @@ public class DesktopTools bringWindowToFront(xModel); } - /** + /** * This function brings a document to the front.<P> * NOTE: it is not possible to change the window order of your Window-Manager!! * Only the order of Office documents are changeable. diff --git a/qadevOOo/runner/util/DrawTools.java b/qadevOOo/runner/util/DrawTools.java index d5f862cb49a7..4a329964b17e 100644 --- a/qadevOOo/runner/util/DrawTools.java +++ b/qadevOOo/runner/util/DrawTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,26 +53,26 @@ import com.sun.star.uno.Type; public class DrawTools { - + /** * Opens a new draw document * with arguments * @param xMSF the MultiServiceFactory * @return the XComponent Interface of the document - */ + */ public static XComponent createDrawDoc( XMultiServiceFactory xMSF ) { PropertyValue[] Args = new PropertyValue [0]; XComponent DrawDoc = DesktopTools.openNewDoc( xMSF, "sdraw", Args ); return DrawDoc; } // finish createDrawDoc - + /** * gets the XDrawPages container of a draw document - * + * * @param aDoc the draw document * @return the XDrawpages container of the document - */ + */ public static XDrawPages getDrawPages ( XComponent aDoc ) { XDrawPages oDPn = null; @@ -86,14 +86,14 @@ public class DrawTools { } return oDPn; } // finish getDrawPages - + /** * gets the specified XDrawPage of a draw document - * + * * @param aDoc the draw document * @param nr the index of the DrawPage * @return the XDrawpage with index nr of the document - */ + */ public static XDrawPage getDrawPage ( XComponent aDoc, int nr ) { XDrawPage oDP = null; @@ -105,29 +105,29 @@ public class DrawTools { } return oDP; } - + /** * gets the XShapes container of a draw page - * - * @param oDP the draw page + * + * @param oDP the draw page * @return the XDrawShape container of the drawpage - */ + */ public static XShapes getShapes ( XDrawPage oDP ) { return (XShapes) UnoRuntime.queryInterface(XShapes.class,oDP); } - + /** * creates a XShape - * + * * @param oDoc the document * @param height the height of the shape * @param width the width of the shape * @param x the x-position of the shape * @param y the y-position of the shape * @param kind the kind of the shape ('Ellipse', 'Line' or 'Rectangle') - * @return the created XShape - */ + * @return the created XShape + */ public XShape createShape( XComponent oDoc, int height, int width, int x, int y, String kind ) { @@ -136,10 +136,10 @@ public class DrawTools { ShapeDsc sDsc = new ShapeDsc( height, width, x, y, kind ); InstCreator instCreate = new InstCreator( oDoc, sDsc ); XShape oShape = (XShape)instCreate.getInstance(); - + return oShape; } - + /** * creates a XShape and adds it to the documents * first drawpage @@ -149,8 +149,8 @@ public class DrawTools { * @param x the x-position of the shape * @param y the y-position of the shape * @param kind the kind of the shape ('Ellipse', 'Line' or 'Rectangle') - * @return the created XShape - */ + * @return the created XShape + */ public void addShape( XComponent oDoc, int height, int width, int x, int y, String kind ) { diff --git a/qadevOOo/runner/util/DynamicClassLoader.java b/qadevOOo/runner/util/DynamicClassLoader.java index 659593e69346..fc8f6ecf37cf 100644 --- a/qadevOOo/runner/util/DynamicClassLoader.java +++ b/qadevOOo/runner/util/DynamicClassLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ public class DynamicClassLoader { } /** - * Get an instance of a class. The constructor matching to the + * Get an instance of a class. The constructor matching to the * arguments is used and the arguments are given to this constructor. * @param className The class to instantiate. * @param ctorArgs Arguments for the constructor. @@ -82,12 +82,12 @@ public class DynamicClassLoader { ctorType[i] = ctorArgs[i].getClass(); } return getInstance(className, ctorType, ctorArgs); - + } - + /** - * Get an instance of a class. The constructor matching to the - * given calss types is used and the instance is created using the arguments + * Get an instance of a class. The constructor matching to the + * given calss types is used and the instance is created using the arguments * for the constructor. * @param className The class to instantiate. * @param ctorClassTypes The class types matching to the constructor. @@ -100,7 +100,7 @@ public class DynamicClassLoader { Class cls = DynamicClassLoader.forName(className); Constructor ctor = cls.getConstructor(ctorClassTypes); System.out.println("ctor: " + ctor.getName() + " " + ctor.getModifiers()); - + return ctor.newInstance(ctorArgs); } catch ( ClassNotFoundException e ) { throw new IllegalArgumentException("Couldn't find " + className diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index ce7b62d4003b..e5ae1847ba7a 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java index 46515043f677..602cf3e16354 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,28 +53,28 @@ import com.sun.star.uno.Type; public class FormTools { - + /** * creates a XControlShape - * + * * @param oDoc the document * @param height the height of the shape * @param width the width of the shape * @param x the x-position of the shape * @param y the y-position of the shape * @param kind the kind of the shape - * @return the created XControlShape - */ + * @return the created XControlShape + */ public static XControlShape createControlShape( XComponent oDoc, int height, int width, int x, int y, String kind ) { - - Size size = new Size(); + + Size size = new Size(); Point position = new Point(); XControlShape oCShape = null; XControlModel aControl = null; //get MSF - XMultiServiceFactory oDocMSF = (XMultiServiceFactory) + XMultiServiceFactory oDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, oDoc ); try{ @@ -263,7 +263,7 @@ public class FormTools { public static XLoadable bindForm( XTextDocument aDoc, String sourceName, String tableName ) throws com.sun.star.uno.Exception { - XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), + XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0)); XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); @@ -306,7 +306,7 @@ public class FormTools { public static XLoadable bindForm( XTextDocument aDoc, String formName, String sourceName, String tableName) throws com.sun.star.uno.Exception { - XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), + XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName(formName)); XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 4bfb64e8459c..10a72e2b5c07 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index b76066d7e95e..e3ab34ca083f 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/InstDescr.java b/qadevOOo/runner/util/InstDescr.java index e8343bc866e3..ca5f60073868 100644 --- a/qadevOOo/runner/util/InstDescr.java +++ b/qadevOOo/runner/util/InstDescr.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ abstract public class InstDescr { /** * the method getIfcClass */ - public Class getIfcClass() { + public Class getIfcClass() { return ifcClass; } /** diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index acaa630baad5..4b828402e873 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 075fa4d9704e..de8dfc7ad052 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ public interface PropertyName { /** * parameter name: "AppKillCommand" */ - final public static String APP_KILL_COMMAND = "AppKillCommand"; + final public static String APP_KILL_COMMAND = "AppKillCommand"; /** * parameter name: "ConnectionString" */ @@ -121,17 +121,17 @@ public interface PropertyName { * the name of the version to test */ final public static String VERSION = "Version"; - + /** * parameter name "Shell"<p> - * Path to a shell. + * Path to a shell. * This shell is used to run some commands outside of Java * example: /bin/tcsh c:\\myShell\\myShell.exe */ final public static String SHELL = "Shell"; /** * parameter name "Cygwin"<p> - * If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin + * If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin * environment */ final public static String CYGWIN = "Cygwin"; diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index 948fab207a13..14ed78f83b4f 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java index 199eb1c01451..bf5048e44331 100644 --- a/qadevOOo/runner/util/RegistryTools.java +++ b/qadevOOo/runner/util/RegistryTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ import com.sun.star.uno.Exception; public class RegistryTools { /** - * Creates 'com.sun.star.registry.SimpleRegistry' + * Creates 'com.sun.star.registry.SimpleRegistry' * service. * @param xMSF Multiservice factory. * @return Service created. @@ -55,7 +55,7 @@ public class RegistryTools { return (XSimpleRegistry) UnoRuntime.queryInterface ( XSimpleRegistry.class, oInterface) ; } - + /** * Opens registry file for reading/writing. If file doesn't * exist a new one created. @@ -64,13 +64,13 @@ public class RegistryTools { * @return Opened registry. */ public static XSimpleRegistry openRegistry - (String file, XMultiServiceFactory xMSF) + (String file, XMultiServiceFactory xMSF) throws com.sun.star.uno.Exception { - + XSimpleRegistry reg = createRegistryService(xMSF) ; - + reg.open(file, false, true) ; - + return reg ; } @@ -82,15 +82,15 @@ public class RegistryTools { */ public static boolean compareKeys (XRegistryKey key1, XRegistryKey key2) { - + if (key1 == null || key2 == null || !key1.isValid() || !key2.isValid()) - + return false ; - + String keyName1 = getShortKeyName(key1.getKeyName()) ; String keyName2 = getShortKeyName(key2.getKeyName()) ; - + if (!keyName1.equals(keyName2)) return false ; try { @@ -98,45 +98,45 @@ public class RegistryTools { } catch (InvalidRegistryException e) { return false ; } - + RegistryValueType type ; try { type = key1.getValueType() ; - + if (type.equals(RegistryValueType.ASCII)) { if (!key1.getAsciiValue().equals(key2.getAsciiValue())) return false ; - } else + } else if (type.equals(RegistryValueType.STRING)) { if (!key1.getStringValue().equals(key2.getStringValue())) return false ; - } else + } else if (type.equals(RegistryValueType.LONG)) { if (key1.getLongValue() != key2.getLongValue()) return false ; - } else + } else if (type.equals(RegistryValueType.BINARY)) { byte[] bin1 = key1.getBinaryValue() ; byte[] bin2 = key2.getBinaryValue() ; if (bin1.length != bin2.length) return false ; - for (int i = 0; i < bin1.length; i++) + for (int i = 0; i < bin1.length; i++) if (bin1[i] != bin2[i]) return false ; - } else + } else if (type.equals(RegistryValueType.ASCIILIST)) { String[] list1 = key1.getAsciiListValue() ; String[] list2 = key2.getAsciiListValue() ; if (list1.length != list2.length) return false ; - for (int i = 0; i < list1.length; i++) + for (int i = 0; i < list1.length; i++) if (!list1[i].equals(list2[i])) return false ; - } else + } else if (type.equals(RegistryValueType.STRINGLIST)) { String[] list1 = key1.getStringListValue() ; String[] list2 = key2.getStringListValue() ; if (list1.length != list2.length) return false ; - for (int i = 0; i < list1.length; i++) + for (int i = 0; i < list1.length; i++) if (!list1[i].equals(list2[i])) return false ; } else if (type.equals(RegistryValueType.LONGLIST)) { @@ -144,16 +144,16 @@ public class RegistryTools { int[] list2 = key2.getLongListValue() ; if (list1.length != list2.length) return false ; - for (int i = 0; i < list1.length; i++) + for (int i = 0; i < list1.length; i++) if (list1[i] != list2[i]) return false ; } } catch (Exception e) { return false ; } - + return true ; } - + /** * Gets name of the key relative to its parent. * For example if full name of key is '/key1/subkey' @@ -167,72 +167,72 @@ public class RegistryTools { if (idx < 0) return keyName ; else return keyName.substring(idx + 1) ; } - + /** * Compare all child keys. - * @param compareRoot If <code>true</code> method also + * @param compareRoot If <code>true</code> method also * compare root keys, if <code>false</code> it begins recursive * comparing from children of root keys. * @return <code>true</code> if keys and their sub keys are equal. */ protected static boolean compareKeyTrees (XRegistryKey tree1, XRegistryKey tree2, boolean compareRoot) { - + if (compareRoot && !compareKeys(tree1, tree2)) return false ; - + try { String[] keyNames1 = tree1.getKeyNames() ; String[] keyNames2 = tree2.getKeyNames() ; if (keyNames1 == null && keyNames2 == null) return true ; - + if (keyNames1 == null || keyNames2 == null || keyNames2.length != keyNames1.length) return false ; - + for (int i = 0; i < keyNames1.length; i++) { - + String keyName = getShortKeyName(keyNames1[i]) ; XRegistryKey key2 = tree2.openKey(keyName) ; - - if (key2 == null) + + if (key2 == null) // key with the same name doesn't exist in the second tree return false ; - + if (!tree1.getKeyType(keyName).equals( tree2.getKeyType(keyName))) return false ; - + if (tree1.getKeyType(keyName).equals( RegistryKeyType.LINK)) { - + if (!getShortKeyName(tree1.getLinkTarget(keyName)).equals( getShortKeyName(tree2.getLinkTarget(keyName)))) - + return false ; } else { - - if (compareKeyTrees(tree1.openKey(keyName), + + if (compareKeyTrees(tree1.openKey(keyName), tree2.openKey(keyName), true) == false) return false ; } } } catch (InvalidRegistryException e) { return false ; } - - return true ; + + return true ; } - + /** * Compare keys specified and all their child keys. * @return <code>true</code> if keys and their sub keys are equal. */ public static boolean compareKeyTrees (XRegistryKey tree1, XRegistryKey tree2) { - + return compareKeyTrees(tree1, tree2, false) ; } - + /** * Prints to a specified output about all keys and subkeys information * (key name, type, value, link target, attributes) recursively. @@ -258,7 +258,7 @@ public class RegistryTools { out.println("/(null)") ; return ; } - + out.println("/") ; try { printTreeInfo(root, out, " ") ; @@ -269,13 +269,13 @@ public class RegistryTools { } private static void printTreeInfo(XRegistryKey key, - PrintWriter out, String margin) + PrintWriter out, String margin) throws com.sun.star.registry.InvalidRegistryException { - + String[] subKeys = key.getKeyNames() ; - + if (subKeys == null || subKeys.length == 0) return ; - + for (int i = 0; i < subKeys.length; i++) { printKeyInfo(key, subKeys[i], out, margin) ; XRegistryKey subKey = key.openKey @@ -284,11 +284,11 @@ public class RegistryTools { subKey.closeKey() ; } } - - private static void printKeyInfo(XRegistryKey parentKey, - String keyName, PrintWriter out, String margin) + + private static void printKeyInfo(XRegistryKey parentKey, + String keyName, PrintWriter out, String margin) throws com.sun.star.registry.InvalidRegistryException { - + out.print(margin) ; keyName = getShortKeyName(keyName) ; XRegistryKey key = parentKey.openKey(keyName) ; @@ -298,59 +298,59 @@ public class RegistryTools { out.println("(null)") ; return ; } - + if (!key.isValid()) { out.println("(not valid)") ; return ; } - + if (key.isReadOnly()) { out.print("(read only) ") ; } - + if (parentKey.getKeyType(keyName) == RegistryKeyType.LINK) { out.println("(link to " + parentKey.getLinkTarget(keyName) + ")") ; return ; } - + RegistryValueType type ; try { type = key.getValueType() ; - + if (type.equals(RegistryValueType.ASCII)) { out.println("[ASCII] = '" + key.getAsciiValue() + "'") ; - } else + } else if (type.equals(RegistryValueType.STRING)) { out.println("[STRING] = '" + key.getStringValue() + "'") ; - } else + } else if (type.equals(RegistryValueType.LONG)) { out.println("[LONG] = " + key.getLongValue()) ; - } else + } else if (type.equals(RegistryValueType.BINARY)) { out.print("[BINARY] = {") ; byte[] bin = key.getBinaryValue() ; - for (int i = 0; i < bin.length; i++) + for (int i = 0; i < bin.length; i++) out.print("" + bin[i] + ",") ; out.println("}") ; - } else + } else if (type.equals(RegistryValueType.ASCIILIST)) { out.print("[ASCIILIST] = {") ; String[] list = key.getAsciiListValue() ; - for (int i = 0; i < list.length; i++) + for (int i = 0; i < list.length; i++) out.print("'" + list[i] + "',") ; out.println("}") ; - } else + } else if (type.equals(RegistryValueType.STRINGLIST)) { out.print("[STRINGLIST] = {") ; String[] list = key.getStringListValue() ; - for (int i = 0; i < list.length; i++) + for (int i = 0; i < list.length; i++) out.print("'" + list[i] + "',") ; out.println("}") ; } else if (type.equals(RegistryValueType.LONGLIST)) { out.print("[LONGLIST] = {") ; int[] list = key.getLongListValue() ; - for (int i = 0; i < list.length; i++) + for (int i = 0; i < list.length; i++) out.print("" + list[i] + ",") ; out.println("}") ; } else { @@ -363,8 +363,8 @@ public class RegistryTools { key.closeKey() ; } } - - -// public static void compareKeyTrees + + +// public static void compareKeyTrees } diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index 80493fdee058..a39c4d0be781 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index df9364a7d9a2..27cbabc80baa 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/StyleFamilyDsc.java b/qadevOOo/runner/util/StyleFamilyDsc.java index eed3835bfab4..923fbde70c88 100644 --- a/qadevOOo/runner/util/StyleFamilyDsc.java +++ b/qadevOOo/runner/util/StyleFamilyDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java index 110b7ea549d7..d037547fab2a 100644 --- a/qadevOOo/runner/util/SysUtils.java +++ b/qadevOOo/runner/util/SysUtils.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java index d933bc0cb041..bd00c51cb490 100644 --- a/qadevOOo/runner/util/TableDsc.java +++ b/qadevOOo/runner/util/TableDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,8 +85,8 @@ public class TableDsc extends InstDescr { XTextTable TT = (XTextTable)UnoRuntime.queryInterface( ifcClass, SrvObj ); - - if ( rows > 0 && columns > 0 ) { + + if ( rows > 0 && columns > 0 ) { TT.initialize( rows, columns ); } diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java index 3afcbbce5dd5..e25f54eed988 100644 --- a/qadevOOo/runner/util/TextSectionDsc.java +++ b/qadevOOo/runner/util/TextSectionDsc.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index c9562949632f..4edf4c6091b4 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ import util.AccessibilityTools; * This class supports some functions to handle easily accessible objects */ public class UITools { - + private static final AccessibilityTools mAT = new AccessibilityTools(); private final XAccessible mXRoot; private final XMultiServiceFactory mMSF; @@ -87,7 +87,7 @@ public class UITools { return mAT.getAccessibleObject(xWindow); } - + private static String getString(XInterface xInt) { XAccessibleText oText = (XAccessibleText) @@ -97,12 +97,12 @@ public class UITools { private static void setString(XInterface xInt, String cText) { - XAccessibleEditableText oText = (XAccessibleEditableText) + XAccessibleEditableText oText = (XAccessibleEditableText) UnoRuntime.queryInterface(XAccessibleEditableText.class, xInt); - + oText.setText(cText); } - + private static Object getValue(XInterface xInt) { XAccessibleValue oValue = (XAccessibleValue) @@ -118,7 +118,7 @@ public class UITools { /** * get the root element of the accessible tree * @return the root element - */ + */ public XAccessible getRoot() { return mXRoot; @@ -130,14 +130,14 @@ public class UITools { * @param stringToSet is the string to set * @throws java.lang.Exception if something fail */ - public void setTextEditFiledText(String textfiledName, String stringToSet) + public void setTextEditFiledText(String textfiledName, String stringToSet) throws java.lang.Exception { - XInterface oTextField = mAT.getAccessibleObjectForRole(mXRoot, + XInterface oTextField = mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.TEXT, textfiledName); setString(oTextField, stringToSet); } - + /** * returns the button by the given name * @param buttonName is name name of the button to get @@ -158,13 +158,13 @@ public class UITools { public void clickButton(String buttonName) throws java.lang.Exception { - + XAccessibleContext oButton =mAT.getAccessibleObjectForRole (mXRoot, AccessibleRole.PUSH_BUTTON, buttonName); if (oButton == null){ throw new Exception("Could not get button '" + buttonName + "'"); } - XAccessibleAction oAction = (XAccessibleAction) + XAccessibleAction oAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, oButton); // "click" the button @@ -176,7 +176,7 @@ public class UITools { } } - + /** * Helper method: gets button via accessibility and 'click' it @@ -192,15 +192,15 @@ public class UITools { if (oButton != null){ boolean isChecked = oButton.getAccessibleStateSet().contains(com.sun.star.accessibility.AccessibleStateType.CHECKED); - if((isChecked && !toBePressed) || (!isChecked && toBePressed)){ - XAccessibleAction oAction = (XAccessibleAction) + if((isChecked && !toBePressed) || (!isChecked && toBePressed)){ + XAccessibleAction oAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, oButton); try{ - // "click" the button + // "click" the button oAction.doAccessibleAction(0); return true; } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - System.out.println("Could not do accessible action with '" + System.out.println("Could not do accessible action with '" + buttonName + "'" + e.toString()); return false; } @@ -209,7 +209,7 @@ public class UITools { return true; } else{ System.out.println("Could not get button '" + buttonName + "'"); - return false; + return false; } } @@ -218,7 +218,7 @@ public class UITools { * @param buttonName The name of the button in the Accessibility tree * * @return true if the button could be set to deactivated - */ + */ public boolean deactivateToggleButton(String buttonName){ return clickToggleButton(buttonName, false); } @@ -228,27 +228,27 @@ public class UITools { * @param buttonName The name of the button in the Accessibility tree * * @return true if the button could be set to activated - */ + */ public boolean activateToggleButton(String buttonName){ return clickToggleButton(buttonName, true); } - + /** * returns the value of named radio button * @param buttonName the name of the button to get the value of * @throws java.lang.Exception if something fail * @return Integer */ - public Integer getRadioButtonValue(String buttonName) - throws java.lang.Exception + public Integer getRadioButtonValue(String buttonName) + throws java.lang.Exception { try { - XInterface xRB =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xRB =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.RADIO_BUTTON, buttonName); return (Integer) getValue(xRB); } catch (Exception e) { - throw new Exception("Could not get value from RadioButton '" + throw new Exception("Could not get value from RadioButton '" + buttonName + "' : " + e.toString()); } } @@ -258,27 +258,27 @@ public class UITools { * @param GraphicName the name of the graphic * @return XInterface * @throws java.lang.Exception if something fail - */ + */ public XInterface getGraphic(String GraphicName) throws java.lang.Exception { return mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.GRAPHIC, GraphicName); } - + /** * set a named radio button the a given value * @param buttonName the name of the button to set * @param iValue the value to set * @throws java.lang.Exception if something fail - */ - public void setRadioButtonValue(String buttonName, int iValue) - throws java.lang.Exception - { + */ + public void setRadioButtonValue(String buttonName, int iValue) + throws java.lang.Exception + { try { XInterface xRB =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.RADIO_BUTTON, buttonName); if(xRB == null) - System.out.println("AccessibleObjectForRole couldn't be found for " + buttonName); + System.out.println("AccessibleObjectForRole couldn't be found for " + buttonName); XAccessibleValue oValue = (XAccessibleValue) UnoRuntime.queryInterface(XAccessibleValue.class, xRB); if(oValue == null) @@ -286,13 +286,13 @@ public class UITools { oValue.setCurrentValue(new Integer(iValue)); } catch (Exception e) { e.printStackTrace(); - - throw new Exception("Could not set value to RadioButton '" + + throw new Exception("Could not set value to RadioButton '" + buttonName + "' : " + e.toString()); } - + } - + /** * select an item in nanmed listbox * @param ListBoxName the name of the listbox @@ -304,31 +304,31 @@ public class UITools { { try { XAccessibleContext xListBox = null; - - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } - XAccessible xListBoxAccess = (XAccessible) + XAccessible xListBoxAccess = (XAccessible) UnoRuntime.queryInterface(XAccessible.class, xListBox); - + // if a List is not pulled to be open all entries are not visiblle, therefore the - // boolean argument + // boolean argument XAccessibleContext xList =mAT.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); XAccessibleSelection xListSelect = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class, xList); - + xListSelect.selectAccessibleChild(nChildIndex); } catch (Exception e) { - throw new Exception("Could not select item '" +nChildIndex+ + throw new Exception("Could not select item '" +nChildIndex+ "' in listbox '" + ListBoxName + "' : " + e.toString()); } } - + /** * This method returns all entries as XInterface of a list box * @param ListBoxName the name of the listbox @@ -343,47 +343,47 @@ public class UITools { try { XAccessibleContext xListBox = null; XAccessibleContext xList = null; - - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } if (xListBox == null){ // get the list of TreeListBox - xList =mAT.getAccessibleObjectForRole(mXRoot, + xList =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.TREE, ListBoxName); - + // all other list boxes have a children of kind of LIST } else { - - XAccessible xListBoxAccess = (XAccessible) + + XAccessible xListBoxAccess = (XAccessible) UnoRuntime.queryInterface(XAccessible.class, xListBox); // if a List is not pulled to be open all entries are not visiblle, therefore the - // boolean argument + // boolean argument xList =mAT.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); } - + for (int i=0;i<xList.getAccessibleChildCount();i++) { try { XAccessible xChild = xList.getAccessibleChild(i); - XAccessibleContext xChildCont = + XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) + XInterface xChildInterface = (XInterface) UnoRuntime.queryInterface(XInterface.class, xChildCont); Items.add(xChildInterface); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - throw new Exception("Could not get child form list of '" + throw new Exception("Could not get child form list of '" + ListBoxName + "' : " + e.toString()); } } - + } catch (Exception e) { - throw new Exception("Could not get list of items from '" + throw new Exception("Could not get list of items from '" + ListBoxName + "' : " + e.toString()); } Object[]ret = new XInterface[Items.size()]; @@ -392,7 +392,7 @@ public class UITools { } return ret; } - + /** * Helper method: returns the entry manes of a List-Box * @param ListBoxName the name of the listbox @@ -407,47 +407,47 @@ public class UITools { try { XAccessibleContext xListBox = null; XAccessibleContext xList = null; - - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } if (xListBox == null){ // get the list of TreeListBox - xList =mAT.getAccessibleObjectForRole(mXRoot, + xList =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.TREE, ListBoxName); - + // all other list boxes have a children of kind of LIST } else { - - XAccessible xListBoxAccess = (XAccessible) + + XAccessible xListBoxAccess = (XAccessible) UnoRuntime.queryInterface(XAccessible.class, xListBox); // if a List is not pulled to be open all entries are not visiblle, therefore the - // boolean argument + // boolean argument xList =mAT.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); } - + for (int i=0;i<xList.getAccessibleChildCount();i++) { try { XAccessible xChild = xList.getAccessibleChild(i); - XAccessibleContext xChildCont = + XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) + XInterface xChildInterface = (XInterface) UnoRuntime.queryInterface(XInterface.class, xChildCont); Items.add(getString(xChildInterface)); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - throw new Exception("Could not get child form list of '" + throw new Exception("Could not get child form list of '" + ListBoxName + "' : " + e.toString()); } } - + } catch (Exception e) { - throw new Exception("Could not get list of items from '" + throw new Exception("Could not get list of items from '" + ListBoxName + "' : " + e.toString()); } String[]ret = new String[Items.size()]; @@ -465,14 +465,14 @@ public class UITools { try{ XInterface xNumericField =mAT.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); - //util.dbg.printInterfaces(xNumericField); - XAccessibleEditableText oValue = (XAccessibleEditableText) + //util.dbg.printInterfaces(xNumericField); + XAccessibleEditableText oValue = (XAccessibleEditableText) UnoRuntime.queryInterface( XAccessibleEditableText.class, xNumericField); setString(xNumericField, cValue); } catch (Exception e) { - throw new Exception("Could not set value '" + cValue + + throw new Exception("Could not set value '" + cValue + "' into NumericField '" + NumericFieldName + "' : " + e.toString()); } } @@ -490,13 +490,13 @@ public class UITools { XInterface xNumericField =mAT.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); return (String) getString(xNumericField); - + } catch (Exception e) { - throw new Exception("Could get value from NumericField '" + throw new Exception("Could get value from NumericField '" + NumericFieldName + "' : " + e.toString()); } } - + private String removeCharactersFromCurrencyString(String stringVal) throws java.lang.Exception { @@ -522,22 +522,22 @@ public class UITools { } } String currencyVal = stringVal.substring(beginIndex, endIndex); - - currencyVal = currencyVal.substring(0, currencyVal.length()-3) + + + currencyVal = currencyVal.substring(0, currencyVal.length()-3) + "#" + currencyVal.substring(currencyVal.length()-2); - + currencyVal = utils.replaceAll13(currencyVal, ",", ""); currencyVal = utils.replaceAll13(currencyVal, "\\.", ""); currencyVal = utils.replaceAll13(currencyVal, "#", "."); - + return currencyVal; } catch (Exception e) { - throw new Exception("Could get remove characters from currency string '" + throw new Exception("Could get remove characters from currency string '" + stringVal + "' : " + e.toString()); } - + } - + /** * returns the numeric value of a numeric filed. This is needed ie. for * fileds include the moneytary unit. @@ -553,15 +553,15 @@ public class UITools { String sValue = getNumericFieldValue(NumericFieldName); String sAmount = removeCharactersFromCurrencyString(sValue); retValue = retValue.valueOf(sAmount); - + return retValue; - + } catch (Exception e) { - throw new Exception("Could get numeric value from NumericField '" + throw new Exception("Could get numeric value from NumericField '" + NumericFieldName + "' : " + e.toString()); } } - + /** * returns the content of a TextBox @@ -574,33 +574,33 @@ public class UITools { { String TextFieldText = null; try{ - XAccessibleContext xTextField =mAT.getAccessibleObjectForRole(mXRoot, + XAccessibleContext xTextField =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.SCROLL_PANE, TextFieldName); - XAccessible xTextFieldAccess = (XAccessible) + XAccessible xTextFieldAccess = (XAccessible) UnoRuntime.queryInterface(XAccessible.class, xTextField); XAccessibleContext xFrame =mAT.getAccessibleObjectForRole( xTextFieldAccess, AccessibleRole.TEXT_FRAME); for (int i=0;i<xFrame.getAccessibleChildCount();i++) { try { XAccessible xChild = xFrame.getAccessibleChild(i); - XAccessibleContext xChildCont = + XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) + XInterface xChildInterface = (XInterface) UnoRuntime.queryInterface(XInterface.class, xChildCont); TextFieldText += (getString(xChildInterface)); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - throw new Exception("Could not get child fom TextFrame of '" + throw new Exception("Could not get child fom TextFrame of '" + TextFieldName + "' : " + e.toString()); } } return TextFieldText; } catch (Exception e) { - throw new Exception("Could not get content fom Textbox '" + throw new Exception("Could not get content fom Textbox '" + TextFieldName + "' : " + e.toString()); } } - + /** * set a value to a named check box * @param CheckBoxName the name of the check box @@ -616,18 +616,18 @@ public class UITools { throws java.lang.Exception { try { - XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.CHECK_BOX, CheckBoxName); - XAccessibleValue xCheckBoxValue = (XAccessibleValue) + XAccessibleValue xCheckBoxValue = (XAccessibleValue) UnoRuntime.queryInterface(XAccessibleValue.class, xCheckBox); xCheckBoxValue.setCurrentValue(Value); - + } catch (Exception e) { - throw new Exception("Could not set value to CheckBox '" + throw new Exception("Could not set value to CheckBox '" + CheckBoxName + "' : " + e.toString()); } } - + /** * returns the value of the named check box * @param CheckBoxName the name of the check box @@ -638,18 +638,18 @@ public class UITools { throws java.lang.Exception { try { - XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.CHECK_BOX, CheckBoxName); - XAccessibleValue xCheckBoxValue = (XAccessibleValue) + XAccessibleValue xCheckBoxValue = (XAccessibleValue) UnoRuntime.queryInterface(XAccessibleValue.class, xCheckBox); - + return (Integer) xCheckBoxValue.getCurrentValue(); } catch (Exception e) { - throw new Exception("Could not set value to CheckBox '" + throw new Exception("Could not set value to CheckBox '" + CheckBoxName + "' : " + e.toString()); } } - + /** * returns the message of a Basic-MessageBox * @return the message of a Basic-MessageBox @@ -660,14 +660,14 @@ public class UITools { { String cMessage = null; try{ - XAccessibleContext xMessage =mAT.getAccessibleObjectForRole(mXRoot, + XAccessibleContext xMessage =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.LABEL); - - XInterface xMessageInterface = (XInterface) + + XInterface xMessageInterface = (XInterface) UnoRuntime.queryInterface(XInterface.class, xMessage); cMessage += (getString(xMessageInterface)); - + return cMessage; } catch (Exception e) { throw new Exception("Could not get message from Basic-MessageBox: " + e.toString()); @@ -678,7 +678,7 @@ public class UITools { * fetch the window which is equal to the given <CODE>WindowName</CODE> * @return the named window * @throws java.lang.Exception if something fail - */ + */ public XWindow getTopWindow(String WindowName, boolean debug) throws java.lang.Exception { XInterface xToolKit = null; @@ -689,18 +689,18 @@ public class UITools { } XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(XExtendedToolkit.class, xToolKit); - + int count = tk.getTopWindowCount(); - + XTopWindow retWindow = null; - + if (debug) System.out.println("getTopWindow ->"); - + for (int i=0; i < count ; i++){ XTopWindow xTopWindow = tk.getTopWindow(i); XAccessible xAcc = mAT.getAccessibleObject(xTopWindow); String accName = xAcc.getAccessibleContext().getAccessibleName(); - + if (debug){ System.out.println("AccessibleName: " + accName); } @@ -711,30 +711,30 @@ public class UITools { } } - + if (debug) { if (retWindow == null) System.out.println("could not found window with name '" + WindowName + "'"); System.out.println("<- getTopWindow "); } return (XWindow) UnoRuntime.queryInterface(XWindow.class, retWindow); } - + public void clickMiddleOfAccessibleObject(short role, String name){ - + XAccessibleContext xAcc =mAT.getAccessibleObjectForRole(mXRoot, role, name); XAccessibleComponent aComp = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, xAcc); - - System.out.println(xAcc.getAccessibleRole() + "," + - xAcc.getAccessibleName() + "(" + - xAcc.getAccessibleDescription() + "):" + + + System.out.println(xAcc.getAccessibleRole() + "," + + xAcc.getAccessibleName() + "(" + + xAcc.getAccessibleDescription() + "):" + utils.getImplName(xAcc)); - + if (aComp != null) { Point location = aComp.getLocationOnScreen(); - String bounds = "(" + aComp.getBounds().X + "," + - aComp.getBounds().Y + ")" + " (" + - aComp.getBounds().Width + "," + + String bounds = "(" + aComp.getBounds().X + "," + + aComp.getBounds().Y + ")" + " (" + + aComp.getBounds().Width + "," + aComp.getBounds().Height + ")"; System.out.println("The boundary Rectangle is " + bounds); try { @@ -748,25 +748,25 @@ public class UITools { } catch (java.awt.AWTException e) { System.out.println("couldn't press mouse button"); } - + } } - + public void doubleClickMiddleOfAccessibleObject(short role, String name) { XAccessibleContext xAcc =mAT.getAccessibleObjectForRole(mXRoot, role, name); XAccessibleComponent aComp = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, xAcc); - - System.out.println(xAcc.getAccessibleRole() + "," + - xAcc.getAccessibleName() + "(" + - xAcc.getAccessibleDescription() + "):" + + + System.out.println(xAcc.getAccessibleRole() + "," + + xAcc.getAccessibleName() + "(" + + xAcc.getAccessibleDescription() + "):" + utils.getImplName(xAcc)); - + if (aComp != null) { Point location = aComp.getLocationOnScreen(); - String bounds = "(" + aComp.getBounds().X + "," + - aComp.getBounds().Y + ")" + " (" + - aComp.getBounds().Width + "," + + String bounds = "(" + aComp.getBounds().X + "," + + aComp.getBounds().Y + ")" + " (" + + aComp.getBounds().Width + "," + aComp.getBounds().Height + ")"; System.out.println("The boundary Rectangle is " + bounds); try { @@ -783,10 +783,10 @@ public class UITools { } catch (java.awt.AWTException e) { System.out.println("couldn't press mouse button"); } - + } } - + /** * <B>DEPRECATED</B> * Since <CODE>AccessibilityTools</CODE> handle parameter <CODE>debugIsActive</CODE> @@ -794,21 +794,21 @@ public class UITools { * @deprecated Since <CODE>AccessibilityTools</CODE> handle parameter <CODE>debugIsActive</CODE> * this function does not work anymore. * @param log logWriter - */ + */ public void printAccessibleTree(PrintWriter log) { mAT.printAccessibleTree(log, mXRoot); } - - + + /** * Prints the accessible tree to the <CODE>logWriter</CODE> only if <CODE>debugIsActive</CODE> * is set to <CODE>true</CODE> * @param log logWriter * @param debugIsActive prints only if this parameter is set to TRUE - */ + */ public void printAccessibleTree(PrintWriter log, boolean debugIsActive) { mAT.printAccessibleTree(log, mXRoot, debugIsActive); } - + } diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 8388b4c2222f..ae00eadb2e62 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class ValueChanger { public static Object changePValue( Object oldValue ) { Object newValue = null; - + if (oldValue instanceof com.sun.star.uno.Any) { try { oldValue = AnyConverter.toObject(((Any) oldValue).getType(),oldValue); @@ -714,7 +714,7 @@ public class ValueChanger { newVal.Name = ((PropertyValue)oldValue).Name; newVal.Value = changePValue(((PropertyValue)oldValue).Value); newValue = newVal; - } else + } else if (oldValue instanceof com.sun.star.sheet.ValidationAlertStyle){ com.sun.star.sheet.ValidationAlertStyle VAS1 = com.sun.star.sheet.ValidationAlertStyle.INFO; com.sun.star.sheet.ValidationAlertStyle VAS2 = com.sun.star.sheet.ValidationAlertStyle.MACRO; @@ -860,7 +860,7 @@ public class ValueChanger { } else { if ( oldPPC.Coordinates[0].length == 0 ) { newPPC.Coordinates = pArray; - newPPC.Flags = fArray; + newPPC.Flags = fArray; } else { newPPC.Coordinates[0][0].X = oldPPC.Coordinates[0][0].X +1; newPPC.Coordinates[0][0].Y = oldPPC.Coordinates[0][0].Y +1; diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java index dd9749119a8f..3efd835ad8af 100644 --- a/qadevOOo/runner/util/ValueComparer.java +++ b/qadevOOo/runner/util/ValueComparer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ public class ValueComparer { // Method to change a Value, thought for properties public static boolean equalValue( Object first, Object second ) { - + if (first instanceof com.sun.star.uno.Any) { try { first = AnyConverter.toObject(((Any) first).getType(),first); @@ -55,7 +55,7 @@ public class ValueComparer { second = AnyConverter.toObject(((Any) second).getType(),second); } catch (com.sun.star.lang.IllegalArgumentException iae) { } - } + } boolean eq = false; try { if ( (first==null) || (second == null) ) { @@ -85,11 +85,11 @@ public class ValueComparer { HashMap hm1 = new HashMap(); boolean result = true; int i = 0; - + for (i = 0; i < pv1.length; i++){ hm1.put(pv1[i].Name, pv1[i].Value); } - + i = 0; while (i < pv2.length && result) { result &= equalValue(hm1.get(pv2[i].Name),pv2[i].Value); @@ -97,12 +97,12 @@ public class ValueComparer { } return result; } - + static boolean compareArrays(Object op1, Object op2) throws Exception { if (op1 instanceof PropertyValue[] && op2 instanceof PropertyValue[]) { return compareArrayOfPropertyValue((PropertyValue[])op1,(PropertyValue[])op2); - } + } boolean result = true; if((op1.getClass().getComponentType() == op2.getClass().getComponentType()) && (Array.getLength(op1) == Array.getLength(op2))) @@ -137,7 +137,7 @@ public class ValueComparer { Object obj1 = fields[i].get(op1); Object obj2 = fields[i].get(op2); if (obj1 instanceof com.sun.star.uno.Any) { - try { + try { if (utils.isVoid(obj1)) { obj1 = null; } else { @@ -147,7 +147,7 @@ public class ValueComparer { } } if (obj2 instanceof com.sun.star.uno.Any) { - try { + try { if (utils.isVoid(obj2)) { obj2 = null; } else { @@ -155,8 +155,8 @@ public class ValueComparer { } } catch (com.sun.star.lang.IllegalArgumentException iae) { } - } - + } + result = result & compareObjects(obj1, obj2); } diff --git a/qadevOOo/runner/util/WaitUnreachable.java b/qadevOOo/runner/util/WaitUnreachable.java index f756c9fae648..b4593acce4a3 100644 --- a/qadevOOo/runner/util/WaitUnreachable.java +++ b/qadevOOo/runner/util/WaitUnreachable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index 33b5d4f61aab..b71b6bcf3c0a 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public class WriterTools { return WriterDoc; } // finish createTextDoc - public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, + public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, String url) { PropertyValue[] Args = new PropertyValue[0]; XTextDocument WriterDoc = loadTextDoc(xMSF, url, Args); @@ -63,7 +63,7 @@ public class WriterTools { return WriterDoc; } // finish createTextDoc - public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, + public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, String url, PropertyValue[] Args) { XComponent comp = DesktopTools.loadDoc(xMSF, url, Args); XTextDocument WriterDoc = (XTextDocument) UnoRuntime.queryInterface( @@ -86,9 +86,9 @@ public class WriterTools { return oDP; } - public static void insertTextGraphic(XTextDocument aDoc, - XMultiServiceFactory xMSF, int hpos, - int vpos, int width, int height, + public static void insertTextGraphic(XTextDocument aDoc, + XMultiServiceFactory xMSF, int hpos, + int vpos, int width, int height, String pic, String name) { try { Object oGObject = (XInterface) xMSF.createInstance( @@ -110,7 +110,7 @@ public class WriterTools { oProps.setPropertyValue("Width", new Integer(width)); oProps.setPropertyValue("Height", new Integer(height)); - XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class, oGObject); the_name.setName(name); } catch (Exception ex) { diff --git a/qadevOOo/runner/util/XInstCreator.java b/qadevOOo/runner/util/XInstCreator.java index 2f6ec3ecf272..f11f21f0285e 100644 --- a/qadevOOo/runner/util/XInstCreator.java +++ b/qadevOOo/runner/util/XInstCreator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java index e3a0ae3a1b23..663e33a4964f 100644 --- a/qadevOOo/runner/util/XLayerHandlerImpl.java +++ b/qadevOOo/runner/util/XLayerHandlerImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,88 +32,88 @@ public class XLayerHandlerImpl protected String ls = System.getProperty("line.separator"); public void addOrReplaceNode(String str, short param) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addOrReplace(" + str + "," + param + ");" + ls); } - public void addOrReplaceNodeFromTemplate(String str, - com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, + public void addOrReplaceNodeFromTemplate(String str, + com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, short param) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addOrReplaceNodeFromTemplate(" + str + "," + templateIdentifier + ");" + ls); } - public void addProperty(String str, short param, + public void addProperty(String str, short param, com.sun.star.uno.Type type) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addProperty(" + str + "," + param + "," + type + ");" + ls); } public void addPropertyWithValue(String str, short param, Object obj) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addPropertyWithValue(" + str + "," + param + "," + obj + ");" + ls); } public void dropNode(String str) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("dropNode(" + str + ");" + ls); } public void endLayer() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endLayer();" + ls); } public void endNode() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endNode();" + ls); } public void endProperty() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endProperty();" + ls); } public void overrideNode(String str, short param, boolean param2) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("overrideNode(" + str + "," + param + "," + param2 + ");" + ls); } - public void overrideProperty(String str, short param, + public void overrideProperty(String str, short param, com.sun.star.uno.Type type, boolean param3) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("overrideProperty(" + str + "," + param + "," + type + "," + param3 + ");" + ls); } public void setPropertyValue(Object obj) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("setPropertyValue(" + obj + ");" + ls); } public void setPropertyValueForLocale(Object obj, String str) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("setPropertyValueForLocale(" + obj + "," + str + ");" + ls); } public void startLayer() - throws com.sun.star.configuration.backend.MalformedDataException, - com.sun.star.lang.WrappedTargetException { + throws com.sun.star.configuration.backend.MalformedDataException, + com.sun.star.lang.WrappedTargetException { calls = "startLayer();" + ls; } public String getCalls() { return calls; - } + } }
\ No newline at end of file diff --git a/qadevOOo/runner/util/XLayerImpl.java b/qadevOOo/runner/util/XLayerImpl.java index 72dc2a2fa6aa..a1ccaa800ce6 100644 --- a/qadevOOo/runner/util/XLayerImpl.java +++ b/qadevOOo/runner/util/XLayerImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,18 +28,18 @@ package util; public class XLayerImpl implements com.sun.star.configuration.backend.XLayer { - + protected boolean wasCalled = false; - + public XLayerImpl() { } - + public void readData(com.sun.star.configuration.backend.XLayerHandler xLayerHandler) throws com.sun.star.lang.NullPointerException, com.sun.star.lang.WrappedTargetException, com.sun.star.configuration.backend.MalformedDataException { wasCalled = true; } - + public boolean hasBeenCalled() { return wasCalled; } - + } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index a744afe0a3f8..786067216938 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -280,7 +280,7 @@ public class XMLTools { this.printXMLData = printXMLData ; this.log = log_ ; } - + /** * Reset all values. This is important e.g. for test of XFilter * interface, where 'filter()' method istbstarted twice. @@ -754,7 +754,7 @@ public class XMLTools { if (!isWellFormed()) log.println("!!! Some errors were found in XML structure") ; - + boolean result = tags.size() == 0 && chars.size() == 0 && isWellFormed(); reset(); return result; diff --git a/qadevOOo/runner/util/XSchemaHandlerImpl.java b/qadevOOo/runner/util/XSchemaHandlerImpl.java index cac0754d9f20..df91acc8ffa9 100644 --- a/qadevOOo/runner/util/XSchemaHandlerImpl.java +++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,98 +31,98 @@ public class XSchemaHandlerImpl protected String calls = ""; protected String ls = System.getProperty("line.separator"); - public void addInstance(String str, + public void addInstance(String str, com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addInstance();" + ls); } public void addItemType(com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addItemType();" + ls); } - public void addProperty(String str, short param, + public void addProperty(String str, short param, com.sun.star.uno.Type type) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addProperty();" + ls); } public void addPropertyWithDefault(String str, short param, Object obj) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("addPropertyWithDefault();" + ls); } public void endComponent() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endComponent();" + ls); } public void endNode() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endNode();" + ls); } public void endSchema() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endSchema();" + ls); } public void endTemplate() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("endTemplate();" + ls); } public void importComponent(String str) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("importComponent();" + ls); } public void startComponent(String str) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startComponent();" + ls); } public void startGroup(String str, short param) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startGroup();" + ls); } - public void startGroupTemplate(com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, + public void startGroupTemplate(com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, short param) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startGroupTemplate();" + ls); } public void startSchema() - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startSchema();" + ls); } - public void startSet(String str, short param, + public void startSet(String str, short param, com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startSet();" + ls); } - public void startSetTemplate(com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, - short param, + public void startSetTemplate(com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier, + short param, com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier2) - throws com.sun.star.configuration.backend.MalformedDataException, + throws com.sun.star.configuration.backend.MalformedDataException, com.sun.star.lang.WrappedTargetException { calls += ("startSetTemplate();" + ls); } @@ -130,8 +130,8 @@ public class XSchemaHandlerImpl public String getCalls() { return calls; } - + public void cleanCalls() { calls = ""; - } + } }
\ No newline at end of file diff --git a/qadevOOo/runner/util/compare/DocComparator.java b/qadevOOo/runner/util/compare/DocComparator.java index 365850fa4839..5ffa024216bc 100644 --- a/qadevOOo/runner/util/compare/DocComparator.java +++ b/qadevOOo/runner/util/compare/DocComparator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ package util.compare; import java.io.IOException; /** - * + * * */ diff --git a/qadevOOo/runner/util/compare/DocComparatorFactory.java b/qadevOOo/runner/util/compare/DocComparatorFactory.java index 5f68606932c0..012bfcdf9388 100644 --- a/qadevOOo/runner/util/compare/DocComparatorFactory.java +++ b/qadevOOo/runner/util/compare/DocComparatorFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ public class DocComparatorFactory { throw new IllegalArgumentException("DocComparator for '" + s + "' not supported!"); } - + // unreachable: return null; } - + } diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 71109e984188..9e734992f26e 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class GraphicalComparator implements DocComparator { m_aArguments = new GraphicalTestArguments(aParams); } - + /** * @return an instance of this object, but only it's interface */ @@ -93,7 +93,7 @@ class GraphicalComparator implements DocComparator sNewSubDir = FileHelper.removeFirstDirectorysAndBasenameFrom(_sEntry, _sInputPath); } String sNameNoSuffix = FileHelper.getNameNoSuffix(FileHelper.getBasename(_sEntry)); - + // add the sub path to the difference path String sNewReferencePath; if (sNewSubDir.length() > 0) @@ -108,11 +108,11 @@ class GraphicalComparator implements DocComparator sNewReferencePath += fs + sNameNoSuffix + _sNewSuffix; return sNewReferencePath; } - + boolean isReferenceOrDiffExistent(String _sNewSuffix) { boolean isExistent = false; - + // LLA? What if sReferencePath is a directory, but directory is empty? is the result then true or false; // wir muessen durch den InputPath durch und dann fuer jedes Dokument prufen, ob im angegebenen ReferencePath eine Reference existiert. @@ -134,7 +134,7 @@ class GraphicalComparator implements DocComparator } else { - // sInputPath is a file + // sInputPath is a file String sNewReferencePath = createSpecialFile(sInputPath, "", m_aArguments.getReferencePath(), _sNewSuffix); if (FileHelper.exists(sNewReferencePath)) { @@ -143,7 +143,7 @@ class GraphicalComparator implements DocComparator } return isExistent; } - + /** * REFERENCE_PATH must set to directory/file, where the reference (*.prn files) (should) exist */ @@ -198,7 +198,7 @@ class GraphicalComparator implements DocComparator System.err.println(" Inputpath: '" + m_aArguments.getInputPath() + "'"); System.err.println(" Outputpath: '" + m_aArguments.getOutputPath() + "'"); System.err.println("Referencepath: '" + m_aArguments.getReferencePath() + "'"); - } + } return GraphicalDifferenceCheck.check(m_aArguments.getInputPath(), m_aArguments.getOutputPath(), m_aArguments.getReferencePath(), m_aArguments); } catch(ConvWatchException e) @@ -228,7 +228,7 @@ class GraphicalComparator implements DocComparator /** * INPUT_PATH must set, to directory/file, where the documents exist. * REFERENCE_PATH must set to directory/file, where the created references (*.prn files) exists. - * OUTPUT_PATH must set to a directory, where the whole ouptut will create. Here the diffReference will create. + * OUTPUT_PATH must set to a directory, where the whole ouptut will create. Here the diffReference will create. * At the momemt it's not possible to say only where the diffreferences will create. */ public void createDiffReference() throws IOException @@ -236,11 +236,11 @@ class GraphicalComparator implements DocComparator // this is the same like compareDiff(), but trash the result. compareDiff(); } - + /** * INPUT_PATH must set, to directory/file, where the documents exist. * REFERENCE_PATH must set to directory/file, where the created references (*.prn files) exists. - * OUTPUT_PATH must set to a directory, where the whole ouptut will create. + * OUTPUT_PATH must set to a directory, where the whole ouptut will create. * DIFF_PATH must set to a directory, where the older difference references exist, it's possible to set this to the same as REFERENCE_PATH * but this is not the default and will not automatically set. */ @@ -256,5 +256,5 @@ class GraphicalComparator implements DocComparator throw new java.io.IOException(e.getMessage()); } } - + } diff --git a/qadevOOo/runner/util/compare/PDFComparator.java b/qadevOOo/runner/util/compare/PDFComparator.java index fb49b0db40dd..2032a3346561 100644 --- a/qadevOOo/runner/util/compare/PDFComparator.java +++ b/qadevOOo/runner/util/compare/PDFComparator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ import util.compare.DocComparator; import lib.TestParameters; import util.compare.GraphicalComparator; -class PDFComparator extends GraphicalComparator implements DocComparator +class PDFComparator extends GraphicalComparator implements DocComparator { protected PDFComparator(TestParameters aParams) { @@ -47,16 +47,16 @@ class PDFComparator extends GraphicalComparator implements DocComparator // all in GraphicalComparator implemented. // public boolean isReferenceExistent() throws IOException; - // + // // public void createReference() throws IOException; - // + // // public boolean compare() throws IOException; - // - // + // + // // public boolean isDiffReferenceExistent() throws IOException; - // + // // public void createDiffReference() throws IOException; - // + // // public boolean compareDiff() throws IOException; } diff --git a/qadevOOo/runner/util/compare/XMLComparator.java b/qadevOOo/runner/util/compare/XMLComparator.java index 470dbaa3ada1..4b7293a212a5 100644 --- a/qadevOOo/runner/util/compare/XMLComparator.java +++ b/qadevOOo/runner/util/compare/XMLComparator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ package util.compare; /** * This Interface isn't ready yet. - * + * */ /* class XMLComparator implements DocComparator diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index 60c613edd854..8cfdac36b661 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -1,22 +1,22 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. - * + * * OpenOffice.org - a multi-platform office productivity suite - * + * * This file is part of OpenOffice.org. - * + * * OpenOffice.org is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. - * + * * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). - * + * * You should have received a copy of the GNU Lesser General Public License * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> diff --git a/qadevOOo/runner/util/db/DataSourceDescriptor.java b/qadevOOo/runner/util/db/DataSourceDescriptor.java index 9faeeb3f51e0..1d2b394087aa 100644 --- a/qadevOOo/runner/util/db/DataSourceDescriptor.java +++ b/qadevOOo/runner/util/db/DataSourceDescriptor.java @@ -1,22 +1,22 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. - * + * * OpenOffice.org - a multi-platform office productivity suite - * + * * This file is part of OpenOffice.org. - * + * * OpenOffice.org is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. - * + * * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). - * + * * You should have received a copy of the GNU Lesser General Public License * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java index 9022315fbfa4..85a570a4dc8b 100644 --- a/qadevOOo/runner/util/db/DatabaseDocument.java +++ b/qadevOOo/runner/util/db/DatabaseDocument.java @@ -1,22 +1,22 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. - * + * * OpenOffice.org - a multi-platform office productivity suite - * + * * This file is part of OpenOffice.org. - * + * * OpenOffice.org is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. - * + * * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). - * + * * You should have received a copy of the GNU Lesser General Public License * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java index 259500fe0c8f..18d360fcdd76 100644 --- a/qadevOOo/runner/util/dbg.java +++ b/qadevOOo/runner/util/dbg.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public class dbg { * @param extendedInfo Should extended information be printed? * @see com.sun.star.uno.XInterface */ - public static void printInterfaces(XInterface xTarget, + public static void printInterfaces(XInterface xTarget, boolean extendedInfo){ Type[] types = getInterfaceTypes(xTarget); if( null != types ) { @@ -92,13 +92,13 @@ public class dbg { types = xTypeProvider.getTypes(); return types; } - + /** - * Returns true if a specified target implements the interface with the + * Returns true if a specified target implements the interface with the * given name. Note that the comparison is not case sensitive. * @param xTarget The implementation which should be analysed. - * @param ifcName The name of the interface that is tested. The name can - * be full qualified, such as 'com.sun.star.io.XInputStream', or only + * @param ifcName The name of the interface that is tested. The name can + * be full qualified, such as 'com.sun.star.io.XInputStream', or only * consist of the interface name, such as 'XText'. * @return True, if xTarget implements the interface named ifcType * @see com.sun.star.uno.XInterface @@ -116,7 +116,7 @@ public class dbg { } return false; } - + /** * Prints information about an interface type. * @@ -128,7 +128,7 @@ public class dbg { Class zClass = aType.getZClass(); Method[] methods = zClass.getDeclaredMethods(); for (int i=0; i<methods.length; i++) { - System.out.println("\t" + methods[i].getReturnType().getName() + System.out.println("\t" + methods[i].getReturnType().getName() + " " + methods[i].getName() + "()"); } } @@ -152,8 +152,8 @@ public class dbg { /** * Print all information about the property <code>name</code> from * the property set <code>PS</code> to standard out. - * @param PS The property set which should contain a property called - * <code>name</code>. + * @param PS The property set which should contain a property called + * <code>name</code>. * @param name The name of the property. * @see com.sun.star.beans.XPropertySet */ @@ -164,13 +164,13 @@ public class dbg { /** * Print all information about the property <code>name</code> from * the property set <code>PS</code> to a print writer. - * @param PS The property set which should contain a property called - * <code>name</code>. + * @param PS The property set which should contain a property called + * <code>name</code>. * @param name The name of the property. * @param out The print writer which is used as output. * @see com.sun.star.beans.XPropertySet */ - public static void printPropertyInfo(XPropertySet PS, String name, + public static void printPropertyInfo(XPropertySet PS, String name, PrintWriter out) { try { XPropertySetInfo PSI = PS.getPropertySetInfo(); @@ -179,7 +179,7 @@ public class dbg { out.println("Property name is " + prop.Name); out.println("Property handle is " + prop.Handle); out.println("Property type is " + prop.Type.getTypeName()); - out.println("Property current value is " + + out.println("Property current value is " + PS.getPropertyValue(name)); out.println("Attributes :"); short attr = prop.Attributes; @@ -219,13 +219,13 @@ public class dbg { * @param ps The property which should displayed * @see com.sun.star.beans.PropertyValue */ - + public static void printProperyValueSequenzePairs(PropertyValue[] ps){ for( int i = 0; i < ps.length; i++){ printProperyValuePairs(ps[i], new PrintWriter(System.out)); } } - + /** * Print the names and the values of a sequenze of <code>PropertyValue</code> * to a print writer. @@ -238,7 +238,7 @@ public class dbg { printProperyValuePairs(ps[i], out); } } - + /** * Print the name and the value of a <code>PropertyValue</code> to to standard out. * @param ps The property which should displayed @@ -255,7 +255,7 @@ public class dbg { * @see com.sun.star.beans.PropertyValue */ public static void printProperyValuePairs(PropertyValue ps, PrintWriter out){ - + if (ps.Value instanceof String[] ){ String[] values = (String[]) ps.Value; String oneValue = "value is an empty String[]"; @@ -271,19 +271,19 @@ public class dbg { out.println(" Name: '" + ps.Name + "' contains String[]:"); out.println(oneValue); out.println("--------"); - + } else if (ps.Value instanceof PropertyValue){ out.println("--------"); out.println(" Name: '" + ps.Name + "' contains PropertyValue:"); printProperyValuePairs((PropertyValue)ps.Value, out); out.println("--------"); - + } else if (ps.Value instanceof PropertyValue[]){ out.println("--------"); out.println(" Name: '" + ps.Name + "' contains PropertyValue[]:"); printProperyValueSequenzePairs((PropertyValue[])ps.Value, out); out.println("--------"); - + } else { out.println("Name: '" + ps.Name + "' Value: '" + ps.Value.toString() + "'"); } @@ -302,7 +302,7 @@ public class dbg { } /** - * Print the supported services of a UNO object. + * Print the supported services of a UNO object. * @param aObject A UNO object. */ public static void getSuppServices (Object aObject) { diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index 3f882f10fafb..90aecd63d1a8 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -294,7 +294,7 @@ public class utils { * returns the value of the given setting name. For Example the setting name "Temp" * "Temp" returns the temp folder of the office instance. * @param msf a XMultiServiceFactory - * @param setting the name of the setting the value should be returned. + * @param setting the name of the setting the value should be returned. * For example "Temp" reutrns the temp folder of the current office instance. * @see com.sun.star.util.PathSettings * @return the value as String @@ -713,7 +713,7 @@ public class utils { } /** returns the path to the office binary folder - * + * * @param msf The XMultiSeriveFactory * @return the path to the office binrary or an empty string on any error */ @@ -728,7 +728,7 @@ public class utils { } /** - * Get an array of all property names from the property set. With the include + * Get an array of all property names from the property set. With the include * and exclude parameters the properties can be filtered. <br> * Set excludePropertyAttribute = 0 and includePropertyAttribute = 0 * to include all and exclude none. @@ -1001,7 +1001,7 @@ public class utils { /** returns a String which contains the current date and time<br> * format: [DD.MM.YYYY - HH:MM:SS::mm] - * + * ** @return a String which contains the current date and time */ public static String getDateTime() { diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java index d32f6a9b7451..2a82fe768bdc 100644 --- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java +++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,12 +76,12 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, return __implName; } - public com.sun.star.configuration.backend.XLayer getLayer(String str, + public com.sun.star.configuration.backend.XLayer getLayer(String str, String str1) - throws com.sun.star.configuration.backend.BackendAccessException, + throws com.sun.star.configuration.backend.BackendAccessException, com.sun.star.lang.IllegalArgumentException { if (aLayer == null) { - System.out.println("JavaSystemBackend::getLayer() called for " + + System.out.println("JavaSystemBackend::getLayer() called for " + str); aLayer = new CommonLayer(); } @@ -123,8 +123,8 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, } public com.sun.star.configuration.backend.XUpdatableLayer getUpdatableLayer(String str) - throws com.sun.star.configuration.backend.BackendAccessException, - com.sun.star.lang.NoSupportException, + throws com.sun.star.configuration.backend.BackendAccessException, + com.sun.star.lang.NoSupportException, com.sun.star.lang.IllegalArgumentException { throw new com.sun.star.lang.NoSupportException( "Cannot write to test backend", this); @@ -156,8 +156,8 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, * @param regKey the registryKey * @see com.sun.star.comp.loader.JavaLoader */ - public static XSingleServiceFactory __getServiceFactory(String implName, - XMultiServiceFactory multiFactory, + public static XSingleServiceFactory __getServiceFactory(String implName, + XMultiServiceFactory multiFactory, XRegistryKey regKey) { XSingleServiceFactory xSingleServiceFactory = null; @@ -165,8 +165,8 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, if (implName.equals(JavaSystemBackend.class.getName())) { xSingleServiceFactory = FactoryHelper.getServiceFactory( - JavaSystemBackend.class, - __serviceName, multiFactory, + JavaSystemBackend.class, + __serviceName, multiFactory, regKey); } @@ -182,13 +182,13 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, * @see com.sun.star.comp.loader.JavaLoader */ public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - boolean success = FactoryHelper.writeRegistryServiceInfo(__implName, - __serviceName, + boolean success = FactoryHelper.writeRegistryServiceInfo(__implName, + __serviceName, regKey); if (success) { try { - String keyName = "/" + __implName + + String keyName = "/" + __implName + "/DATA/SupportedComponents"; XRegistryKey newKey = regKey.createKey(keyName); @@ -215,8 +215,8 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, protected class CommonLayer implements XLayer, XTimeStamped { public void readData(XLayerHandler xLayerHandler) - throws com.sun.star.lang.NullPointerException, - com.sun.star.lang.WrappedTargetException, + throws com.sun.star.lang.NullPointerException, + com.sun.star.lang.WrappedTargetException, com.sun.star.configuration.backend.MalformedDataException { System.out.println("CommonLayer is read"); @@ -229,7 +229,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, try { xLayerContentDescriber = (XLayerContentDescriber) UnoRuntime.queryInterface( - XLayerContentDescriber.class, + XLayerContentDescriber.class, msf.createInstance( "com.sun.star.comp.configuration.backend.LayerDescriber")); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java index 0446447456c8..4979f3c00c60 100644 --- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java +++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java index daed6c74094a..2227c21d6651 100644 --- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java +++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index bf05553bcb6d..4c4bf76610d1 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -2,7 +2,7 @@ * ************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,9 +79,9 @@ public class CheckModuleAPI extends ComplexTestCase /** * Initialize the test environment. * This method checks for all neccesarry parameter and exit if not all parameter are set. - * - * Further this method starts an office instance and gets the office some more time to start. This is because - * some freshly installed offices don not have such a user tree. The office will create it on its first start, + * + * Further this method starts an office instance and gets the office some more time to start. This is because + * some freshly installed offices don not have such a user tree. The office will create it on its first start, * but this will take some time. * Note: This funktionality is only reasonable with parameter <CODE>-noOffice true</CODE> */ @@ -417,9 +417,9 @@ public class CheckModuleAPI extends ComplexTestCase } /** - Some modules contains more the one project. This methods translates given project paramater to the + Some modules contains more the one project. This methods translates given project paramater to the * correspind module name. - * + * * fwk -> framework * fwl -> framework * sch -> chart2 @@ -531,8 +531,8 @@ public class CheckModuleAPI extends ComplexTestCase /** * This function generates a list of modules to test and call <CODE>checkModule</CODE> for every module. * <p> - * - * @param module names to test. This could be + * + * @param module names to test. This could be * <ul> * <li>a comma separated list of modules like 'sw,sc,sd'</li> * <li>'all' to test all modules </li> @@ -547,7 +547,7 @@ public class CheckModuleAPI extends ComplexTestCase DescEntry entry = null; module = module.trim(); - /* + /* all: check all modules which contains a qa/unoapi folder auto: check all modules which contains a qa/unoapi folder except the module is not added */ diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java index f4f302114c9d..0fe7c890e378 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java index f9ef9e52c1e6..8518931c03c2 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java index c5e302451c21..958d703047dd 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ public class _XAccessibleComponent extends MultiMethodTest { int curX = 0; //while (!oObj.containsPoint(new Point(curX, bounds.Y)) && curX < bounds.Width+bounds.X) { - while (!oObj.containsPoint(new Point(curX, 0)) && + while (!oObj.containsPoint(new Point(curX, 0)) && (curX < bounds.Width)) { curX++; } @@ -93,7 +93,7 @@ public class _XAccessibleComponent extends MultiMethodTest { //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) { if (curX < bounds.Width) { - log.println("Upper bound of box containsPoint point (" + curX + + log.println("Upper bound of box containsPoint point (" + curX + ",0) - OK"); } else { log.println( @@ -104,9 +104,9 @@ public class _XAccessibleComponent extends MultiMethodTest { curX = 0; //while (!oObj.containsPoint(new Point(curX, bounds.Y+bounds.Height - 1)) - while (!oObj.containsPoint(new Point(curX, bounds.Height - 1)) && + while (!oObj.containsPoint(new Point(curX, bounds.Height - 1)) && (curX < bounds.Width)) { - log.println("containsPoint returns false for (" + curX + "," + + log.println("containsPoint returns false for (" + curX + "," + bounds.Height + ")"); curX++; } @@ -115,7 +115,7 @@ public class _XAccessibleComponent extends MultiMethodTest { //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) { if (curX < bounds.Width) { - log.println("Lower bound of box containsPoint point (" + curX + + log.println("Lower bound of box containsPoint point (" + curX + "," + (bounds.Height - 1) + ") - OK"); } else { log.println( @@ -126,7 +126,7 @@ public class _XAccessibleComponent extends MultiMethodTest { int curY = 0; //while (!oObj.containsPoint(new Point(bounds.X, curY)) && curY < bounds.Height+bounds.Y) { - while (!oObj.containsPoint(new Point(0, curY)) && + while (!oObj.containsPoint(new Point(0, curY)) && (curY < bounds.Height)) { curY++; } @@ -135,7 +135,7 @@ public class _XAccessibleComponent extends MultiMethodTest { //if ((bounds.Y <= curY) && (curY < bounds.Height+bounds.Y)) { if (curY < bounds.Height) { - log.println("Left bound of box containsPoint point (0," + curY + + log.println("Left bound of box containsPoint point (0," + curY + ") - OK"); } else { log.println( @@ -147,7 +147,7 @@ public class _XAccessibleComponent extends MultiMethodTest { //while (!oObj.containsPoint(new Point(bounds.X+bounds.Width - 1, curY)) // && curY < bounds.Height+bounds.Y) { - while (!oObj.containsPoint(new Point(bounds.Width - 1, curY)) && + while (!oObj.containsPoint(new Point(bounds.Width - 1, curY)) && (curY < bounds.Height)) { curY++; } @@ -156,7 +156,7 @@ public class _XAccessibleComponent extends MultiMethodTest { //if ((bounds.Y <= curY) && (curY < bounds.Height + bounds.Y)) { if (curY < bounds.Height) { - log.println("Right bound of box containsPoint point (" + + log.println("Right bound of box containsPoint point (" + (bounds.Width - 1) + "," + curY + ") - OK"); } else { log.println( @@ -185,7 +185,7 @@ public class _XAccessibleComponent extends MultiMethodTest { } if (locRes) { - log.println("Outer upper and lower bounds contain no component " + + log.println("Outer upper and lower bounds contain no component " + "points - OK"); } else { result = false; @@ -211,7 +211,7 @@ public class _XAccessibleComponent extends MultiMethodTest { } if (locRes) { - log.println("Outer left and right bounds contain no component " + + log.println("Outer left and right bounds contain no component " + "points - OK"); } else { result = false; @@ -244,20 +244,20 @@ public class _XAccessibleComponent extends MultiMethodTest { continue; } - log.println("Checking child with bounds " + "(" + chBnd.X + - "," + chBnd.Y + "),(" + chBnd.Width + "," + - chBnd.Height + "): " + + log.println("Checking child with bounds " + "(" + chBnd.X + + "," + chBnd.Y + "),(" + chBnd.Width + "," + + chBnd.Height + "): " + util.AccessibilityTools.accessibleToString( children[i])); XAccessibleContext xAc = (XAccessibleContext) UnoRuntime.queryInterface( - XAccessibleContext.class, + XAccessibleContext.class, children[i]); boolean MightBeCovered = false; boolean isShowing = xAc.getAccessibleStateSet() .contains(com.sun.star.accessibility.AccessibleStateType.SHOWING); - log.println("\tStateType containsPoint SHOWING: " + + log.println("\tStateType containsPoint SHOWING: " + isShowing); if (!isShowing) { @@ -271,7 +271,7 @@ public class _XAccessibleComponent extends MultiMethodTest { int curX = chBnd.Width / 2; int curY = chBnd.Height / 2; - while (!children[i].containsPoint(new Point(curX, curY)) && + while (!children[i].containsPoint(new Point(curX, curY)) && (curX > 0) && (curY > 0)) { curX--; curY--; @@ -287,23 +287,23 @@ public class _XAccessibleComponent extends MultiMethodTest { // trying the point laying on child XAccessible xAcc = oObj.getAccessibleAtPoint( - new Point(chBnd.X + curX, + new Point(chBnd.X + curX, chBnd.Y + curY)); - + Point p = new Point(chBnd.X + curX,chBnd.X + curX); - + if (isCovered(p) && isShowing) { log.println( "Child might be covered by another and can't be reached"); MightBeCovered = true; } - + KnownBounds.add(chBnd); if (xAcc == null) { - log.println("The child not found at point (" + - (chBnd.X + curX) + "," + (chBnd.Y + curY) + + log.println("The child not found at point (" + + (chBnd.X + curX) + "," + (chBnd.Y + curY) + ") - FAILED"); if (isShowing) { @@ -313,12 +313,12 @@ public class _XAccessibleComponent extends MultiMethodTest { } } else { XAccessible xAccCh = (XAccessible) UnoRuntime.queryInterface( - XAccessible.class, + XAccessible.class, children[i]); XAccessibleContext xAccC = (XAccessibleContext) UnoRuntime.queryInterface( - XAccessibleContext.class, + XAccessibleContext.class, children[i]); - log.println("Child found at point (" + (chBnd.X + curX) + + log.println("Child found at point (" + (chBnd.X + curX) + "," + (chBnd.Y + curY) + ") - OK"); boolean res = false; @@ -353,24 +353,24 @@ public class _XAccessibleComponent extends MultiMethodTest { log.print("is hidden behind the found Child "); log.println(xAcc.getAccessibleContext() .getAccessibleName() + " - OK"); - } else { + } else { log.println( "The children found is not the same"); log.println("Expected: " + expName); log.println("Description: " + expDesc); - log.println("Found: " + + log.println("Found: " + xAcc.getAccessibleContext() .getAccessibleName()); - log.println("Description: " + + log.println("Description: " + xAcc.getAccessibleContext() .getAccessibleDescription()); if (MightBeCovered) { log.println("... Child is covered by another - OK"); - } else { + } else { log.println("... FAILED"); result = false; } - + } } } @@ -381,26 +381,26 @@ public class _XAccessibleComponent extends MultiMethodTest { new Point(chBnd.X - 1, chBnd.Y - 1)); if (xAcc == null) { - log.println("No children found at point (" + - (chBnd.X - 1) + "," + (chBnd.Y - 1) + + log.println("No children found at point (" + + (chBnd.X - 1) + "," + (chBnd.Y - 1) + ") - OK"); result &= true; } else { XAccessible xAccCh = (XAccessible) UnoRuntime.queryInterface( - XAccessible.class, + XAccessible.class, children[i]); boolean res = util.AccessibilityTools.equals(xAccCh, xAcc); if (res) { - log.println("The same child found outside " + - "its bounds at (" + (chBnd.X - 1) + "," + + log.println("The same child found outside " + + "its bounds at (" + (chBnd.X - 1) + "," + (chBnd.Y - 1) + ") - FAILED"); result = false; } } } } else { - log.println("There are no children supporting " + + log.println("There are no children supporting " + "XAccessibleComponent"); } @@ -419,9 +419,9 @@ public class _XAccessibleComponent extends MultiMethodTest { bounds = oObj.getBounds(); result &= ((bounds != null) && (bounds.X >= 0) && (bounds.Y >= 0) && (bounds.Width > 0) && (bounds.Height > 0)); - log.println("Bounds = " + - ((bounds != null) - ? ("(" + bounds.X + "," + bounds.Y + "),(" + + log.println("Bounds = " + + ((bounds != null) + ? ("(" + bounds.X + "," + bounds.Y + "),(" + bounds.Width + "," + bounds.Height + ")") : "null")); tRes.tested("getBounds()", result); @@ -474,7 +474,7 @@ public class _XAccessibleComponent extends MultiMethodTest { if (parent != null) { Point parLoc = parent.getLocationOnScreen(); - log.println("Parent location is (" + parLoc.X + "," + parLoc.Y + + log.println("Parent location is (" + parLoc.X + "," + parLoc.Y + ")"); result &= ((parLoc.X + bounds.X) == loc.X); @@ -550,7 +550,7 @@ public class _XAccessibleComponent extends MultiMethodTest { XAccessible child = xAccCon.getAccessibleChild(i); XAccessibleContext xAccConCh = child.getAccessibleContext(); XAccessibleComponent xChAccComp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, xAccConCh); if (xChAccComp != null) { @@ -592,7 +592,7 @@ public class _XAccessibleComponent extends MultiMethodTest { XAccessibleContext xAccConPar = xAccPar.getAccessibleContext(); XAccessibleComponent parent = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, xAccConPar); if (parent == null) { @@ -631,9 +631,9 @@ public class _XAccessibleComponent extends MultiMethodTest { disposeEnvironment(); } } - + private boolean isCovered(Point p) { - int elements = KnownBounds.size(); + int elements = KnownBounds.size(); boolean Covered = false; for (int k=0;k<elements;k++) { Rectangle known = (Rectangle) KnownBounds.get(k); @@ -641,11 +641,11 @@ public class _XAccessibleComponent extends MultiMethodTest { Covered &= (known.Y < p.Y); Covered &= (p.Y < known.Y+known.Height); Covered &= (p.X < known.X+known.Width); - + if (Covered) { break; } - } + } return Covered; } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java index 47b24a337f2c..a71e8da71b44 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public class _XAccessibleContext extends MultiMethodTest { requiredMethod("getAccessibleChildCount()"); log.println("testing 'getAccessibleChild()'..."); - + boolean bOK = true; int counter = childCount; @@ -106,72 +106,72 @@ public class _XAccessibleContext extends MultiMethodTest { XAccessible ch = oObj.getAccessibleChild(i); XAccessibleContext chAC = ch.getAccessibleContext(); - log.println("## Child " + i + ": " + + log.println("## Child " + i + ": " + chAC.getAccessibleDescription()); if (!AccessibilityTools.equals(chAC.getAccessibleParent() - .getAccessibleContext(), + .getAccessibleContext(), oObj)) { - log.println("The parent of child and component " + + log.println("The parent of child and component " + "itself differ."); log.println("\tRole:"); - log.println("Getting: " + + log.println("Getting: " + chAC.getAccessibleParent() .getAccessibleContext() .getAccessibleRole()); log.println("Expected: " + oObj.getAccessibleRole()); log.println("\tImplementationName:"); - log.println("Getting: " + + log.println("Getting: " + util.utils.getImplName( chAC.getAccessibleParent() .getAccessibleContext())); log.println("Expected: " + util.utils.getImplName(oObj)); log.println("\tAccessibleDescription:"); - log.println("Getting(Description): " + + log.println("Getting(Description): " + chAC.getAccessibleParent() .getAccessibleContext() .getAccessibleDescription()); - log.println("Expected(Description): " + + log.println("Expected(Description): " + oObj.getAccessibleDescription()); log.println("\tAccessibleName:"); - log.println("Getting(Name): " + + log.println("Getting(Name): " + chAC.getAccessibleParent() .getAccessibleContext() .getAccessibleName()); - log.println("Expected(Name): " + + log.println("Expected(Name): " + oObj.getAccessibleName()); log.println("\tChildCount:"); - log.println("Getting: " + + log.println("Getting: " + chAC.getAccessibleParent() .getAccessibleContext() .getAccessibleChildCount()); - log.println("Expected: " + + log.println("Expected: " + oObj.getAccessibleChildCount()); log.println("\tParentName:"); - log.println("Getting (Name): " + + log.println("Getting (Name): " + chAC.getAccessibleParent() .getAccessibleContext() .getAccessibleParent() .getAccessibleContext() .getAccessibleName()); - log.println("Expected(Name): " + + log.println("Expected(Name): " + oObj.getAccessibleParent() .getAccessibleContext() .getAccessibleName()); - + log.println("##"); bOK = false; } else { log.println("Role: " + chAC.getAccessibleRole()); log.println("Name: " + chAC.getAccessibleName()); - log.println("IndexInParent: " + + log.println("IndexInParent: " + chAC.getAccessibleIndexInParent()); - log.println("ImplementationName: " + + log.println("ImplementationName: " + util.utils.getImplName(chAC)); } } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -222,7 +222,7 @@ public class _XAccessibleContext extends MultiMethodTest { } else { bOK &= AccessibilityTools.equals(parentAC.getAccessibleChild( idx) - .getAccessibleContext(), + .getAccessibleContext(), oObj); } @@ -230,7 +230,7 @@ public class _XAccessibleContext extends MultiMethodTest { log.println("Expected: " + util.utils.getImplName(oObj)); if (parentAC.getAccessibleChild(idx) != null) { - log.println("Getting: " + + log.println("Getting: " + util.utils.getImplName( parentAC.getAccessibleChild(idx) .getAccessibleContext())); @@ -326,12 +326,12 @@ public class _XAccessibleContext extends MultiMethodTest { e.printStackTrace(log); } - tRes.tested("getLocale()", + tRes.tested("getLocale()", (loc != null) && (loc.Language.length() > 0)); } - protected boolean checkStates(String[] expectedStateNames, - short[] expectedStates, + protected boolean checkStates(String[] expectedStateNames, + short[] expectedStates, XAccessibleStateSet set) { boolean works = true; @@ -339,11 +339,11 @@ public class _XAccessibleContext extends MultiMethodTest { boolean contains = set.contains(expectedStates[k]); if (contains) { - log.println("Set contains " + expectedStateNames[k] + + log.println("Set contains " + expectedStateNames[k] + " ... OK"); works &= true; } else { - log.println("Set doesn't contain " + expectedStateNames[k] + + log.println("Set doesn't contain " + expectedStateNames[k] + " ... FAILED"); works &= false; } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java index eac528b41121..2d3162adbc2f 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java index c1cb7302efce..cee6b4c36369 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,11 +81,11 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { if (old instanceof com.sun.star.accessibility.XAccessible) { System.out.println("Old: "+((XAccessible)old).getAccessibleContext().getAccessibleName()); } - + Object nev=ev.NewValue; if (nev instanceof com.sun.star.accessibility.XAccessible) { System.out.println("New: "+((XAccessible)nev).getAccessibleContext().getAccessibleName()); - } + } notifiedEvent = ev; } @@ -109,7 +109,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { } EventProducer prod = null ; - EvListener list = new EvListener(); + EvListener list = new EvListener(); /** * Adds two listeners and fires event by mean of object relation. <p> @@ -117,19 +117,19 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { */ public void _addEventListener() { log.println("adding listener"); - oObj.addEventListener(list); + oObj.addEventListener(list); boolean isTransient = chkTransient(tEnv.getTestObject()); log.println("fire event"); prod.fireEvent() ; - try { + try { Thread.sleep(3000); } catch (InterruptedException ex) { - } - + } + boolean works = true; - + if (list.notifiedEvent == null) { if (!isTransient) { log.println("listener wasn't called"); @@ -137,12 +137,12 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { } else { log.println("Object is Transient, listener isn't expected to be called"); } - oObj.removeEventListener(list); + oObj.removeEventListener(list); } - + if (EventMsg != null) { log.println(EventMsg); - tRes.tested("addEventListener()", Status.skipped(true) ); + tRes.tested("addEventListener()", Status.skipped(true) ); return; } @@ -163,7 +163,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { public void _removeEventListener() { requiredMethod("addEventListener()"); - list.notifiedEvent = null; + list.notifiedEvent = null; log.println("remove listener"); oObj.removeEventListener(list); @@ -183,11 +183,11 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { tRes.tested("removeEventListener()", list.notifiedEvent == null); - } - + } + protected static boolean chkTransient(Object Testcase) { boolean ret = false; - XAccessibleContext accCon = (XAccessibleContext) + XAccessibleContext accCon = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class,Testcase); if (accCon.getAccessibleStateSet().contains( com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){ @@ -196,17 +196,17 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { throw new lib.StatusException(lib.Status.failed("Parent doesn't manage descendents")); } ret=true; - } + } return ret; - } - + } + /** * Forces environment recreation. */ protected void after() { if (destroy) disposeEnvironment(); } - - + + } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java index 422cfa96e334..a0bc677a42c9 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java index 7a4dfafff615..cc9b1dc3fc85 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java index e575e332845b..199cc62a7f27 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -221,7 +221,7 @@ public class _XAccessibleSelection extends MultiMethodTest { oObj.selectAccessibleChild(k); shortWait(); isSelected = oObj.isAccessibleChildSelected(k); - log.println("isAccessibleChildSelected - " + + log.println("isAccessibleChildSelected - " + isSelected); res &= isSelected; } else { @@ -258,7 +258,7 @@ public class _XAccessibleSelection extends MultiMethodTest { if ((childCount > 0) && !OneAlwaysSelected) { try { - log.print("isAccessibleChildSelected(" + (childCount - 1) + + log.print("isAccessibleChildSelected(" + (childCount - 1) + ")? "); boolean isSel = oObj.isAccessibleChildSelected(childCount - 1); @@ -305,7 +305,7 @@ public class _XAccessibleSelection extends MultiMethodTest { log.println(isSelected); res = isSelected; - log.print("isAccessibleChildSelected(" + (childCount - 1) + + log.print("isAccessibleChildSelected(" + (childCount - 1) + ")? "); isSelected = oObj.isAccessibleChildSelected(childCount - 1); log.println(isSelected); @@ -350,11 +350,11 @@ public class _XAccessibleSelection extends MultiMethodTest { oObj.selectAccessibleChild(i); long curtime = System.currentTimeMillis(); long checktime = System.currentTimeMillis(); - + while (!oObj.isAccessibleChildSelected(i) && (checktime-curtime<5000)) { checktime = System.currentTimeMillis(); } - + log.println("OK"); } } @@ -367,9 +367,9 @@ public class _XAccessibleSelection extends MultiMethodTest { int sCount = chkSelectable(tEnv.getTestObject()); log.println("Found " + sCount + " selectable Childs"); - + int selectedCount = oObj.getSelectedAccessibleChildCount(); - log.println("After selecting all accessible " + selectedCount + + log.println("After selecting all accessible " + selectedCount + " are selected"); boolean res = true; @@ -443,7 +443,7 @@ public class _XAccessibleSelection extends MultiMethodTest { if (isSelectable(tEnv.getTestObject(), k)) { oObj.selectAccessibleChild(k); shortWait(); - log.println("selected child count: " + + log.println("selected child count: " + oObj.getSelectedAccessibleChildCount()); XAccessible selChild = oObj.getSelectedAccessibleChild(0); res &= (selChild != null); @@ -521,7 +521,7 @@ public class _XAccessibleSelection extends MultiMethodTest { } int newSelCount = oObj.getSelectedAccessibleChildCount(); - log.println("getSelectedAccessibleChildCount():" + + log.println("getSelectedAccessibleChildCount():" + newSelCount); if (OneAlwaysSelected && (selCount == 1)) { @@ -579,7 +579,7 @@ public class _XAccessibleSelection extends MultiMethodTest { //selecting menuitems or the separator will lead to closing the menu if ((accCon.getAccessibleChild(index).getAccessibleContext() - .getAccessibleRole() == AccessibleRole.MENU_ITEM) || + .getAccessibleRole() == AccessibleRole.MENU_ITEM) || (accCon.getAccessibleChild(index).getAccessibleContext() .getAccessibleRole() == AccessibleRole.SEPARATOR)) { res = false; diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java index fa851bb79ea2..4a1ec00e11e8 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java index c72c25590396..60afee689fd8 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ public class _XAccessibleText extends MultiMethodTest { if (component == null) { component = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, tEnv.getTestObject()); } @@ -260,7 +260,7 @@ public class _XAccessibleText extends MultiMethodTest { res &= isEqCh; if (!isEqCh) { - log.println("At the position " + i + + log.println("At the position " + i + "was expected character: " + text.charAt(i)); log.println("but was returned: " + ch); @@ -316,7 +316,7 @@ public class _XAccessibleText extends MultiMethodTest { try { log.println("getCharacterAttributes(chCount-1)"); - PropertyValue[] props = oObj.getCharacterAttributes(chCount - 1, + PropertyValue[] props = oObj.getCharacterAttributes(chCount - 1, attr); res &= (props != null); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -379,7 +379,7 @@ public class _XAccessibleText extends MultiMethodTest { try { for (int i = 0; i < lastIndex; i++) { log.println("getCharacterBounds(" + i + ")"); - chBounds = oObj.getCharacterBounds(i); + chBounds = oObj.getCharacterBounds(i); boolean localres = true; localres = chBounds.X >= 0; @@ -390,13 +390,13 @@ public class _XAccessibleText extends MultiMethodTest { localres &= ((chBounds.Y + chBounds.Height) > 0); if (!localres) { - log.println("Text at this place: "+oObj.getCharacter(i)); + log.println("Text at this place: "+oObj.getCharacter(i)); log.println("Character bounds outside component"); - log.println("Character rect: " + chBounds.X + ", " + - chBounds.Y + ", " + chBounds.Width + ", " + + log.println("Character rect: " + chBounds.X + ", " + + chBounds.Y + ", " + chBounds.Width + ", " + chBounds.Height); - log.println("Component rect: " + bounds.X + ", " + - bounds.Y + ", " + bounds.Width + ", " + + log.println("Component rect: " + bounds.X + ", " + + bounds.Y + ", " + bounds.Width + ", " + bounds.Height); res &= localres; } @@ -435,7 +435,7 @@ public class _XAccessibleText extends MultiMethodTest { * </ul> */ public void _getIndexAtPoint() { - //requiredMethod("getCharacterBounds()"); + //requiredMethod("getCharacterBounds()"); boolean res = true; log.print("getIndexAtPoint(-1, -1):"); @@ -471,13 +471,13 @@ public class _XAccessibleText extends MultiMethodTest { int y = aRect.Y + (aRect.Height / 2); Point aPoint = new Point(x, y); int nIndex = oObj.getIndexAtPoint(aPoint); - + x = aRect.X; y = aRect.Y + (aRect.Height / 2); aPoint = new Point(x, y); - int left = oObj.getIndexAtPoint(aPoint); - - + int left = oObj.getIndexAtPoint(aPoint); + + int[] previous = (int[]) tEnv.getObjRelation("PreviousUsed"); @@ -492,12 +492,12 @@ public class _XAccessibleText extends MultiMethodTest { if (nIndex != i) { // for some letters the center of the rectangle isn't recognised // in this case we are happy if the left border of the rectangle - // returns the correct value. + // returns the correct value. if (left !=i) { - log.println("## Method didn't work for Point (" + x + "," + y + + log.println("## Method didn't work for Point (" + x + "," + y + ")"); log.println("Expected Index " + i); - log.println("Gained Index: " + nIndex); + log.println("Gained Index: " + nIndex); log.println("Left Border: "+left); log.println("CharacterAtIndex: " + text); res &= false; @@ -748,7 +748,7 @@ public class _XAccessibleText extends MultiMethodTest { boolean res = true; boolean locRes = true; - + String txtRange = ""; try { @@ -761,7 +761,7 @@ public class _XAccessibleText extends MultiMethodTest { res &= locRes; if (!locRes) { - log.println("Was expected: " + + log.println("Was expected: " + text.substring(1, chCount - 2)); } } @@ -774,7 +774,7 @@ public class _XAccessibleText extends MultiMethodTest { res &= locRes; if (!locRes) { - log.println("Was expected: " + + log.println("Was expected: " + text.substring(0, chCount - 1)); } @@ -853,7 +853,7 @@ public class _XAccessibleText extends MultiMethodTest { try { log.print("getTextAtIndex(-1, AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextAtIndex(-1, + txt = oObj.getTextAtIndex(-1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -866,10 +866,10 @@ public class _XAccessibleText extends MultiMethodTest { } try { - log.print("getTextAtIndex(chCount+1," + + log.print("getTextAtIndex(chCount+1," + " AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextAtIndex(chCount + 1, + txt = oObj.getTextAtIndex(chCount + 1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -882,14 +882,14 @@ public class _XAccessibleText extends MultiMethodTest { } try { - log.print("getTextAtIndex(chCount," + + log.print("getTextAtIndex(chCount," + " AccessibleTextType.WORD):"); txt = oObj.getTextAtIndex(chCount, AccessibleTextType.WORD); log.println("'" + txt.SegmentText + "'"); res &= compareLength(0,txt.SegmentText); if (!tEnv.getTestCase().getObjectName().equals("SmGraphicAccessible")) { - log.print("getTextAtIndex(1," + + log.print("getTextAtIndex(1," + " AccessibleTextType.PARAGRAPH):"); txt = oObj.getTextAtIndex(1, AccessibleTextType.PARAGRAPH); log.println("'" + txt.SegmentText + "'"); @@ -927,7 +927,7 @@ public class _XAccessibleText extends MultiMethodTest { try { log.print("getTextBeforeIndex(-1, AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBeforeIndex(-1, + txt = oObj.getTextBeforeIndex(-1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -940,10 +940,10 @@ public class _XAccessibleText extends MultiMethodTest { } try { - log.print("getTextBeforeIndex(chCount+1, " + + log.print("getTextBeforeIndex(chCount+1, " + "AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBeforeIndex(chCount + 1, + txt = oObj.getTextBeforeIndex(chCount + 1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -957,31 +957,31 @@ public class _XAccessibleText extends MultiMethodTest { try { if (!tEnv.getTestCase().getObjectName().equals("SmGraphicAccessible")) { - log.print("getTextBeforeIndex(chCount," + + log.print("getTextBeforeIndex(chCount," + " AccessibleTextType.WORD):"); - txt = oObj.getTextBeforeIndex(chCount, + txt = oObj.getTextBeforeIndex(chCount, AccessibleTextType.WORD); log.println("'" + txt.SegmentText + "'"); res &= compareLength(chCount, txt.SegmentText); } - log.print("getTextBeforeIndex(1," + + log.print("getTextBeforeIndex(1," + " AccessibleTextType.PARAGRAPH):"); txt = oObj.getTextBeforeIndex(1, AccessibleTextType.PARAGRAPH); log.println("'" + txt.SegmentText + "'"); res &= compareLength(0, txt.SegmentText); - log.print("getTextBeforeIndex(chCount-1," + + log.print("getTextBeforeIndex(chCount-1," + " AccessibleTextType.CHARACTER):"); - txt = oObj.getTextBeforeIndex(chCount - 1, + txt = oObj.getTextBeforeIndex(chCount - 1, AccessibleTextType.CHARACTER); log.println("'" + txt.SegmentText + "'"); - res &= compareStrings(text.substring(chCount - 2, chCount - 1), + res &= compareStrings(text.substring(chCount - 2, chCount - 1), txt.SegmentText); if (chCount > 2) { - log.print("getTextBeforeIndex(2," + + log.print("getTextBeforeIndex(2," + " AccessibleTextType.CHARACTER):"); txt = oObj.getTextBeforeIndex(2, AccessibleTextType.CHARACTER); log.println("'" + txt.SegmentText + "'"); @@ -1019,7 +1019,7 @@ public class _XAccessibleText extends MultiMethodTest { try { log.print("getTextBehindIndex(-1, AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBehindIndex(-1, + txt = oObj.getTextBehindIndex(-1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -1032,10 +1032,10 @@ public class _XAccessibleText extends MultiMethodTest { } try { - log.print("getTextBehindIndex(chCount+1, " + + log.print("getTextBehindIndex(chCount+1, " + "AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBehindIndex(chCount + 1, + txt = oObj.getTextBehindIndex(chCount + 1, AccessibleTextType.PARAGRAPH); log.println("Exception was expected"); res &= false; @@ -1048,31 +1048,31 @@ public class _XAccessibleText extends MultiMethodTest { } try { - log.print("getTextBehindIndex(chCount," + + log.print("getTextBehindIndex(chCount," + " AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBehindIndex(chCount, + txt = oObj.getTextBehindIndex(chCount, AccessibleTextType.PARAGRAPH); log.println("'" + txt.SegmentText + "'"); res &= (txt.SegmentText.length() == 0); - log.print("getTextBehindIndex(chCount-1," + + log.print("getTextBehindIndex(chCount-1," + " AccessibleTextType.PARAGRAPH):"); - txt = oObj.getTextBehindIndex(chCount - 1, + txt = oObj.getTextBehindIndex(chCount - 1, AccessibleTextType.PARAGRAPH); log.println("'" + txt.SegmentText + "'"); res &= (txt.SegmentText.length() == 0); - log.print("getTextBehindIndex(1," + + log.print("getTextBehindIndex(1," + " AccessibleTextType.CHARACTER):"); txt = oObj.getTextBehindIndex(1, AccessibleTextType.CHARACTER); log.println("'" + txt.SegmentText + "'"); res &= txt.SegmentText.equals(text.substring(2, 3)); if (chCount > 2) { - log.print("getTextBehindIndex(chCount-2," + + log.print("getTextBehindIndex(chCount-2," + " AccessibleTextType.CHARACTER):"); - txt = oObj.getTextBehindIndex(chCount - 2, + txt = oObj.getTextBehindIndex(chCount - 2, AccessibleTextType.CHARACTER); log.println("'" + txt.SegmentText + "'"); res &= txt.SegmentText.equals(text.substring(chCount - 1, chCount)); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 201d5675ff0c..4364d709870b 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ public class _XAccessibleValue extends MultiMethodTest { boolean partResult=true; String noMax = "com.sun.star.comp.toolkit.AccessibleScrollBar"; String implName = util.utils.getImplName(oObj); - + if (tEnv.getObjRelation("ValueNotPersitent")!=null) { log.println("Excluded since it works like AccessibleAction"); tRes.tested("setCurrentValue()",Status.skipped(true)); @@ -151,12 +151,12 @@ public class _XAccessibleValue extends MultiMethodTest { Object setVal = getObjectValue(newVal, val.getClass()); result &= oObj.setCurrentValue(setVal); - + if (!result) { log.println("The value can't be set"); throw new StatusException(Status.skipped(true)); } - + double resVal = getDoubleValue(oObj.getCurrentValue()); log.println("Res value is " + resVal); @@ -174,8 +174,8 @@ public class _XAccessibleValue extends MultiMethodTest { log.println("Setting to "+ getObjectValue(maxVal, val.getClass())); resVal = getDoubleValue(oObj.getCurrentValue()); log.println("Result max value is " + resVal); - partResult = Math.abs(maxVal - resVal) < 0.00001; - + partResult = Math.abs(maxVal - resVal) < 0.00001; + if (implName.equals(noMax)) { log.println("If one sets the maximum value of a scroll bar with XScrollBar::setMaximum(),"+ "then XScrollBar::getValue() returns the maximum value minus the visible size of"+ @@ -183,14 +183,14 @@ public class _XAccessibleValue extends MultiMethodTest { //using abitrary Value, since we can't determine the resulting value partResult = resVal > 10; } - + result &=partResult; log.println("\t works: "+partResult); log.println("Checking truncating of min/max values"); oObj.setCurrentValue(getObjectValue(minVal - 1, val.getClass())); log.println("Setting to "+ getObjectValue(minVal -1 , val.getClass())); - resVal = getDoubleValue(oObj.getCurrentValue()); + resVal = getDoubleValue(oObj.getCurrentValue()); log.println("Result min value is " + resVal); result &= Math.abs(minVal - resVal) < 0.00001; log.println("\t works: "+(Math.abs(minVal - resVal) < 0.00001)); @@ -207,7 +207,7 @@ public class _XAccessibleValue extends MultiMethodTest { //using abitrary Value, since we can't determine the resulting value partResult = resVal > 10; } - + result &=partResult; log.println("\t works: "+partResult); } else { diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java index 545995a641fe..ff9ac9c269c4 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest { log.println("Testing with custom Property tester") ; testProperty("BackgroundColor", ColorTester) ; } - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -87,7 +87,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } /** * This property can be void, so if old value is <code> null </code> diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java index 115a416ba640..4d7d77fad501 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,8 +70,8 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } - + } + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -104,6 +104,6 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java index 544c8c2ee6e1..c3d3133bd8fb 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -101,7 +101,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { } }) ; } - + public void _Text() { try { oObj.setPropertyValue("MaxTextLen",new Short((short)0)); @@ -112,7 +112,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { } testProperty("Text"); } - + /** * Redefined method returns value, that differs from property value. */ @@ -124,7 +124,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -132,7 +132,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } //EOF UnoControlComboBoxModel diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java index 8ae486c2d8e7..88cf0a8aa2a7 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java index 3638498a0152..906da48cf1ae 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -91,7 +91,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be void, so if old value is <code> null </code> @@ -104,7 +104,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -115,7 +115,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(123) : null ; } }) ; - } + } /** * This property can be void, so if old value is <code> null </code> diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java index c0d17a541c46..baeb99479760 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -79,7 +79,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be void, so if old value is <code> null </code> @@ -117,7 +117,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -129,7 +129,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -137,9 +137,9 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } - - public void _DateShowCentury() { + } + + public void _DateShowCentury() { boolean res = false; try { util.dbg.printPropertyInfo(oObj,"DateShowCentury",log); @@ -160,14 +160,14 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { } catch (com.sun.star.beans.UnknownPropertyException upe) { log.println("Don't know the Property 'DateShowCentury'"); } catch (com.sun.star.lang.WrappedTargetException wte) { - log.println("WrappedTargetException while getting Property 'DateShowCentury'"); + log.println("WrappedTargetException while getting Property 'DateShowCentury'"); } catch (com.sun.star.lang.IllegalArgumentException iae) { log.println("IllegalArgumentException while getting Property 'DateShowCentury'"); } catch (com.sun.star.beans.PropertyVetoException pve) { log.println("PropertyVetoException while getting Property 'DateShowCentury'"); - } - tRes.tested("DateShowCentury",res); - + } + tRes.tested("DateShowCentury",res); + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java index f9746fb6210f..2e20cf12a979 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ package ifc.awt; import lib.MultiPropertyTest; -public class _UnoControlDialogElement extends MultiPropertyTest { - +public class _UnoControlDialogElement extends MultiPropertyTest { + } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java index 88b2ecafcb30..f58bebbf5272 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -82,6 +82,6 @@ public class _UnoControlDialogModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(4321) : null ; } }) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java index fee61c671be1..cd9b09eb7447 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -80,7 +80,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new @@ -105,7 +105,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -117,7 +117,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -125,6 +125,6 @@ public class _UnoControlEditModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java index 144ccd46a205..ad5e3d0be64a 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -76,7 +76,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java index f9087e46cd41..382c39bffbbb 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java index d66cfde5995a..9c96a2510fd1 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -73,7 +73,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new @@ -86,7 +86,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -98,7 +98,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -106,6 +106,6 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java index 31bc7959a287..f277cbef2664 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { log.println("Testing with custom Property tester") ; testProperty("DefaultControl", ControlTester) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -97,7 +97,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be void, so if old value is <code> null </code> @@ -111,7 +111,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -123,7 +123,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { super.getNewValue(p,v) ; } }) ; - } + } /** * This property can be void, so if old value is <code> null </code> @@ -166,7 +166,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -182,7 +182,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { return newValue; } }) ; - } + } /** * This property can be void, so if old value is <code> null </code> diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java index 8b4183aa88fe..b82f65e07220 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -71,7 +71,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -79,7 +79,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java index 4955cce1dc1a..f9344d5a6ccf 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -90,8 +90,8 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } - + } + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -104,6 +104,6 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { } }) ; } - + } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java index 97c4bebde37e..21eba19082dc 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -76,7 +76,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new @@ -101,7 +101,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -113,7 +113,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -121,6 +121,6 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlModel.java index 63dc6009d75d..c40f64620313 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,6 +30,6 @@ package ifc.awt; import lib.MultiPropertyTest; public class _UnoControlModel extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java index 4ea032cce8a5..913f4235911f 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -79,7 +79,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new @@ -92,7 +92,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -103,7 +103,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(4321) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java index 2fa75c03ba53..51fb016698ce 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -75,7 +75,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new @@ -88,7 +88,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -99,7 +99,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(4321) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java index 54bdb7195f16..a59e9f0963a2 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java index b7b54c05addf..31442493895b 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { } }) ; } - + /** * Redefined method returns value, that differs from property value. */ @@ -83,7 +83,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { return new Integer(17); } }; - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. @@ -91,8 +91,8 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { public void _TextLineColor() { log.println("Testing with custom Property tester") ; testProperty("TextLineColor", ColorTester) ; - } - + } + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -103,6 +103,6 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java index 824c6f0185d8..edb8a07b986b 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,12 +58,12 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { - protected Object getNewValue(String p, Object old) { + protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(32768) : null ; } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -74,8 +74,8 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } - + } + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -86,15 +86,15 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(65324) : null ; } }) ; - } - + } + /** * This property can be VOID, and in case if it is so new * value must defined. */ public void _ScrollValue() { testProperty("ScrollValue", new PropertyTester() { - protected Object getNewValue(String p, Object old) { + protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(10) : new Integer(15) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java index a0489db5cdf6..12464db2a4ff 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,19 +31,19 @@ import lib.MultiPropertyTest; import util.utils; public class _UnoControlSpinButtonModel extends MultiPropertyTest { - + /** * This property can be VOID, and in case if it is so new * value must defined. */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { - protected Object getNewValue(String p, Object old) { + protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(32768) : null ; } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -54,8 +54,8 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } - + } + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -66,6 +66,6 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(65324) : null ; } }) ; - } - + } + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java index 1e1a0b78d058..035ca42be8a1 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { } }) ; } - + /** * This property can be VOID, and in case if it is so new * value must defined. @@ -83,7 +83,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { return utils.isVoid(old) ? new Integer(1234) : null ; } }) ; - } + } /** * This property can be VOID, and in case if it is so new diff --git a/qadevOOo/tests/java/ifc/awt/_XButton.java b/qadevOOo/tests/java/ifc/awt/_XButton.java index 3aacd8515144..c8c9adb2cf33 100644 --- a/qadevOOo/tests/java/ifc/awt/_XButton.java +++ b/qadevOOo/tests/java/ifc/awt/_XButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XCheckBox.java b/qadevOOo/tests/java/ifc/awt/_XCheckBox.java index e8307ed8f8bb..a0063d76e9d6 100644 --- a/qadevOOo/tests/java/ifc/awt/_XCheckBox.java +++ b/qadevOOo/tests/java/ifc/awt/_XCheckBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XComboBox.java b/qadevOOo/tests/java/ifc/awt/_XComboBox.java index 8dd65e33050c..aa3aecbcca2d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XComboBox.java +++ b/qadevOOo/tests/java/ifc/awt/_XComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XControl.java b/qadevOOo/tests/java/ifc/awt/_XControl.java index fbf10ca97271..7f12c8cabad8 100644 --- a/qadevOOo/tests/java/ifc/awt/_XControl.java +++ b/qadevOOo/tests/java/ifc/awt/_XControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XControlContainer.java b/qadevOOo/tests/java/ifc/awt/_XControlContainer.java index 831df3461041..3ee305ea4e84 100644 --- a/qadevOOo/tests/java/ifc/awt/_XControlContainer.java +++ b/qadevOOo/tests/java/ifc/awt/_XControlContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java index 588962be5afd..755643ad522b 100644 --- a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java +++ b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java index 909723b8a429..1d1ccf3a3fe5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java +++ b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XDateField.java b/qadevOOo/tests/java/ifc/awt/_XDateField.java index a8eaf303302e..fd22837a36f5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XDateField.java +++ b/qadevOOo/tests/java/ifc/awt/_XDateField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,12 +75,12 @@ public class _XDateField extends MultiMethodTest { requiredMethod("getDate()") ; boolean result = true ; - oObj.setDate(19000101) ; + oObj.setDate(19000101) ; result = oObj.getDate() == 19000101 ; - + if (! result ) { - System.out.println("getDate: "+oObj.getDate()+" , expected 19000101"); + System.out.println("getDate: "+oObj.getDate()+" , expected 19000101"); } tRes.tested("setDate()", result) ; diff --git a/qadevOOo/tests/java/ifc/awt/_XDialog.java b/qadevOOo/tests/java/ifc/awt/_XDialog.java index a5fc0bf98170..91dc2a0cdf0f 100644 --- a/qadevOOo/tests/java/ifc/awt/_XDialog.java +++ b/qadevOOo/tests/java/ifc/awt/_XDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XFixedText.java b/qadevOOo/tests/java/ifc/awt/_XFixedText.java index e93d97e85e19..5fc61841b7f5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XFixedText.java +++ b/qadevOOo/tests/java/ifc/awt/_XFixedText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XImageConsumer.java b/qadevOOo/tests/java/ifc/awt/_XImageConsumer.java index f47320fa3e2c..96e1de152adb 100644 --- a/qadevOOo/tests/java/ifc/awt/_XImageConsumer.java +++ b/qadevOOo/tests/java/ifc/awt/_XImageConsumer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java index 60dd0c9b7fdf..9e039772039c 100644 --- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java +++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XItemListener.java b/qadevOOo/tests/java/ifc/awt/_XItemListener.java index b5f920f4ffa7..27991c1eab52 100644 --- a/qadevOOo/tests/java/ifc/awt/_XItemListener.java +++ b/qadevOOo/tests/java/ifc/awt/_XItemListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java b/qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java index 81bfc6889175..4c11ebdb6b23 100644 --- a/qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java +++ b/qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/tests/java/ifc/awt/_XListBox.java index 9d1e4a84702e..70becc6327cb 100644 --- a/qadevOOo/tests/java/ifc/awt/_XListBox.java +++ b/qadevOOo/tests/java/ifc/awt/_XListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java index 9c96506938da..9ec01eb5aaa1 100644 --- a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java +++ b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XNumericField.java b/qadevOOo/tests/java/ifc/awt/_XNumericField.java index 65003777182c..3b86d1a9a22d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XNumericField.java +++ b/qadevOOo/tests/java/ifc/awt/_XNumericField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XPatternField.java b/qadevOOo/tests/java/ifc/awt/_XPatternField.java index 5cbd0145d76e..acf6312ba9a9 100644 --- a/qadevOOo/tests/java/ifc/awt/_XPatternField.java +++ b/qadevOOo/tests/java/ifc/awt/_XPatternField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java index 348ac264ecf5..c901c0cebadb 100644 --- a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java +++ b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java index a5a55d300aeb..cbaf7119ca77 100644 --- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java +++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class _XScrollBar extends MultiMethodTest { com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener(); public void _addAdjustmentListener() { - util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), + util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), (XTextDocument) tEnv.getObjRelation("Document")); shortWait(); oObj.addAdjustmentListener(listener); @@ -68,35 +68,35 @@ public class _XScrollBar extends MultiMethodTest { requiredMethod("addAdjustmentListener()"); tRes.tested("removeAdjustmentListener()", true); } - + public void _setBlockIncrement() { oObj.setBlockIncrement(15); oObj.setBlockIncrement(5); int bi = oObj.getBlockIncrement(); tRes.tested("setBlockIncrement()",bi==5); - } + } public void _getBlockIncrement() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setBlockIncrement()"); - tRes.tested("getBlockIncrement()", true); + tRes.tested("getBlockIncrement()", true); } - + public void _setLineIncrement() { oObj.setLineIncrement(12); oObj.setLineIncrement(2); int li = oObj.getLineIncrement(); tRes.tested("setLineIncrement()",li==2); - } + } public void _getLineIncrement() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setLineIncrement()"); - tRes.tested("getLineIncrement()", true); + tRes.tested("getLineIncrement()", true); } public void _setMaximum() { @@ -105,44 +105,44 @@ public class _XScrollBar extends MultiMethodTest { int max = oObj.getMaximum(); tRes.tested("setMaximum()",max==480); } - + public void _getMaximum() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setMaximum()"); - tRes.tested("getMaximum()", true); + tRes.tested("getMaximum()", true); } - + public void _setOrientation() { oObj.setOrientation(ScrollBarOrientation.HORIZONTAL); oObj.setOrientation(ScrollBarOrientation.VERTICAL); int ori = oObj.getOrientation(); tRes.tested("setOrientation()",ori==ScrollBarOrientation.VERTICAL); - } + } public void _getOrientation() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setOrientation()"); - tRes.tested("getOrientation()", true); + tRes.tested("getOrientation()", true); } - + public void _setValue() { oObj.setMaximum(600); oObj.setValue(480); oObj.setValue(520); int val = oObj.getValue(); tRes.tested("setValue()",val==520); - } + } public void _getValue() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setValue()"); - tRes.tested("getValue()", true); + tRes.tested("getValue()", true); } public void _setVisibleSize() { @@ -150,14 +150,14 @@ public class _XScrollBar extends MultiMethodTest { oObj.setVisibleSize(500); int vs = oObj.getVisibleSize(); tRes.tested("setVisibleSize()",vs==500); - } - + } + public void _getVisibleSize() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setVisibleSize()"); - tRes.tested("getVisibleSize()", true); + tRes.tested("getVisibleSize()", true); } public void _setValues() { @@ -165,8 +165,8 @@ public class _XScrollBar extends MultiMethodTest { oObj.setValues(70, 210, 500); int val = oObj.getValue(); int vs = oObj.getVisibleSize(); - int max = oObj.getMaximum(); - tRes.tested("setValues()",((val==70) && (vs==210) && (max==500))); + int max = oObj.getMaximum(); + tRes.tested("setValues()",((val==70) && (vs==210) && (max==500))); } private void adjustScrollBar() { @@ -176,17 +176,17 @@ public class _XScrollBar extends MultiMethodTest { XScrollBar.class, tEnv.getTestObject()); sc.setValue(500); - + shortWait(); XAccessible acc = (XAccessible) UnoRuntime.queryInterface( XAccessible.class, tEnv.getTestObject()); XAccessibleComponent aCom = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, acc.getAccessibleContext()); - Point location = aCom.getLocationOnScreen(); + Point location = aCom.getLocationOnScreen(); //Point location = (Point) tEnv.getObjRelation("Location"); //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); //Point location = aCom.getLocationOnScreen(); diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinField.java b/qadevOOo/tests/java/ifc/awt/_XSpinField.java index 327aacbef7bf..e18bc8589610 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinField.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java index e0ab3513b6fe..dbbcc2c0332c 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ import java.awt.event.InputEvent; import lib.MultiMethodTest; public class _XSpinValue extends MultiMethodTest { - + public XSpinValue oObj; public boolean adjusted = false; com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener(); public void _addAdjustmentListener() { - util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), + util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), (XTextDocument) tEnv.getObjRelation("Document")); shortWait(); oObj.addAdjustmentListener(listener); @@ -67,22 +67,22 @@ public class _XSpinValue extends MultiMethodTest { requiredMethod("addAdjustmentListener()"); tRes.tested("removeAdjustmentListener()", true); } - + public void _setSpinIncrement() { oObj.setSpinIncrement(15); oObj.setSpinIncrement(5); int bi = oObj.getSpinIncrement(); tRes.tested("setSpinIncrement()",bi==5); - } + } public void _getSpinIncrement() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setSpinIncrement()"); - tRes.tested("getSpinIncrement()", true); + tRes.tested("getSpinIncrement()", true); } - + public void _setMaximum() { oObj.setMaximum(490); @@ -90,30 +90,30 @@ public class _XSpinValue extends MultiMethodTest { int max = oObj.getMaximum(); tRes.tested("setMaximum()",max==480); } - + public void _getMaximum() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setMaximum()"); - tRes.tested("getMaximum()", true); + tRes.tested("getMaximum()", true); } - + public void _setMinimum() { oObj.setMinimum(90); oObj.setMinimum(80); int max = oObj.getMinimum(); tRes.tested("setMinimum()",max==80); } - + public void _getMinimum() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setMinimum()"); - tRes.tested("getMinimum()", true); - } - + tRes.tested("getMinimum()", true); + } + public void _setOrientation() { boolean res = true; try { @@ -125,30 +125,30 @@ public class _XSpinValue extends MultiMethodTest { int ori = oObj.getOrientation(); res &= (ori==ScrollBarOrientation.VERTICAL); tRes.tested("setOrientation()",res ); - } + } public void _getOrientation() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setOrientation()"); - tRes.tested("getOrientation()", true); + tRes.tested("getOrientation()", true); } - + public void _setValue() { oObj.setMaximum(600); oObj.setValue(480); oObj.setValue(520); int val = oObj.getValue(); tRes.tested("setValue()",val==520); - } + } public void _getValue() { //this method is checked in the corresponding set method //so that method is requiered here and if it works //this method is given OK too requiredMethod("setValue()"); - tRes.tested("getValue()", true); + tRes.tested("getValue()", true); } public void _setValues() { @@ -156,8 +156,8 @@ public class _XSpinValue extends MultiMethodTest { oObj.setValues(70, 210, 200); int val = oObj.getValue(); int min = oObj.getMinimum(); - int max = oObj.getMaximum(); - tRes.tested("setValues()",((min==70) && (max==210) && (val==200))); + int max = oObj.getMaximum(); + tRes.tested("setValues()",((min==70) && (max==210) && (val==200))); } private void adjustScrollBar() { @@ -167,17 +167,17 @@ public class _XSpinValue extends MultiMethodTest { XSpinValue.class, tEnv.getTestObject()); sv.setValue(500); - + shortWait(); XAccessible acc = (XAccessible) UnoRuntime.queryInterface( XAccessible.class, tEnv.getTestObject()); XAccessibleComponent aCom = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, acc.getAccessibleContext()); - Point location = aCom.getLocationOnScreen(); + Point location = aCom.getLocationOnScreen(); //Point location = (Point) tEnv.getObjRelation("Location"); //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); //Point location = aCom.getLocationOnScreen(); @@ -216,5 +216,5 @@ public class _XSpinValue extends MultiMethodTest { System.out.println("Listener disposed"); } } - + } diff --git a/qadevOOo/tests/java/ifc/awt/_XTabController.java b/qadevOOo/tests/java/ifc/awt/_XTabController.java index baf9b8f97bcc..a266bcbfc0f9 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTabController.java +++ b/qadevOOo/tests/java/ifc/awt/_XTabController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java b/qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java index 42442185c539..c1637450dbd9 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java +++ b/qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java index 850b281b00f8..3a8a64c115fe 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,12 +188,12 @@ public class _XTextComponent extends MultiMethodTest { oObj.setText(text); oObj.setSelection(new Selection(0,3)); boolean result = oObj.getSelectedText().equals(text); - + if (! result) { System.out.println("Getting '"+oObj.getSelectedText()+"'"); System.out.println("Expected '"+text+"'"); } - + tRes.tested("getSelectedText()",result); } diff --git a/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java b/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java index 135a1abe917b..10663621dd2d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XTextListener.java b/qadevOOo/tests/java/ifc/awt/_XTextListener.java index df40799cb369..245642a803d8 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextListener.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,14 +115,14 @@ public class _XTextListener extends MultiMethodTest { tRes.tested("textChanged()", result) ; } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); } - + } diff --git a/qadevOOo/tests/java/ifc/awt/_XTimeField.java b/qadevOOo/tests/java/ifc/awt/_XTimeField.java index 95f31140b847..59da87e5de7e 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTimeField.java +++ b/qadevOOo/tests/java/ifc/awt/_XTimeField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class _XTimeField extends MultiMethodTest { oObj.setTime(11150000) ; result = oObj.getTime() == 11150000 ; - + if (! result ) { System.out.println("Getting "+oObj.getTime()+ " expected 11150000"); } diff --git a/qadevOOo/tests/java/ifc/awt/_XToolkit.java b/qadevOOo/tests/java/ifc/awt/_XToolkit.java index 8824c3bba9ac..c70d66594013 100644 --- a/qadevOOo/tests/java/ifc/awt/_XToolkit.java +++ b/qadevOOo/tests/java/ifc/awt/_XToolkit.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java index e1203d7a6e31..f3e2d7c5354c 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java index 99fd41135c1a..41c2579eda81 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java +++ b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,12 @@ public class _XUnoControlContainer extends MultiMethodTest { private XTabController tabControl1 = null; private XTabController tabControl2 = null; - /** + /** * This method gets the object relations. - * + * */ protected void before() { - + tabControl1 = (XTabController) tEnv.getObjRelation("TABCONTROL1"); tabControl2 = (XTabController) tEnv.getObjRelation("TABCONTROL2"); if ((tabControl1 == null) || (tabControl2 == null)){ @@ -70,16 +70,16 @@ public class _XUnoControlContainer extends MultiMethodTest { } TabControllers[0] = tabControl1; TabControllers[1] = tabControl2; - + } - - - + + + /** * This tests removes the object relations <code>TABCONTROL1</code> and * <code>TABCONTROL1</code>. - * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> - * get before calling method is smaller then sequenze of + * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> + * get before calling method is smaller then sequenze of * <code>XTabController[]</code> get after calling method.<p> * * The following method tests are to be completed successfully before : @@ -91,23 +91,23 @@ public class _XUnoControlContainer extends MultiMethodTest { public void _setTabControllers() { requiredMethod( "getTabControllers()"); requiredMethod( "removeTabController()"); - + log.println("removing TABCONTROL1 and TABCONTROL2"); oObj.removeTabController(tabControl1); oObj.removeTabController(tabControl2); - + log.println("get current controllers"); XTabController[] myTabControllers = oObj.getTabControllers(); log.println("set new controllers"); oObj.setTabControllers( TabControllers ); - + log.println("get new current controllers"); XTabController[] myNewTabControllers = oObj.getTabControllers(); - tRes.tested("setTabControllers()", + tRes.tested("setTabControllers()", (myTabControllers.length < myNewTabControllers.length )); - + } /** @@ -127,28 +127,28 @@ public class _XUnoControlContainer extends MultiMethodTest { /** * Test calls the method with object relation 'TABCONTROL1' as a parameter.<p> - * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> - * get before calling method is smaller then sequenze of + * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> + * get before calling method is smaller then sequenze of * <code>XTabController[]</code> get after calling method.<p> */ public void _addTabController() { log.println("get current controllers"); XTabController[] myTabControllers = oObj.getTabControllers(); - + log.println("add TABCONTROL1"); oObj.addTabController( tabControl1 ); - + log.println("get new current controllers"); XTabController[] myNewTabControllers = oObj.getTabControllers(); - - tRes.tested("addTabController()", + + tRes.tested("addTabController()", (myTabControllers.length < myNewTabControllers.length )); } /** * Test calls the method with object relation 'TABCONTROL2' as a parameter.<p> - * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> - * get before calling method is smaller then sequenze of + * Has <b> OK </b> status if the sequenze of <code>XTabController[]</code> + * get before calling method is smaller then sequenze of * <code>XTabController[]</code> get after calling method.<p> * * The following method tests are to be completed successfully before : @@ -163,17 +163,17 @@ public class _XUnoControlContainer extends MultiMethodTest { log.println("add TABCONTROL2"); oObj.addTabController( tabControl2 ); - + log.println("get current controllers"); XTabController[] myTabControllers = oObj.getTabControllers(); - + log.println("remove TABCONTROL2"); oObj.removeTabController(tabControl2); log.println("get new current controllers"); XTabController[] myNewTabControllers = oObj.getTabControllers(); - tRes.tested("removeTabController()", + tRes.tested("removeTabController()", (myTabControllers.length > myNewTabControllers.length )); } diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index cf52cfb5bd57..a5cbb17829f4 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,9 +67,9 @@ import util.AccessibilityTools; */ public class _XUserInputInterception extends MultiMethodTest { public XUserInputInterception oObj = null; - + private XModel m_XModel = null; - + /** the listener 1 for the mouse click test */ private MyMouseClickHandler1 m_MouseListener1 = null; /** the listener 2 for the mouse click test */ @@ -84,23 +84,23 @@ public class _XUserInputInterception extends MultiMethodTest { private boolean m_mousePressed1 = false; /** indicates if the mouseReleased event was called*/ private boolean m_mouseReleased1 = false; - + /** indicates if the mousePressed event was called*/ private boolean m_mousePressed2 = false; /** indicates if the mouseReleased event was called*/ private boolean m_mouseReleased2 = false; - + /** indicates if the mousePressed event was called*/ private boolean m_keyPressed1 = false; /** indicates if the mouseReleased event was called*/ private boolean m_keyReleased1 = false; - + /** indicates if the mousePressed event was called*/ private boolean m_keyPressed2 = false; /** indicates if the mouseReleased event was called*/ private boolean m_keyReleased2 = false; - - /** get the object rlation XUserInputInterception.XModel from the + + /** get the object rlation XUserInputInterception.XModel from the * test environment */ protected void before() { @@ -113,25 +113,25 @@ public class _XUserInputInterception extends MultiMethodTest { /** * This test adds two different key listener to the object. <p> - * + * * Has <b> OK </b> if no exception is thrown. */ public void _addKeyHandler() { - + log.println("creating key listener 1"); m_KeyListener1 = new MyKeyHandler1(); - + log.println("creating key listener 2"); m_KeyListener2 = new MyKeyHandler2(); - - + + log.println("adding key listener 1"); oObj.addKeyHandler(m_KeyListener1); - + log.println("adding key listener 2"); oObj.addKeyHandler(m_KeyListener2); - + tRes.tested("addKeyHandler()", true); } @@ -149,21 +149,21 @@ public class _XUserInputInterception extends MultiMethodTest { requiredMethod("addKeyHandler()"); log.println("remove key listener 2"); - + oObj.removeKeyHandler(m_KeyListener2); - + log.println("starting thread to check the key listener..."); EventTrigger et = new EventTrigger(m_XModel, EventTriggerType.KEY_TEXT_INTO_DOC); et.run(); - + util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT) * 2); log.println("key listener thread should be finished."); - - + + boolean bOK = m_keyPressed1 & m_keyReleased1 & ! m_keyPressed2 & ! m_keyReleased2; - + if (! bOK){ log.println("The key listener has not the expectd status:"); log.println("listener\texpected\tgot"); @@ -172,16 +172,16 @@ public class _XUserInputInterception extends MultiMethodTest { log.println("keyPressed2\tfalse\t"+m_keyPressed2); log.println("keyReleased2\tfalse\t"+m_keyReleased2); } - + log.println("remove Key listener 1"); oObj.removeKeyHandler(m_KeyListener1); - + tRes.tested("removeKeyHandler()", bOK); } /** * This test adds two different mouse klick listener to the object. <p> - * + * * Has <b> OK </b> if no exception is thrown. */ public void _addMouseClickHandler() { @@ -189,12 +189,12 @@ public class _XUserInputInterception extends MultiMethodTest { m_MouseListener1 = new MyMouseClickHandler1(); log.println("creating mouse listener 2"); m_MouseListener2 = new MyMouseClickHandler2(); - + log.println("adding mouse listener 1"); oObj.addMouseClickHandler(m_MouseListener1); log.println("adding mouse listener 2"); oObj.addMouseClickHandler(m_MouseListener2); - + tRes.tested("addMouseClickHandler()", true); } @@ -210,22 +210,22 @@ public class _XUserInputInterception extends MultiMethodTest { */ public void _removeMouseClickHandler() { requiredMethod("addMouseClickHandler"); - + log.println("remove mouse listener 2"); - + oObj.removeMouseClickHandler(m_MouseListener2); - + log.println("starting thread to check the mouse listener..."); EventTrigger et = new EventTrigger(m_XModel, EventTriggerType.MOUSE_KLICK_INTO_DOC); et.run(); - + util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT) * 2); log.println("mouse listener thread should be finished."); - + boolean bOK = m_mousePressed1 & m_mouseReleased1 & ! m_mousePressed2 & ! m_mouseReleased2; - + if (! bOK){ log.println("The mouse listener has not the expectd status:"); log.println("listener\t\texpected\tgot"); @@ -234,21 +234,21 @@ public class _XUserInputInterception extends MultiMethodTest { log.println("mousePressed2\tfalse\t\t"+m_mousePressed2); log.println("mouseReleased2\tfalse\t\t"+m_mouseReleased2); } - + log.println("remove mouse listener 1"); oObj.removeMouseClickHandler(m_MouseListener1); - + tRes.tested("removeMouseClickHandler()", bOK); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } - + } + /** * Listener which added and its method must be called * on <code>keyPressed</code> and <code>keyReleased</code> call. @@ -322,7 +322,7 @@ public class _XUserInputInterception extends MultiMethodTest { "This should not be happen because listener is removed!"); } } - + /** * Listener which added and its method must be called * on <code>mousePressed</code> and <code>mouseReleased</code> call. @@ -358,7 +358,7 @@ public class _XUserInputInterception extends MultiMethodTest { log.println("XMouseClickHandler 1: disposing-Event"); } }; - + /** * Listener which added and removed. Its method must NOT be called * on <code>mousePressed</code> and <code>mouseReleased</code> call. @@ -397,14 +397,14 @@ public class _XUserInputInterception extends MultiMethodTest { " This should not be happen because listener is removed!"); } }; - + /** * To check the events this class is a thread which click a mouse button and * press a key with the <CODE>Robot</CODE> class * @see java.awt.Robot */ private class EventTrigger extends Thread{ - + /** * represents a <CODE>AccessibilityTools</CODE> */ @@ -418,7 +418,7 @@ public class _XUserInputInterception extends MultiMethodTest { * represents a <CODE>XModel</CODE> of a document */ private XModel xModel = null; - + /** * Creates an instacne of this class. The parameter <CODE>eType</CODE> represents * the kind of event wich will be triggert at <CODE>run()</CODE> @@ -430,17 +430,17 @@ public class _XUserInputInterception extends MultiMethodTest { this.xModel = model; this.eventType = eType; } - + /** * Triggers the event wich is represented by <CODE>eventType</CODE> * The scenarios are: * <ul> * <li>EventTest.EventTriggerType.MOUSE_KLICK_INTO_DOC - * which calls + * which calls * <li><CODE>clickIntoDoc</CODE></LI> * </LI> * <li>EventTest.EventTriggerType.KEY_TEXT_INTO_DOC - * which calls + * which calls * <li><CODE>clickIntodoc</CODE></LI> * <li><CODE>keyIntoDoc</CODE></LI> * </LI> @@ -449,7 +449,7 @@ public class _XUserInputInterception extends MultiMethodTest { public void run(){ switch (this.eventType){ - + case EventTriggerType.MOUSE_KLICK_INTO_DOC: clickIntoDoc(); break; @@ -457,7 +457,7 @@ public class _XUserInputInterception extends MultiMethodTest { clickIntoDoc(); keyIntoDoc(); break; - + } } /** @@ -471,14 +471,14 @@ public class _XUserInputInterception extends MultiMethodTest { try{ util.DesktopTools.bringWindowToFront(xModel); - + XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), xModel); - + XAccessible xRoot = at.getAccessibleObject(xWindow); - - + + XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent xPanelCont = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); @@ -504,7 +504,7 @@ public class _XUserInputInterception extends MultiMethodTest { log.println("could not click into the scroll bar: " + e.toString()); } } - + /** * This method press the "A" key. Therefore it uses the <CODE>Robot</CODE> * class. @@ -519,21 +519,21 @@ public class _XUserInputInterception extends MultiMethodTest { } catch (java.awt.AWTException e) { log.println("couldn't press key"); } - + } } - - /** This interface represents all possible actions which could be used + + /** This interface represents all possible actions which could be used * in the <CODE>EventTrigger</CODE> class. * @see EventTest.EventTrigger - */ + */ private interface EventTriggerType{ - + /** klick the mouse into the scroll bar*/ final public static int MOUSE_KLICK_INTO_DOC = 1; - + /** write some text into a spread sheet*/ final public static int KEY_TEXT_INTO_DOC = 2; - } + } } diff --git a/qadevOOo/tests/java/ifc/awt/_XView.java b/qadevOOo/tests/java/ifc/awt/_XView.java index a3f87c2ea3dc..a54c5268387b 100644 --- a/qadevOOo/tests/java/ifc/awt/_XView.java +++ b/qadevOOo/tests/java/ifc/awt/_XView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,13 +131,13 @@ public class _XView extends MultiMethodTest { oObj.setZoom(2,2); tRes.tested("setZoom()", true); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } - + } + } diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java b/qadevOOo/tests/java/ifc/awt/_XWindow.java index f3cfda4e6085..80c3c70763fb 100644 --- a/qadevOOo/tests/java/ifc/awt/_XWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XWindow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -270,7 +270,7 @@ public class _XWindow extends MultiMethodTest { log.println("set object invisible..."); oObj.setVisible(false); shortWait(); - res = wListener.hidden && !wListener.resized + res = wListener.hidden && !wListener.resized && !wListener.moved && !wListener.shown; result &= res; if (!res) { @@ -288,7 +288,7 @@ public class _XWindow extends MultiMethodTest { log.println("set object visible..."); oObj.setVisible(true) ; shortWait(); - res = wListener.shown && !wListener.resized && + res = wListener.shown && !wListener.resized && !wListener.hidden && !wListener.moved; result &= res; if (!res) { diff --git a/qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java b/qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java index 197ec80110e8..4cd54d7ae8e4 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java index cc21a2828db0..d6ff1ce97dd9 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ import lib.MultiMethodTest; public class _XMutableTreeDataModel extends MultiMethodTest { public XMutableTreeDataModel oObj = null; - + private XMutableTreeNode mNewNode = null; /** @@ -70,26 +70,26 @@ public class _XMutableTreeDataModel extends MultiMethodTest { */ public void _setRoot() { requiredMethod("createNode()") ; - + boolean bOK = true; try { - + oObj.setRoot(mNewNode); } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: while trying to set a new root an IllegalArgumentException was thrown:\n" + ex.toString()); } - + try { - + oObj.setRoot(null); bOK = false; log.println("ERROR: while trying to set a null object as root expected IllegalArgumentException was not thrown."); } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("expected IllegalArgumentException was thrown => ok"); - + } - + tRes.tested("setRoot()", bOK); } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java index e90665889733..1373d97c4904 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,68 +51,68 @@ import lib.StatusException; * @see com.sun.star.awt.tree.XTreeDataModel */ public class _XMutableTreeNode extends MultiMethodTest { - + public XMutableTreeNode oObj = null; - + private int mCount = 0; - + private XMutableTreeNodeCreator nodeCreator = null; - + public static interface XMutableTreeNodeCreator{ public XMutableTreeNode createNode(String name); } - + public void before(){ nodeCreator = (XMutableTreeNodeCreator) tEnv.getObjRelation("XMutableTreeNodeCreator"); if (nodeCreator == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XMutableTreeNodeCreator'")); } - + } - + public void _appendChild(){ boolean bOK = true; - + log.println("try to append a valid node..."); - + XMutableTreeNode myNode = nodeCreator.createNode("myNodeToAppend"); - + try { oObj.appendChild(myNode); } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("ERROR: could not appedn a valid node: " + ex.toString()); bOK = false; } - + log.println("try to append the node a second time..."); try { - + oObj.appendChild(myNode); log.println("ERROR: expected IllegalArgumentException was not thrown => FAILED"); bOK = false; } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("expected IllegalArgumentException was thrown => OK"); } - + log.println("try to append the object itself..."); try { - + oObj.appendChild(oObj); log.println("ERROR: expected IllegalArgumentException was not thrown => FAILED"); bOK = false; } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("expected IllegalArgumentException was thrown => OK"); } - + tRes.tested("appendChild()", bOK); } - + public void _insertChildByIndex(){ boolean bOK = true; XMutableTreeNode myNode = nodeCreator.createNode("myNodeToInsert"); - + try { log.println("try to insert a valid node..."); oObj.insertChildByIndex(0, myNode); @@ -123,7 +123,7 @@ public class _XMutableTreeNode extends MultiMethodTest { log.println("ERROR: could not insert a valid node on index '0': " + ex.toString()); bOK = false; } - + try { log.println("try to insert a valid node a second time..."); oObj.insertChildByIndex(0, myNode); @@ -137,7 +137,7 @@ public class _XMutableTreeNode extends MultiMethodTest { } XMutableTreeNode myNode2 = nodeCreator.createNode("myNodeToInsert2"); - + try { log.println("try to insert a valid node on invalid index '-3'..."); oObj.insertChildByIndex(-3, myNode2); @@ -149,7 +149,7 @@ public class _XMutableTreeNode extends MultiMethodTest { } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { log.println("Expected IndexOutOfBoundsException was thrown => OK"); } - + try { log.println("try to insert the object itself..."); oObj.insertChildByIndex(0, oObj); @@ -164,12 +164,12 @@ public class _XMutableTreeNode extends MultiMethodTest { tRes.tested("insertChildByIndex()", bOK); } - + public void _removeChildByIndex(){ - + requiredMethod("insertChildByIndex()"); boolean bOK = true; - + try { log.println("try to remove node at index '0'..."); oObj.removeChildByIndex(0); @@ -177,7 +177,7 @@ public class _XMutableTreeNode extends MultiMethodTest { log.println("ERROR: IndexOutOfBoundsException was thrown => FAILED"); bOK = false; } - + try { log.println("try to remove node at invalid index '-3'"); oObj.removeChildByIndex(-3); @@ -188,88 +188,88 @@ public class _XMutableTreeNode extends MultiMethodTest { } tRes.tested("removeChildByIndex()", bOK); } - + public void _setHasChildrenOnDemand(){ boolean bOK = true; - + log.println("setHasChildrenOnDemand(true)"); oObj.setHasChildrenOnDemand(true); - + log.println("setHasChildrenOnDemand(false)"); oObj.setHasChildrenOnDemand(false); - + tRes.tested("setHasChildrenOnDemand()", bOK); } - + public void _setDisplayValue(){ boolean bOK = true; - + log.println("setDisplayValue(\"MyTestValue\")"); oObj.setDisplayValue("MyTestValue"); log.println("setDisplayValue(null)"); oObj.setDisplayValue(null); - + log.println("oObj.setDisplayValue(oObj)"); oObj.setDisplayValue(oObj); - + tRes.tested("setDisplayValue()", bOK); } - + public void _setNodeGraphicURL(){ boolean bOK = true; - + log.println("setNodeGraphicURL(\"MyTestURL\")"); oObj.setNodeGraphicURL("MyTestURL"); - + log.println("setNodeGraphicURL(null)"); oObj.setNodeGraphicURL(null); - + tRes.tested("setNodeGraphicURL()", bOK); } - + public void _setExpandedGraphicURL(){ boolean bOK = true; - + log.println("setExpandedGraphicURL(\"myExpandedURL\")"); oObj.setExpandedGraphicURL("myExpandedURL"); - + log.println("setExpandedGraphicURL(null)"); oObj.setExpandedGraphicURL(null); - + tRes.tested("setExpandedGraphicURL()", bOK); } - + public void _setCollapsedGraphicURL(){ boolean bOK = true; - + log.println("setCollapsedGraphicURL(\"myCollapsedURL\")"); oObj.setCollapsedGraphicURL("myCollapsedURL"); - + log.println("setCollapsedGraphicURL(null)"); oObj.setCollapsedGraphicURL(null); - + tRes.tested("setCollapsedGraphicURL()", bOK); } - + public void _DataValue(){ boolean bOK = true; - + log.println("setDataValue(\"myDataValue\")"); oObj.setDataValue("myDataValue"); - + String sDataValue = (String) oObj.getDataValue(); - + if ( ! sDataValue.equals("myDataValue")) { log.println("ERROR: getDataVlaue does not return the value which is inserted before:\n" + "\texpected: myDataValue\n" + "\tgot: " + sDataValue); bOK = false; } - + log.println("setDataValue(null)"); oObj.setDataValue(null); - + Object oDataValue = oObj.getDataValue(); if ( oDataValue != null) { log.println("ERROR: getDataVlaue does not return the value which is inserted before:\n" + @@ -277,10 +277,10 @@ public class _XMutableTreeNode extends MultiMethodTest { "\tgot: " + oDataValue.toString()); bOK = false; } - + log.println("oObj.setDisplayValue(oObj)"); oObj.setDisplayValue(oObj); - + oDataValue = oObj.getDataValue(); if ( oDataValue != null) { log.println("ERROR: getDataVlaue does not return the value which is inserted before:\n" + @@ -288,8 +288,8 @@ public class _XMutableTreeNode extends MultiMethodTest { "\tgot: " + oDataValue.toString()); bOK = false; } - + tRes.tested("DataValue()", bOK); } - + } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index 600298aea9e9..fa327967ceb7 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,41 +67,41 @@ import lib.StatusException; * @see com.sun.star.awt.tree.XTreeControl */ public class _XTreeControl extends MultiMethodTest { - + public XTreeControl oObj = null; - + private XMutableTreeNode mNewNode = null; - + private XMutableTreeNode mXNode = null; - + XTreeExpansionListener mTreeExpansionListener1 = new TreeExpansionListenerImpl1(); - + XTreeExpansionListener mTreeExpansionListener2 = new TreeExpansionListenerImpl2(); - + XTreeEditListener mTreeEditListener1 = new TreeEditListenerImpl1(); - + XTreeEditListener mTreeEditListener2 = new TreeEditListenerImpl2(); - + boolean mTreeExpanded1 = false; boolean mTreeExpanding1 = false; boolean mTreeCollapsed1 = false; boolean mTreeCollapsing1 = false; - + boolean mTreeExpanded2 = false; boolean mTreeExpanding2 = false; boolean mTreeCollapsed2 = false; boolean mTreeCollapsing2 = false; - + boolean mTreeNodeEditing1 = false; boolean mTreeNodeEdit1 = false; - + boolean mTreeNodeEditing2 = false; boolean mTreeNodeEdit2 = false; - + public static interface XTreeDataModelListenerEvent{ public void fireEvent(); } - + public class TreeExpansionListenerImpl1 implements XTreeExpansionListener{ public void requestChildNodes(TreeExpansionEvent treeExpansionEvent) { log.println("event at ExpansionListener 1: requestChildNodes"); @@ -131,7 +131,7 @@ public class _XTreeControl extends MultiMethodTest { log.println("event at ExpansionListener 1: disposing"); } } - + public class TreeExpansionListenerImpl2 implements XTreeExpansionListener{ public void requestChildNodes(TreeExpansionEvent treeExpansionEvent) { log.println("event at ExpansionListener 2: requestChildNodes"); @@ -160,9 +160,9 @@ public class _XTreeControl extends MultiMethodTest { public void disposing(EventObject eventObject) { log.println("event at ExpansionListener 2: disposing"); } - + } - + public class TreeEditListenerImpl1 implements XTreeEditListener{ public void nodeEditing(XTreeNode xTreeNode) throws VetoException { log.println("event at EditListener 1: nodeEditing"); @@ -178,7 +178,7 @@ public class _XTreeControl extends MultiMethodTest { log.println("event at EditListener 1: disposing"); } } - + public class TreeEditListenerImpl2 implements XTreeEditListener{ public void nodeEditing(XTreeNode xTreeNode) throws VetoException { log.println("event at EditListener 2: nodeEditing"); @@ -195,7 +195,7 @@ public class _XTreeControl extends MultiMethodTest { log.println("event at EditListener 2: disposing"); } } - + private void resetTreeExpandingListener(){ mTreeExpanded1 = false; mTreeExpanded2 = false; @@ -206,42 +206,42 @@ public class _XTreeControl extends MultiMethodTest { mTreeCollapsing1 = false; mTreeCollapsing2 = false; } - + private void resetEditListener(){ mTreeNodeEditing1 = false; mTreeNodeEdit1 = false; mTreeNodeEditing2 = false; mTreeNodeEdit2 = false; } - + public void before(){ mXNode = (XMutableTreeNode) tEnv.getObjRelation("XTreeControl_Node"); if (mXNode == null) { throw new StatusException(Status.failed("ERROR: could not get object relation 'XTreeControl_Node'")); } } - + public void _isNodeExpanded() throws ExpandVetoException{ boolean bOK = true; boolean isExpanded = false; - + try { isExpanded = oObj.isNodeExpanded(mXNode); log.println("node is expanded: " + isExpanded); - + } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: could not query for 'isNodeExpanded()': " + ex.toString()); } - - if (isExpanded) + + if (isExpanded) try { - + log.println("try to collapse node..."); oObj.collapseNode(mXNode); - + } catch (ExpandVetoException ex) { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); @@ -249,12 +249,12 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - else + else try { - + log.println("try to expand node..."); oObj.expandNode(mXNode); - + } catch (ExpandVetoException ex) { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); @@ -262,44 +262,44 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); } - + try { - + boolean isAlsoExpanded = oObj.isNodeExpanded(mXNode); - + bOK &= (isExpanded != isAlsoExpanded); - + log.println("node is expanded: " + isAlsoExpanded + " => " + bOK); } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: could not query for 'isNodeExpanded()': " + ex.toString()); } - + tRes.tested("isNodeExpanded()", bOK); - + } public void _isNodeCollapsed(){ - + boolean bOK = true; boolean isCollapsed = false; - + try { isCollapsed = oObj.isNodeCollapsed(mXNode); log.println("node is Collapsed: " + isCollapsed); - + } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: could not query for 'isNodeCollapsed()': " + ex.toString()); } - - if ( ! isCollapsed) + + if ( ! isCollapsed) try { - + log.println("try to collapse node..."); oObj.collapseNode(mXNode); - + } catch (ExpandVetoException ex) { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); @@ -307,12 +307,12 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - else + else try { - + log.println("try to expand node..."); oObj.expandNode(mXNode); - + } catch (ExpandVetoException ex) { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); @@ -320,28 +320,28 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); } - + try { - + boolean isAlsoCollapsed = oObj.isNodeCollapsed(mXNode); - + bOK &= (isCollapsed != isAlsoCollapsed); - + log.println("node is Collapsed: " + isAlsoCollapsed + " => " + bOK); } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: could not query for 'isNodeCollapsed()': " + ex.toString()); } - + tRes.tested("isNodeCollapsed()", bOK); - + } public void _makeNodeVisible(){ - + boolean bOK = true; try { - + oObj.makeNodeVisible(mXNode); } catch (ExpandVetoException ex) { bOK = false; @@ -351,53 +351,53 @@ public class _XTreeControl extends MultiMethodTest { log.println("ERROR: could not call method 'makeNodeVisible()' successfully: " + ex.toString()); } try { - + bOK &= oObj.isNodeVisible(mXNode); } catch (com.sun.star.lang.IllegalArgumentException ex) { bOK = false; log.println("ERROR: could not call method 'isNodeVisible()' successfully: " + ex.toString()); } - + tRes.tested("makeNodeVisible()", bOK); - + } public void _isNodeVisible(){ - + this.requiredMethod("makeNodeVisible()"); boolean bOK = true; log.println("since required method 'makeNodeVisible()' uses method 'isNodeVisible()' this test is ok."); tRes.tested("isNodeVisible()", bOK); - + } - + public void _expandNode(){ - + this.requiredMethod("isNodeExpanded()"); - + boolean bOK = true; log.println("since required method 'isnodeExpanded()' uses method 'expandNode()' this test is ok."); tRes.tested("expandNode()", bOK); - + } - + public void _collapseNode(){ - + this.requiredMethod("isNodeCollapsed()"); - + boolean bOK = true; log.println("since required method 'isnodeCollapsed()' uses method 'expandNode()' this test is ok."); tRes.tested("collapseNode()", bOK); - + } - + public void _addTreeExpansionListener(){ - + boolean bOK = true; - + log.println("collapse Node to get an initial status..."); try { - + oObj.collapseNode(mXNode); } catch (ExpandVetoException ex) { bOK = false; @@ -406,15 +406,15 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - + log.println("add mTreeExpansionListener1..."); oObj.addTreeExpansionListener(mTreeExpansionListener1); - + log.println("add mTreeExpansionListener2"); oObj.addTreeExpansionListener(mTreeExpansionListener2); - - resetTreeExpandingListener(); - + + resetTreeExpandingListener(); + log.println("expand Node..."); try { @@ -427,15 +427,15 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); } - + bOK &= mTreeExpanded1 & mTreeExpanded2 & ! mTreeCollapsed1 & ! mTreeCollapsed2 & mTreeExpanding1 & mTreeExpanding2 & ! mTreeCollapsing1 & ! mTreeCollapsing2; - - resetTreeExpandingListener(); - + + resetTreeExpandingListener(); + log.println("collapse Node..."); try { - + oObj.collapseNode(mXNode); } catch (ExpandVetoException ex) { bOK = false; @@ -444,23 +444,23 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - + bOK &= ! mTreeExpanded1 & ! mTreeExpanded2 & mTreeCollapsed1 & mTreeCollapsed2 & ! mTreeExpanding1 & ! mTreeExpanding2 & mTreeCollapsing1 & mTreeCollapsing2; - + tRes.tested("addTreeExpansionListener()", bOK); - + } - + public void _removeTreeExpansionListener(){ - + this.requiredMethod("addTreeExpansionListener()"); - + boolean bOK = true; - + log.println("collapse Node to get an initial status..."); try { - + oObj.collapseNode(mXNode); } catch (ExpandVetoException ex) { bOK = false; @@ -469,12 +469,12 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - + resetTreeExpandingListener(); - + log.println("remove mTreeExpansionListener2 ..."); oObj.removeTreeExpansionListener(mTreeExpansionListener2); - + log.println("expand Node..."); try { @@ -487,15 +487,15 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not expand node: " + ex.toString()); } - + bOK &= mTreeExpanded1 & ! mTreeExpanded2 & ! mTreeCollapsed1 & ! mTreeCollapsed2 & mTreeExpanding1 & ! mTreeExpanding2 & ! mTreeCollapsing1 & ! mTreeCollapsing2; - - resetTreeExpandingListener(); - + + resetTreeExpandingListener(); + log.println("collapse Node..."); try { - + oObj.collapseNode(mXNode); } catch (ExpandVetoException ex) { bOK = false; @@ -504,166 +504,166 @@ public class _XTreeControl extends MultiMethodTest { bOK = false; log.println("ERROR: could not collapse node: " + ex.toString()); } - + bOK &= ! mTreeExpanded1 & ! mTreeExpanded2 & mTreeCollapsed1 & ! mTreeCollapsed2 & ! mTreeExpanding1 & ! mTreeExpanding2 & mTreeCollapsing1 & ! mTreeCollapsing2; - + log.println("remove mTreeExpansionListener2 ..."); oObj.removeTreeExpansionListener(mTreeExpansionListener2); - + tRes.tested("removeTreeExpansionListener()", bOK); - + } - + public void _getNodeForLocation(){ - + boolean bOK = false; - - + + tRes.tested("getNodeForLocation()", bOK); - + } - + public void _getClosestNodeForLocation(){ - + boolean bOK = false; - + log.println("try to get Node for location 100,100"); XTreeNode myNode = oObj.getClosestNodeForLocation(100,100); - + bOK &= (myNode != null); - + tRes.tested("getClosestNodeForLocation()", bOK); - + } - + public void _isEditing(){ - + boolean bOK = false; - + log.println("not ready because of i78701"); - + tRes.tested("isEditing()", bOK); - + } - + public void _stopEditing(){ - + boolean bOK = false; log.println("not ready because of i78701"); - - + + tRes.tested("stopEditing()", bOK); - + } - + public void _cancelEditing(){ - + boolean bOK = false; - + log.println("not ready because of i78701"); - + tRes.tested("cancelEditing()", bOK); - + } - + public void _startEditingAtNode(){ - + boolean bOK = false; - + log.println("not ready because of i78701"); - + tRes.tested("startEditingAtNode()", bOK); - + } - + public void _addTreeEditListener(){ - + boolean bOK = true; - + log.println("add EditListener 1...."); oObj.addTreeEditListener(mTreeEditListener1); - + log.println("add EditListener 2...."); oObj.addTreeEditListener(mTreeEditListener2); - + resetEditListener(); - + try { - + oObj.startEditingAtNode(mXNode); } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("ERROR: could not start editing at node: " + ex.toString()); bOK = false; } - + log.println("not ready because of i78701"); bOK = false; - - + + tRes.tested("addTreeEditListener()", bOK); - + } - + public void _removeTreeEditListener(){ - + boolean bOK = false; - + log.println("not ready because of i78701"); - + tRes.tested("removeTreeEditListener()", bOK); - + } - + public void _DefaultExpandedGraphicURL(){ - + boolean bOK = true; - + String current = oObj.getDefaultExpandedGraphicURL(); log.println("current DefaultExpandedGraphicURL: " + current); - + String changeUrl = null; - - if (current.equals("private:graphicrepository/sd/res/triangle_right.png")) + + if (current.equals("private:graphicrepository/sd/res/triangle_right.png")) changeUrl = "private:graphicrepository/sd/res/triangle_down.png"; else changeUrl = "private:graphicrepository/sd/res/triangle_right.png"; log.println("try to set '" + changeUrl + "' as new DefaultExpandedGraphicURL"); - + oObj.setDefaultExpandedGraphicURL(changeUrl); - + String newUrl = oObj.getDefaultExpandedGraphicURL(); - + log.println("new DefaultExpandedGraphicURL: " + newUrl); - + bOK &= ! newUrl.equals(current); - + tRes.tested("DefaultExpandedGraphicURL()", bOK); - + } - + public void _DefaultCollapsedGraphicURL(){ - + boolean bOK = true; - + String current = oObj.getDefaultCollapsedGraphicURL(); log.println("current DefaultCollapsedGraphicURL: " + current); String changeUrl = null; - - if (current.equals("private:graphicrepository/sd/res/triangle_right.png")) + + if (current.equals("private:graphicrepository/sd/res/triangle_right.png")) changeUrl = "private:graphicrepository/sd/res/triangle_down.png"; else changeUrl = "private:graphicrepository/sd/res/triangle_right.png"; log.println("try to set '" + changeUrl + "' as new DefaultCollapsedGraphicURL"); oObj.setDefaultCollapsedGraphicURL(changeUrl); - + String newUrl = oObj.getDefaultCollapsedGraphicURL(); - + log.println("new DefaultCollapsedGraphicURL: " + newUrl); - + bOK &= ! newUrl.equals(current); - + tRes.tested("DefaultCollapsedGraphicURL()", bOK); } } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java index c2a98b744bae..340523ee0b9d 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,80 +49,80 @@ import lib.StatusException; * @see com.sun.star.awt.tree.XTreeDataModel */ public class _XTreeDataModel extends MultiMethodTest { - + public XTreeDataModel oObj = null; - + private XMutableTreeNode mNewNode = null; - + XTreeDataModelListener mListener1 = new myEventListener1(); - + XTreeDataModelListener mListener2 = new myEventListener2(); - + XTreeDataModelListenerEvent mListenerEvent = null; - + boolean mTreeStructureChanged1 = false; - + boolean mTreeStructureChanged2 = false; - + public static interface XTreeDataModelListenerEvent{ public void fireEvent(); } - + public class myEventListener1 implements XTreeDataModelListener{ public void treeNodesChanged(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 1: treeNodesChanged"); } - + public void treeNodesInserted(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 1: treeNodesInserted"); } - + public void treeNodesRemoved(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 1: treeNodesRemoved"); } - + public void treeStructureChanged(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 1: treeStructureChanged"); mTreeStructureChanged1 = true; } - + public void disposing(EventObject eventObject) { log.println("Listener 1: disposing"); } } - + public class myEventListener2 implements XTreeDataModelListener{ public void treeNodesChanged(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 2: treeNodesChanged"); } - + public void treeNodesInserted(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 2: treeNodesInserted"); } - + public void treeNodesRemoved(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 2: treeNodesRemoved"); } - + public void treeStructureChanged(TreeDataModelEvent treeDataModelEvent) { log.println("Listener 2: treeStructureChanged"); mTreeStructureChanged2 = true; } - + public void disposing(EventObject eventObject) { log.println("Listener 2: disposing"); } - + } - + public void before(){ mListenerEvent = (XTreeDataModelListenerEvent) tEnv.getObjRelation("XTreeDataModelListenerEvent"); if (mListenerEvent == null) { - throw new StatusException(Status.failed("ERROR: could not get object relation 'XTreeDataModelListenerEvent'\n" + + throw new StatusException(Status.failed("ERROR: could not get object relation 'XTreeDataModelListenerEvent'\n" + "This object relation must be kind of 'ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent'")); } } - + /** * Gets the title and compares it to the value set in * <code>setTitle</code> method test. <p> @@ -133,50 +133,50 @@ public class _XTreeDataModel extends MultiMethodTest { * </ul> */ public void _getRoot() { - + boolean bOK = true; XTreeNode root = oObj.getRoot(); - + tRes.tested("getRoot()", bOK); - + } - + public void _addTreeDataModelListener(){ - + boolean bOK = true; - + log.println("add listener 1 to object..."); oObj.addTreeDataModelListener(mListener1); - + log.println("add listener 2 to object..."); oObj.addTreeDataModelListener(mListener2); - + mTreeStructureChanged1 = false; mTreeStructureChanged2 = false; - + mListenerEvent.fireEvent(); - + bOK = mTreeStructureChanged1 & mTreeStructureChanged2; - + tRes.tested("addTreeDataModelListener()", bOK); } - + public void _removeTreeDataModelListener(){ - + boolean bOK = true; - + log.println("remove listener 2 from object..."); oObj.removeTreeDataModelListener(mListener2); - + mTreeStructureChanged1 = false; mTreeStructureChanged2 = false; - + mListenerEvent.fireEvent(); - + bOK = mTreeStructureChanged1 & ! mTreeStructureChanged2; - + tRes.tested("removeTreeDataModelListener()", bOK); - + } } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java index e1eba75eb497..f7a6424c6152 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,44 +51,44 @@ import lib.StatusException; * @see com.sun.star.awt.tree.XTreeDataModel */ public class _XTreeNode extends MultiMethodTest { - + public XTreeNode oObj = null; - + private int mCount = 0; - + String msDisplayValue = null; String msExpandedGraphicURL = null; String msCollapsedGraphicURL = null; String msNodeGraphicURL = null; - - + + public void before(){ msDisplayValue = (String) tEnv.getObjRelation("XTreeNode_DisplayValue"); if (msDisplayValue == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_DisplayVlaue'")); } - + msExpandedGraphicURL = (String) tEnv.getObjRelation("XTreeNode_ExpandedGraphicURL"); if (msExpandedGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_ExpandedGraphicURL'")); } - + msCollapsedGraphicURL = (String) tEnv.getObjRelation("XTreeNode_CollapsedGraphicURL"); if (msCollapsedGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_CollapsedGraphicURL'")); } - + msNodeGraphicURL = (String) tEnv.getObjRelation("XTreeNode_NodeGraphicURL"); if(msNodeGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_NodeGraphicURL'")); } - + } - + /** * Gets the title and compares it to the value set in * <code>setTitle</code> method test. <p> @@ -101,7 +101,7 @@ public class _XTreeNode extends MultiMethodTest { public void _getChildAt(){ this.requiredMethod("getChildCount()"); boolean bOK = true; - + for (int i=0; i < mCount ; i++){ XTreeNode xNode = null; try { @@ -114,13 +114,13 @@ public class _XTreeNode extends MultiMethodTest { bOK = false; } } - + tRes.tested("getChildAt()", bOK); } - - + + public void _getChildCount(){ - + boolean bOK = true; mCount = oObj.getChildCount(); log.println("got count '" + mCount + "' of children"); @@ -130,11 +130,11 @@ public class _XTreeNode extends MultiMethodTest { } tRes.tested("getChildCount()", bOK); } - - + + public void _getParent(){ this.requiredMethod("getChildAt()"); - + boolean bOK = true; XTreeNode xNode = null; try { @@ -143,20 +143,20 @@ public class _XTreeNode extends MultiMethodTest { } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { log.println("ERROR: getChildAt(0): " + ex.toString()); } - + log.println("try to get parrent of children"); XTreeNode xParrent = xNode.getParent(); - - + + bOK = oObj.equals(xParrent); log.println("original object and parrent should be the same: " + bOK); tRes.tested("getParent()", bOK); } - - + + public void _getIndex(){ this.requiredMethod("getChildAt()"); - + boolean bOK = true; XTreeNode xNode = null; try { @@ -165,57 +165,57 @@ public class _XTreeNode extends MultiMethodTest { } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { log.println("ERROR: getChildAt(0): " + ex.toString()); } - + log.println("try to get index from child..."); int index = oObj.getIndex(xNode); - + if (index != 0){ log.println("ERROR: getIndex() does not return '0' => FAILED"); bOK = false; } - + tRes.tested("getIndex()", bOK); } - - + + public void _hasChildrenOnDemand(){ - + boolean bOK = true; - + bOK = oObj.hasChildrenOnDemand(); tRes.tested("hasChildrenOnDemand()", bOK); } - - + + public void _getDisplayValue(){ - + boolean bOK = true; String DisplayValue = null; Object dispVal = oObj.getDisplayValue(); - + try { DisplayValue = AnyConverter.toString(dispVal); } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("ERROR: could not convert the returned object of 'getDisplyValue()' " + "to String with AnyConverter: " + ex.toString()); } - + if ( ! this.msDisplayValue.equals(DisplayValue)){ log.println("ERROR: getNodeGraphicURL() does not return expected value:\n" + "\tExpected: " + this.msDisplayValue +"\n" + "\tGot: " + DisplayValue); bOK = false; } - + tRes.tested("getDisplayValue()", bOK); } - - + + public void _getNodeGraphicURL(){ - + boolean bOK = true; String graphicURL = oObj.getNodeGraphicURL(); - + if ( ! this.msNodeGraphicURL.equals(graphicURL)){ log.println("ERROR: getNodeGraphicURL() does not return expected value:\n" + "\tExpected: " + this.msNodeGraphicURL +"\n" + @@ -224,38 +224,38 @@ public class _XTreeNode extends MultiMethodTest { } tRes.tested("getNodeGraphicURL()", bOK); } - - + + public void _getExpandedGraphicURL(){ - + boolean bOK = true; String ExpandedGraphicURL = oObj.getExpandedGraphicURL(); - + if ( ! this.msExpandedGraphicURL.equals(ExpandedGraphicURL)){ log.println("ERROR: getExpandedGraphicURL() does not return expected value:\n" + "\tExpected: " + this.msExpandedGraphicURL +"\n" + "\tGot: " + ExpandedGraphicURL); bOK = false; } - + tRes.tested("getExpandedGraphicURL()", bOK); } - - + + public void _getCollapsedGraphicURL(){ - + boolean bOK = true; - + String CollapsedGraphicURL = oObj.getCollapsedGraphicURL(); - + if ( ! this.msCollapsedGraphicURL.equals(CollapsedGraphicURL)){ log.println("ERROR: getExpandedGraphicURL() does not return expected value:\n" + "\tExpected: " + this.msCollapsedGraphicURL +"\n" + "\tGot: " + CollapsedGraphicURL); bOK = false; } - + tRes.tested("getCollapsedGraphicURL()", bOK); } - + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/beans/_XExactName.java b/qadevOOo/tests/java/ifc/beans/_XExactName.java index 805510ca93e0..467980f3e66b 100644 --- a/qadevOOo/tests/java/ifc/beans/_XExactName.java +++ b/qadevOOo/tests/java/ifc/beans/_XExactName.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index d4d29cfb4354..7ee65e44ae09 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java index 43cd9bffb43a..a62e5b56dd7d 100644 --- a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class _XHierarchicalPropertySet extends MultiMethodTest { } else { log.println( "The component doesn't provide HierarchicalPropertySetInfo"); - tRes.tested("getHierarchicalPropertySetInfo()", + tRes.tested("getHierarchicalPropertySetInfo()", Status.skipped(true)); return; @@ -111,7 +111,7 @@ public class _XHierarchicalPropertySet extends MultiMethodTest { //reset Value oObj.setHierarchicalPropertyValue(pNames[k], oldValue); - + res &= localRes; } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("Property is unknown"); @@ -122,7 +122,7 @@ public class _XHierarchicalPropertySet extends MultiMethodTest { } catch (com.sun.star.lang.WrappedTargetException e) { log.println("WrappedTarget "+e.getMessage()); } - + } tRes.tested("setHierarchicalPropertyValue()", res); diff --git a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java index 0ba091c50309..a1a29d48d624 100644 --- a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java +++ b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java index b9348befa147..5eedf06029f1 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest { } else { log.println( "The component doesn't provide HierarchicalPropertySetInfo"); - tRes.tested("getHierarchicalPropertySetInfo()", + tRes.tested("getHierarchicalPropertySetInfo()", Status.skipped(true)); return; @@ -78,7 +78,7 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest { if (ro != null) { log.println(ro); - tRes.tested("setHierarchicalPropertyValues()", + tRes.tested("setHierarchicalPropertyValues()", Status.skipped(true)); return; @@ -100,7 +100,7 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest { Object[] getValues = oObj.getHierarchicalPropertyValues(pNames); for (int k = 0; k < pNames.length; k++) { - boolean localRes = ValueComparer.equalValue(getValues[k], + boolean localRes = ValueComparer.equalValue(getValues[k], newValues[k]); if (!localRes) { diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 27948c941f9b..ab71b24327f3 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,7 +177,7 @@ public class _XMultiPropertySet extends MultiMethodTest { boolean result = true ; // Creating listener oObj.addPropertiesChangeListener(testPropsNames, PClistener); - + if ((testPropsAmount==1) && (testPropsNames[0].equals("none"))) { testPropsAmount = 0; } @@ -278,15 +278,15 @@ public class _XMultiPropertySet extends MultiMethodTest { log.println("all properties are readOnly"); tRes.tested("setPropertyValues()",Status.skipped(true)); return; - } - + } + log.println("Changing all properties"); Object[] gValues = oObj.getPropertyValues(testPropsNames); for (int i=0; i<testPropsAmount;i++) { Object oldValue = gValues[i]; Object newValue = ValueChanger.changePValue(oldValue); gValues[i] = newValue; - } + } try { oObj.setPropertyValues(testPropsNames, gValues); @@ -329,7 +329,7 @@ public class _XMultiPropertySet extends MultiMethodTest { boolean isBound = ((property.Attributes & PropertyAttribute.BOUND) != 0); boolean isExcluded = exclProps.contains(name); - + //exclude UserDefined, because we can't change XNameContainer if (name.indexOf("UserDefined")>0 || name.indexOf("Device")>0) { isWritable=false; diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java index 552a012f1161..601450c715ea 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { log.print("}"); log.println(""); } - + /** * Test calls the method and checks return value. @@ -120,14 +120,14 @@ public class _XMultiPropertyStates extends MultiMethodTest { // searching for property which currently don't have default value // and preferable has MAYBEDEFAULT attr // if no such properties are found then the first one is selected - + String ro = (String) tEnv.getObjRelation("allReadOnly"); if (ro != null) { log.println(ro); tRes.tested("setPropertiesToDefault()",Status.skipped(true)); return; } - + boolean mayBeDef = false; String propName = names[0]; @@ -140,7 +140,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { Property prop = null; try { prop = xPropSetInfo.getPropertyByName(names[i]); - } + } catch(com.sun.star.beans.UnknownPropertyException e) { log.println("couldn't get property info: " + e.toString()); throw new StatusException(Status.failed @@ -193,7 +193,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { oObj.setAllPropertiesToDefault(); } catch(RuntimeException e) { log.println("Ignore Runtime Exception: " + e.getMessage()); - } + } log.println("Checking that all properties are now in DEFAULT state" + " excepting may be those which 'cann't be default'"); diff --git a/qadevOOo/tests/java/ifc/beans/_XProperty.java b/qadevOOo/tests/java/ifc/beans/_XProperty.java index a37a6c705b6e..2db3114d856d 100644 --- a/qadevOOo/tests/java/ifc/beans/_XProperty.java +++ b/qadevOOo/tests/java/ifc/beans/_XProperty.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java index 37b835431b8d..3a6de40053cc 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,12 +46,12 @@ import lib.StatusException; * @see com.sun.star.beans.XPropertyAccess */ public class _XPropertyAccess extends MultiMethodTest { - + /** * oObj filled by MultiMethodTest */ public XPropertyAccess oObj = null;// oObj filled by MultiMethodTest - + /** * object relation X<CODE>PropertyAccess.propertyToChange</CODE><br> * This relation must be filled from the module. It contains a property which must @@ -59,7 +59,7 @@ public class _XPropertyAccess extends MultiMethodTest { * <CODE>setPropertyValues()</CODE> */ public PropertyValue propertyToChange = null; - + /** * checks if the object relation <CODE>XPropertyAccess.propertyToChange</CODE> * is available @@ -70,18 +70,18 @@ public class _XPropertyAccess extends MultiMethodTest { throw new StatusException(Status.failed("Object raltion 'XPropertyAccess.propertyToChange' is null")); } } - + /** * Test calls the method and checks if the returned sequenze contanis a propterty which is named * in the object relation <code>XPropertyAccess.propertyToChange</code>. */ public void _getPropertyValues() { PropertyValue[] properties = oObj.getPropertyValues(); - + boolean ok = true; - + if (properties != null){ - + boolean found = false; for (int i=0; i < properties.length; i++){ if (properties[i].Name.equals(propertyToChange.Name)) found = true; @@ -90,16 +90,16 @@ public class _XPropertyAccess extends MultiMethodTest { log.println("ERROR: could not find desired property '"+ propertyToChange.Name+"'"); ok=false; } - + } else { log.println("ERROR: the method returned NULL"); ok =false; } - + tRes.tested("getPropertyValues()", ok ); return; } - + /** * Test calls the method and checks if: * <ul> @@ -112,18 +112,18 @@ public class _XPropertyAccess extends MultiMethodTest { * </ul> */ public void _setPropertyValues(){ - + boolean ok = true; boolean test = true; boolean exp = false; - + try { PropertyValue[] newProps = new PropertyValue[1]; newProps[0] = propertyToChange; - + log.println("try to set property vlaues given by object relation 'XPropertyAccess.propertyToChange'..."); oObj.setPropertyValues(newProps); - + } catch (UnknownPropertyException ex) { log.println("ERROR: Exception was thrown while trying to set property value: " + ex.toString()); @@ -141,11 +141,11 @@ public class _XPropertyAccess extends MultiMethodTest { ex.toString()); test = false; } - + if ( test){ log.println("... OK"); } - + ok &= test; test = false; exp = false; @@ -176,29 +176,29 @@ public class _XPropertyAccess extends MultiMethodTest { ex.toString()); exp = true; } - + if (! exp){ log.println("FAILED: expected exception 'UnknownPropertyException' was not thrown"); } else { if (test) log.println("... OK"); } - + ok &= test; test = false; exp = false; try { - + log.println("try to set values with invalid property name. " + "Expect 'com.sun.star.beans.UnknownPropertyException'..."); - + PropertyValue[] newProps = new PropertyValue[1]; PropertyValue newProp = new PropertyValue(); newProp.Name = "XPropertyAccess.InvalidPropertyName"; newProp.Value = "invalid property"; newProps[0] = newProp; - + oObj.setPropertyValues(newProps); - + } catch (WrappedTargetException ex) { log.println("ERROR: unexptected exception was thrown while trying to set invalid value: " + ex.toString()); @@ -217,20 +217,20 @@ public class _XPropertyAccess extends MultiMethodTest { exp = true; test = true; } - + ok &= test; - + if (! exp){ log.println("FAILED: expected exception 'UnknownPropertyException' was not thrown"); } else { if (test) log.println("... OK"); } - + tRes.tested("setPropertyValues()", ok); return; - + } - + } /// finish class XPropertyAccess diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java index 3f3803fb329e..fdb57b736158 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,19 +47,19 @@ import lib.StatusException; * @see com.sun.star.beans.XPropertyAccess */ public class _XPropertyContainer extends MultiMethodTest { - + /** * oObj filled by MultiMethodTest */ public XPropertyContainer oObj = null;// oObj filled by MultiMethodTest - + /** * object relation X<CODE>PropertyAccess.propertyNotRemovable</CODE><br> * This relation must be filled from the module. It contains a property which must * be a property of the implementaion object. */ private String propertyNotRemovable = null; - + /** * checks if the object relation <CODE>XPropertyAccess.propertyNotRemovable</CODE> * is available @@ -70,19 +70,19 @@ public class _XPropertyContainer extends MultiMethodTest { throw new StatusException(Status.failed("Object raltion 'XPropertyAccess.propertyNotRemovable' is null")); } } - - - + + + /** * Test calls the method and checks if the returned sequence contanis a propterty which is named * in the object relation <code>XPropertyAccess.propertyNotRemovable</code>. */ public void _addProperty() { - + boolean ok = true; boolean test = true; boolean exp = false; - + try { log.println("try to add following property:\n" + "\t('myXPropertContainerProperty', com.sun.star.beans.PropertyAttribute.MAYBEVOID, null) ..."); @@ -110,7 +110,7 @@ public class _XPropertyContainer extends MultiMethodTest { if ( test){ log.println("... OK"); } - + ok &= test; test = false; exp = false; @@ -144,7 +144,7 @@ public class _XPropertyContainer extends MultiMethodTest { } else { if (test) log.println("... OK"); } - + ok &= test; test = false; exp = false; @@ -173,13 +173,13 @@ public class _XPropertyContainer extends MultiMethodTest { test = true; exp = true; } - + if (! exp){ log.println("FAILED: expected exception 'IllegalTypeException' was not thrown"); } else { if (test) log.println("... OK"); } - + ok &= test; test = false; exp = false; @@ -209,31 +209,31 @@ public class _XPropertyContainer extends MultiMethodTest { log.println("... FAILED"); exp = true; } - + if (! exp){ log.println("FAILED: expected exception 'IllegalArgumentException' was not thrown"); } else { if (test) log.println("... OK"); } - + ok &= test; - + tRes.tested("addProperty()", ok ); return; } - + /** * Test calls the method and checks if the returned sequence contanis a propterty which is named * in the object relation <code>XPropertyAccess.propertyNotRemovable</code>. */ public void _removeProperty() { - - requiredMethod("addProperty()"); - + + requiredMethod("addProperty()"); + boolean ok = true; boolean test = true; boolean exp = false; - + try { log.println("remove 'myXPropertContainerProperty'"); oObj.removeProperty("myXPropertContainerProperty"); @@ -249,11 +249,11 @@ public class _XPropertyContainer extends MultiMethodTest { if ( test){ log.println("... OK"); } - + ok &= test; test = false; exp=false; - + try { log.println("remove not removeable property '" + propertyNotRemovable + "'") ; oObj.removeProperty(propertyNotRemovable); @@ -269,13 +269,13 @@ public class _XPropertyContainer extends MultiMethodTest { log.println("... FAILED"); exp = true; } - + if (! exp){ log.println("FAILED: expected exception 'NotRemoveableException' was not thrown"); } else { if (test) log.println("... OK"); } - + ok &= test; test = false; exp = false; @@ -303,7 +303,7 @@ public class _XPropertyContainer extends MultiMethodTest { tRes.tested("removeProperty()", ok ); return; - } - - + } + + } /// finish class XPropertyContainer diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java index dfc135843b44..3b06cce03642 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,7 +162,7 @@ public class _XPropertySet extends MultiMethodTest { public void _addPropertyChangeListener() { requiredMethod("getPropertySetInfo()"); - + int count = PTT.bound.size(); if ( count==0 || PTT.bound.get(0).equals("none") ) { log.println("*** No bound properties found ***"); @@ -203,7 +203,7 @@ public class _XPropertySet extends MultiMethodTest { } tRes.tested("addPropertyChangeListener()", !error); } - + return; } // end of addPropertyChangeListener() @@ -353,7 +353,7 @@ public class _XPropertySet extends MultiMethodTest { } return runOk; } - + /** * Tests <code>getPropertyValue</code> method. * Just call this method and checks for no exceptions <p> @@ -371,7 +371,7 @@ public class _XPropertySet extends MultiMethodTest { int count = PTT.normal.size(); if ( count==0 || PTT.normal.get(0).equals("none") ) { - Property[] properties = oObj.getPropertySetInfo().getProperties(); + Property[] properties = oObj.getPropertySetInfo().getProperties(); if( properties.length > 0 ) { String propertyName = properties[0].Name; log.println("All properties are Read Only"); @@ -420,7 +420,7 @@ public class _XPropertySet extends MultiMethodTest { log.println("*** No bound properties found ***"); tRes.tested("removePropertyChangeListener()", true) ; } else { - + //remove all listeners first for (int i = 0; i < count; i++) { String propertyName = PTT.bound.get(i); @@ -432,7 +432,7 @@ public class _XPropertySet extends MultiMethodTest { e.printStackTrace(log); } } - + boolean error = false; for (int i = 0; i < count; i++) { String propertyName = PTT.bound.get(i); @@ -496,7 +496,7 @@ public class _XPropertySet extends MultiMethodTest { log.println("*** No constrained properties found ***"); tRes.tested("removeVetoableChangeListener()", true) ; } else { - + //remove all listeners first for (int i = 0; i < count; i++) { String propertyName = PTT.constrained.get(i); @@ -508,7 +508,7 @@ public class _XPropertySet extends MultiMethodTest { e.printStackTrace(log); } } - + boolean error = false; for (int i = 0; i < count; i++) { String propertyName = PTT.constrained.get(i); @@ -563,7 +563,7 @@ public class _XPropertySet extends MultiMethodTest { Property property = properties[i]; String name = property.Name; - + boolean cont = false; for (int j = 0; j < skip.length; j++) { if (name.equals(skip[j])){ @@ -571,9 +571,9 @@ public class _XPropertySet extends MultiMethodTest { cont = true; } } - + if (cont) continue; - + if (name.equals(oObj)) log.println("Checking '"+name+"'"); boolean isWritable = ((property.Attributes & diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java index ee41be8a79b7..6b696ac52759 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java index ced711b1cf94..677131176ea8 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,12 +153,12 @@ public class _XPropertyState extends MultiMethodTest { */ public void _getPropertyState(){ boolean result = true ; - + String localName = pName; if (localName == null) { localName = (propertySetInfo.getProperties()[0]).Name; - } - + } + try { PropertyState ps = oObj.getPropertyState(localName); if (ps == null) { @@ -181,12 +181,12 @@ public class _XPropertyState extends MultiMethodTest { */ public void _getPropertyStates(){ boolean result = true ; - + String localName = pName; if (localName == null) { localName = (propertySetInfo.getProperties()[0]).Name; - } - + } + try { PropertyState[] ps = oObj.getPropertyStates (new String[] {localName}); @@ -222,7 +222,7 @@ public class _XPropertyState extends MultiMethodTest { */ public void _setPropertyToDefault(){ requiredMethod("getPropertyDefault()") ; - + if (pName == null) { log.println("all found properties are read only"); tRes.tested("setPropertyToDefault()",Status.skipped(true)); diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java index ef89c8448e7d..5f702320fa33 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,67 +47,67 @@ import lib.StatusException; */ public class _XPropertyWithState extends MultiMethodTest { - + /** * the test object */ public XPropertyWithState oObj; - - + + /** - * Test calls the method. - * Test has ok status if no + * Test calls the method. + * Test has ok status if no * <CODE>com.sun.star.lang.WrappedTargetException</CODE> * was thrown */ public void _getDefaultAsProperty() { try{ - + XInterface defaultState = (XInterface) oObj.getDefaultAsProperty(); - + } catch (com.sun.star.lang.WrappedTargetException e){ e.printStackTrace(log); throw new StatusException(Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown")); } - + tRes.tested("getDefaultAsProperty()", true); } - + /** * Test is ok if <CODE>getStateAsProperty()</CODE> returns * as <CODE>PropertyState</CODE> which is not <CODE>null</CODE> */ public void _getStateAsProperty() { - + boolean res = true; - + PropertyState propState = oObj.getStateAsProperty(); - + if (propState == null) { log.println("the returned PropertyState is null -> FALSE"); res = false; } - + tRes.tested("getStateAsProperty()", res); } - + /** - * Test calls the method. - * Test has ok status if no + * Test calls the method. + * Test has ok status if no * <CODE>com.sun.star.lang.WrappedTargetException</CODE> * was thrown */ public void _setToDefaultAsProperty() { try{ - + oObj.setToDefaultAsProperty(); - + } catch (com.sun.star.lang.WrappedTargetException e){ e.printStackTrace(log); throw new StatusException(Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown")); } - + tRes.tested("setToDefaultAsProperty()", true); } - + } diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java index 0d783ad18e97..2d8664f07511 100644 --- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { protected Property[] properties = null; protected XPropertyState pState = null; protected XPropertySet PS = null; - + /* * Queries XPropertySet from the given Component and gets XPropertySetInfo @@ -66,7 +66,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { * Throws a lib StatusException if the Component doesn't support XPropertySet or XPropertyState */ public void before() { - PS = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, + PS = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, tEnv.getTestObject()); if (PS == null) { @@ -89,7 +89,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { /* * Calls the method getDirectPropertyValuesTolerant() and compares the resulting - * sequence with the one gained as direct values in the before() method.<br> + * sequence with the one gained as direct values in the before() method.<br> * Has OK state if both sequences equal. */ public void _getDirectPropertyValuesTolerant() { @@ -147,13 +147,13 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { boolean localres = true; if (!(GPR[i].Value instanceof com.sun.star.uno.Any)) { - localres = ValueComparer.equalValue(GPR[i].Value, + localres = ValueComparer.equalValue(GPR[i].Value, valuesOfProperties[i]); } if (!localres) { - log.println("Values differ for : " + + log.println("Values differ for : " + namesOfProperties[i]); log.println("\t" + GPR[i].Value); log.println("Expected: "); @@ -173,7 +173,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { SetPropertyTolerantFailed[] SPTF = null; try { - SPTF = oObj.setPropertyValuesTolerant(namesOfProperties, + SPTF = oObj.setPropertyValuesTolerant(namesOfProperties, getNewValues( valuesOfProperties)); } catch (com.sun.star.lang.IllegalArgumentException e) { @@ -210,14 +210,14 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { GetPropertyTolerantResult[] GPR = oObj.getPropertyValuesTolerant( namesOfProperties); - if ((!(GPR[i].Value instanceof com.sun.star.uno.Any)) && + if ((!(GPR[i].Value instanceof com.sun.star.uno.Any)) && (SPTF[i].Result == com.sun.star.beans.TolerantPropertySetResultType.SUCCESS)) { - localres = ValueComparer.equalValue(GPR[i].Value, + localres = ValueComparer.equalValue(GPR[i].Value, valuesOfProperties[i]); } if (!localres) { - log.println("Values differ for : " + + log.println("Values differ for : " + namesOfProperties[i]); log.println("\t" + GPR[i].Value); log.println("Expected: "); @@ -271,7 +271,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { if (name.startsWith("MetaFile")) isUsable = false; return isUsable; } - + /* * This method returns a sorted list of property names * contained in a given sequence of properties @@ -297,7 +297,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { } /* - * Returns the values of a given array of properties in an Object array + * Returns the values of a given array of properties in an Object array */ protected Object[] getPropertyValues(String[] propertyNames) { Object[] values = new Object[propertyNames.length]; diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridge.java b/qadevOOo/tests/java/ifc/bridge/_XBridge.java index 98f28bba0236..f6303b558147 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridge.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridge.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index 99f920e92019..58643bc7e9aa 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index 14448c8f742f..8d1e88cbc6e2 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,6 +202,6 @@ public class _XUnoUrlResolver extends MultiMethodTest { log.println("Unexpected exception thrown " + e.getMessage()); e.printStackTrace(log); throw new StatusException("Unexpected exception", e); - } + } } } diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java index f22709df85bc..1972c23dab89 100644 --- a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java index 531ec39478ed..9b1e19c47cc6 100644 --- a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { throw new StatusException("Couldn't change Diagram to 3D", e); } } - + /** * Sets the diagram back to 2D as 2D rendering is much faster for the following tests. */ @@ -126,7 +126,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { throw new StatusException("Couldn't change Diagram back to 2D", e); } } - + } // finish class _Chart3DBarProperties diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java index 7fad534b1948..18c8e7f6dbea 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java index daf1ca3cc122..50915301c92f 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java index 40f6f1663513..51520d6a37a7 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java index 2de116ddb80a..926652c8cf6f 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java index 2ae9ac7fa36b..7307326cf59a 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java index 82dc477efed1..911f12953f2a 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import lib.MultiPropertyTest; * @see com.sun.star.chart.ChartDataRowProperties */ public class _ChartDataRowProperties extends MultiPropertyTest { - + public void _Axis() { try { Integer axis = (Integer) oObj.getPropertyValue("Axis"); @@ -57,7 +57,7 @@ public class _ChartDataRowProperties extends MultiPropertyTest { } catch (Exception e) { e.printStackTrace(log); tRes.tested("Axis",false); - } + } } } diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDocument.java b/qadevOOo/tests/java/ifc/chart/_ChartDocument.java index 0bb5c2cf5e2b..5dd5131b8575 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDocument.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartLegend.java b/qadevOOo/tests/java/ifc/chart/_ChartLegend.java index 33f7f9ce7283..2f1edebc2367 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartLegend.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartLegend.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java index ca1fe56a8b59..92defbad16f7 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java index a44cb3731d57..51373d472446 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java index 7c3176eedb65..1db82215916a 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java index a2ec31aa9145..77d75c1736cb 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java index fa29c50d9b20..bbd20ef25b4a 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_Diagram.java b/qadevOOo/tests/java/ifc/chart/_Diagram.java index a5bc75a98792..1aa0f5d246bc 100644 --- a/qadevOOo/tests/java/ifc/chart/_Diagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Diagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java index a28cf52a48fb..d892776b6027 100644 --- a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index a2555ea26f69..6296be6ddd05 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java index a6bca2a0b131..566e91ecafe8 100644 --- a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java index d76875fe017c..ce883591b50d 100644 --- a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_X3DDisplay.java b/qadevOOo/tests/java/ifc/chart/_X3DDisplay.java index 16553df61ad9..15bbaa57682f 100644 --- a/qadevOOo/tests/java/ifc/chart/_X3DDisplay.java +++ b/qadevOOo/tests/java/ifc/chart/_X3DDisplay.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java index 6e318e0acebc..1c3ac80b8496 100644 --- a/qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java index d5e75fa27131..31eae0e015cc 100644 --- a/qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java b/qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java index 9e7fd3212c53..a05249f118fd 100644 --- a/qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XChartData.java b/qadevOOo/tests/java/ifc/chart/_XChartData.java index 98dad0741509..4113a6c4513f 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartData.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,16 +76,16 @@ public class _XChartData extends MultiMethodTest { dataArray.setData(data); if (!dataChanged[0]) { - log.println("ChartDataChangeEventListener1 " + + log.println("ChartDataChangeEventListener1 " + "isn't called after changing data"); } if (!dataChanged[1]) { - log.println("ChartDataChangeEventListener2 " + + log.println("ChartDataChangeEventListener2 " + "isn't called after changing data"); } - tRes.tested("addChartDataChangeEventListener()", + tRes.tested("addChartDataChangeEventListener()", dataChanged[0] && dataChanged[1]); } @@ -115,11 +115,11 @@ public class _XChartData extends MultiMethodTest { oObj.removeChartDataChangeEventListener(listener2); if (dataChanged[0]) { - log.println("ChartDataChangeEventListener1 is " + + log.println("ChartDataChangeEventListener1 is " + "called after removing listener"); } - tRes.tested("removeChartDataChangeEventListener()", + tRes.tested("removeChartDataChangeEventListener()", ((!dataChanged[0]) && (dataChanged[1]))); } diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java index 1c6b9b8a10f7..173187be7dda 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public class _XChartDataArray extends MultiMethodTest { } } } - + /** * Test calls the method and restores new values. <p> * Has <b> OK </b> status if the method successfully returns. <p> @@ -112,14 +112,14 @@ public class _XChartDataArray extends MultiMethodTest { * <li> <code> setColumnDescriptions </code></li> * </ul> */ - public void _setRowDescriptions() { + public void _setRowDescriptions() { bResult = true; rowDscs = oObj.getRowDescriptions(); if (mbExcludeSetRowAndSetColumn) { log.println(msExcludeMessage); throw new StatusException(Status.skipped(true)); - } + } for (int i = 0; i < rowDscs.length; i++) { rowDscs[i] = "Row" + i; } @@ -136,10 +136,10 @@ public class _XChartDataArray extends MultiMethodTest { * <li> <code> setRowDescriptions </code></li> * </ul> */ - public void _setData() { + public void _setData() { rowDscs = oObj.getRowDescriptions(); colDscs = oObj.getColumnDescriptions(); - + bResult = true; double[][] _data = oObj.getData(); data = _data; @@ -224,7 +224,7 @@ public class _XChartDataArray extends MultiMethodTest { tRes.tested("getData()", bResult); } - + protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDocument.java b/qadevOOo/tests/java/ifc/chart/_XChartDocument.java index 1ce64a0b5ab0..51d8f97b95f2 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartDocument.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/tests/java/ifc/chart/_XDiagram.java index e91ba14cd61c..d600fa951f1b 100644 --- a/qadevOOo/tests/java/ifc/chart/_XDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_XDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java b/qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java index 984838a65ae8..dd941cae41b7 100644 --- a/qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java +++ b/qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java index 3455f51c95d1..394207dc11e2 100644 --- a/qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java index 5786da65c2d1..2f5e0e6a5442 100644 --- a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java b/qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java index 4c368c30fefe..46030cae8844 100644 --- a/qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java +++ b/qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,19 +32,19 @@ import lib.MultiMethodTest; public class _XTemplateContainer extends MultiMethodTest { - + public XTemplateContainer oObj; - + public void _getElementTemplateName() { String tName = (String) tEnv.getObjRelation("TemplateName"); String oTName = oObj.getElementTemplateName(); - log.println("TemplateName: "+oTName); + log.println("TemplateName: "+oTName); boolean res = oTName.equals(tName); if (!res) { log.println("Expected: "+tName); log.println("Gained: "+oTName); } - tRes.tested("getElementTemplateName()", res); + tRes.tested("getElementTemplateName()", res); } - + } diff --git a/qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java b/qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java index 52a0cd3f6b0d..2eab9baa63bc 100644 --- a/qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java +++ b/qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ import lib.MultiMethodTest; public class _XTemplateInstance extends MultiMethodTest { - + public XTemplateInstance oObj; - - + + public void _getTemplateName() { String expected = (String) tEnv.getObjRelation("TemplateInstance"); String getting = oObj.getTemplateName(); @@ -46,5 +46,5 @@ public class _XTemplateInstance extends MultiMethodTest { } tRes.tested("getTemplateName()",res); } - + } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java index 68d113ebb8b4..3545928c4da4 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class _XBackend extends MultiMethodTest { try { XUpdateHandler aHandler = oObj.getUpdateHandler( - "org.openoffice.Office.TypeDetection", + "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); res = false; @@ -106,10 +106,10 @@ public class _XBackend extends MultiMethodTest { try { XStringSubstitution sts = createStringSubstitution( (XMultiServiceFactory) tParam.getMSF()); - String ent = sts.getSubstituteVariableValue("$(inst)") + + String ent = sts.getSubstituteVariableValue("$(inst)") + "/share/registry"; XUpdateHandler aHandler = oObj.getUpdateHandler( - "org.openoffice.Office.Jobs", + "org.openoffice.Office.Jobs", ent); if (aHandler == null) { @@ -138,11 +138,11 @@ public class _XBackend extends MultiMethodTest { try { XStringSubstitution sts = createStringSubstitution( (XMultiServiceFactory) tParam.getMSF()); - String ent = sts.getSubstituteVariableValue("$(inst)") + + String ent = sts.getSubstituteVariableValue("$(inst)") + "/share/registry"; XLayer[] Layers = oObj.listLayers( "org.openoffice.Office.Linguistic", ent); - + for (int i = 0; i < Layers.length; i++) { log.println("Checking Layer " + i); res &= checkLayer(Layers[i]); @@ -175,7 +175,7 @@ public class _XBackend extends MultiMethodTest { if (Layers.length==0) { System.out.println("No Layers found -- FAILED"); res &= false; - } + } } catch (com.sun.star.configuration.backend.BackendAccessException e) { log.println("unexpected Exception " + e + " -- FAILED"); res = false; diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java index 6a36c889985f..18330bc4a01c 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java index 784f14b4b5b0..e958d186921e 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ import lib.MultiMethodTest; import util.XLayerHandlerImpl; public class _XLayer extends MultiMethodTest { - - public XLayer oObj; - + + public XLayer oObj; + public void _readData() { boolean res = false; - + log.println("Checking for Exception in case of nul argument"); - + try { oObj.readData(null); } catch (com.sun.star.lang.NullPointerException e) { @@ -49,8 +49,8 @@ public class _XLayer extends MultiMethodTest { log.println("Unexpected Exception ("+e+") -- FAILED"); } catch (com.sun.star.configuration.backend.MalformedDataException e) { log.println("Unexpected Exception ("+e+") -- FAILED"); - } - + } + log.println("checking read data with own XLayerHandler implementation"); try { XLayerHandlerImpl xLayerHandler = new XLayerHandlerImpl(); @@ -63,7 +63,7 @@ public class _XLayer extends MultiMethodTest { res &= false; } else { log.println("startLayer was called -- OK"); - res &= true; + res &= true; } int el = implCalled.indexOf("endLayer"); if (el < 0) { @@ -71,8 +71,8 @@ public class _XLayer extends MultiMethodTest { res &= false; } else { log.println("endLayer was called -- OK"); - res &= true; - } + res &= true; + } } catch (com.sun.star.lang.NullPointerException e) { log.println("Unexpected Exception ("+e+") -- FAILED"); res &= false; @@ -83,8 +83,8 @@ public class _XLayer extends MultiMethodTest { log.println("Unexpected Exception ("+e+") -- FAILED"); res &= false; } - + tRes.tested("readData()",res); } - + } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java index 181555180534..f267d2500294 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,55 +53,55 @@ public class _XLayerHandler extends MultiMethodTest { oObj.startLayer(); oObj.overrideNode("org.openoffice.Setup", (short) 0, false); oObj.overrideNode("Office", (short) 0, false); - oObj.overrideProperty("ooSetupInstCompleted", (short) 0, + oObj.overrideProperty("ooSetupInstCompleted", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue(new Boolean(false)); oObj.endProperty(); - oObj.overrideProperty("ooSetupShowIntro", (short) 0, + oObj.overrideProperty("ooSetupShowIntro", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue(new Boolean(true)); oObj.endProperty(); - oObj.overrideProperty("ooSetupLocales", (short) 0, + oObj.overrideProperty("ooSetupLocales", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue("en-US"); oObj.endProperty(); oObj.overrideNode("Factories", (short) 0, false); - oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument", + oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument", (short) 0); - oObj.overrideProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, + oObj.overrideProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue("private:factory/schart"); oObj.endProperty(); - oObj.overrideProperty("ooSetupFactoryIcon", (short) 0, + oObj.overrideProperty("ooSetupFactoryIcon", (short) 0, new Type(java.lang.Long.class), false); oObj.setPropertyValue(new Integer(13)); oObj.endProperty(); - oObj.overrideProperty("ooSetupFactoryShortName", (short) 0, + oObj.overrideProperty("ooSetupFactoryShortName", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue("schart"); oObj.setPropertyValueForLocale("TemplateFile", "en-US"); oObj.endProperty(); - oObj.overrideProperty("ooSetupFactoryTemplateFile", (short) 0, + oObj.overrideProperty("ooSetupFactoryTemplateFile", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue("empty"); oObj.endProperty(); - oObj.addProperty("ooSetupFactoryTemplateFile", (short) 0, + oObj.addProperty("ooSetupFactoryTemplateFile", (short) 0, new Type(java.lang.String.class)); - oObj.addPropertyWithValue("ooSetupFactoryTemplateFile", (short) 0, + oObj.addPropertyWithValue("ooSetupFactoryTemplateFile", (short) 0, "TemplateFile"); oObj.endNode(); oObj.addOrReplaceNode("dropme", (short) 0); - oObj.overrideProperty("anyway", (short) 0, + oObj.overrideProperty("anyway", (short) 0, new Type(java.lang.String.class), false); oObj.setPropertyValue("nice"); oObj.endProperty(); oObj.dropNode("dropme"); oObj.endNode(); - oObj.addOrReplaceNodeFromTemplate("FromTemplate", + oObj.addOrReplaceNodeFromTemplate("FromTemplate", new com.sun.star.configuration.backend.TemplateIdentifier( - "org.openoffice.Setup", + "org.openoffice.Setup", "Setup"), (short) 0); oObj.endNode(); @@ -118,11 +118,11 @@ public class _XLayerHandler extends MultiMethodTest { Object fileacc = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.comp.ucb.SimpleFileAccess"); XSimpleFileAccess simpleAccess = (XSimpleFileAccess) UnoRuntime.queryInterface( - XSimpleFileAccess.class, + XSimpleFileAccess.class, fileacc); String filename = util.utils.getOfficeTemp( - (XMultiServiceFactory) tParam.getMSF()) + + (XMultiServiceFactory) tParam.getMSF()) + "LayerWriter.xcu"; log.println("Going to parse: " + filename); @@ -130,7 +130,7 @@ public class _XLayerHandler extends MultiMethodTest { xSink.setInputStream(xStream); - XLayer xLayer = (XLayer) UnoRuntime.queryInterface(XLayer.class, + XLayer xLayer = (XLayer) UnoRuntime.queryInterface(XLayer.class, LayerParser); XLayerHandlerImpl xLayerHandler = new XLayerHandlerImpl(); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java index 39193787a857..6cf29ee71dae 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,15 +32,15 @@ import com.sun.star.configuration.backend.XLayerImporter; import lib.MultiMethodTest; public class _XLayerImporter extends MultiMethodTest { - - public XLayerImporter oObj; + + public XLayerImporter oObj; public XBackend xBackend = null; - + public void _getTargetBackend() { xBackend = oObj.getTargetBackend(); tRes.tested("getTargetBackend()", xBackend != null); } - + public void _importLayer() { boolean res = false; log.println("checking for exception is argument null is given"); @@ -49,22 +49,22 @@ public class _XLayerImporter extends MultiMethodTest { log.println("\tException expected -- FAILED"); } catch (com.sun.star.lang.NullPointerException ne) { res = true; - log.println("\tExpected exception was thrown -- OK"); + log.println("\tExpected exception was thrown -- OK"); } catch (com.sun.star.configuration.backend.MalformedDataException mde) { res = false; - log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.IllegalArgumentException iae) { res = false; - log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.WrappedTargetException wte) { res = false; - log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); } - + log.println("checking own implementation of XLayer"); try { util.XLayerImpl xLayer = new util.XLayerImpl(); - oObj.importLayer(xLayer); + oObj.importLayer(xLayer); if (! xLayer.hasBeenCalled()) { log.println("\tXLayer hasn't been imported -- FAILED"); res &= false; @@ -74,21 +74,21 @@ public class _XLayerImporter extends MultiMethodTest { } } catch (com.sun.star.lang.NullPointerException ne) { res &= false; - log.println("\tExpected exception "+ne+" was thrown -- FAILED"); + log.println("\tExpected exception "+ne+" was thrown -- FAILED"); } catch (com.sun.star.configuration.backend.MalformedDataException mde) { res &= false; - log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.IllegalArgumentException iae) { res &= false; - log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.WrappedTargetException wte) { res &= false; - log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); - } - - tRes.tested("importLayer()",res); + log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); + } + + tRes.tested("importLayer()",res); } - + public void _importLayerForEntity() { boolean res = false; log.println("checking for exception for argument (null,\"\")"); @@ -97,22 +97,22 @@ public class _XLayerImporter extends MultiMethodTest { log.println("\tException expected -- FAILED"); } catch (com.sun.star.lang.NullPointerException ne) { res = true; - log.println("\tExpected exception was thrown -- OK"); + log.println("\tExpected exception was thrown -- OK"); } catch (com.sun.star.configuration.backend.MalformedDataException mde) { res = false; - log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.IllegalArgumentException iae) { res = false; - log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.WrappedTargetException wte) { res = false; - log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); } - + log.println("checking own implementation of XLayer"); try { util.XLayerImpl xLayer = new util.XLayerImpl(); - oObj.importLayerForEntity(xLayer,""); + oObj.importLayerForEntity(xLayer,""); if (! xLayer.hasBeenCalled()) { log.println("\tXLayer hasn't been imported -- FAILED"); res &= false; @@ -122,21 +122,21 @@ public class _XLayerImporter extends MultiMethodTest { } } catch (com.sun.star.lang.NullPointerException ne) { res &= false; - log.println("\tExpected exception "+ne+" was thrown -- FAILED"); + log.println("\tExpected exception "+ne+" was thrown -- FAILED"); } catch (com.sun.star.configuration.backend.MalformedDataException mde) { res &= false; - log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+mde+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.IllegalArgumentException iae) { res &= false; - log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); + log.println("\tWrong Expected "+iae+" exception was thrown -- FAILED"); } catch (com.sun.star.lang.WrappedTargetException wte) { res &= false; - log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); - } - - tRes.tested("importLayerForEntity()",res); + log.println("\tWrong Expected "+wte+" exception was thrown -- FAILED"); + } + + tRes.tested("importLayerForEntity()",res); } - + public void _setTargetBackend() { requiredMethod("getTargetBackend()"); boolean res = false; @@ -148,7 +148,7 @@ public class _XLayerImporter extends MultiMethodTest { res = true; log.println("\tExpected exception was thrown -- OK"); } - + log.println("checking argument previously gained by getTargetBackend"); try { oObj.setTargetBackend(xBackend); @@ -157,10 +157,10 @@ public class _XLayerImporter extends MultiMethodTest { } catch (com.sun.star.lang.NullPointerException ne) { res &= false; log.println("\tException was thrown -- FAILED"); - } - + } + tRes.tested("setTargetBackend()",res); - + } - + } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java index aae4743e01fc..46ecb1b7487f 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { log.println("Checking first on "+LayerIds[0]); res &= checkLayer(Layers[0]); log.println("Checking second on "+LayerIds[1]); - res &= checkLayer(Layers[1]); + res &= checkLayer(Layers[1]); } catch (com.sun.star.configuration.backend.BackendAccessException e) { log.println("unexpected Exception -- FAILED"); res = false; @@ -110,14 +110,14 @@ public class _XMultiLayerStratum extends MultiMethodTest { String[] Times = new String[2]; Times[0] = ""; Times[1] = ""; - + XLayer[] Layers = oObj.getMultipleLayers(LayerIds, Times); res = Layers.length == 2; log.println("Getting two XLayers -- OK"); log.println("Checking first on "+LayerIds[0]); res &= checkLayer(Layers[0]); log.println("Checking second on "+LayerIds[1]); - res &= checkLayer(Layers[1]); + res &= checkLayer(Layers[1]); } catch (com.sun.star.configuration.backend.BackendAccessException e) { log.println("unexpected Exception -- FAILED"); res = false; @@ -126,7 +126,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { res = false; } - tRes.tested("getMultipleLayers()", res); + tRes.tested("getMultipleLayers()", res); } public void _getUpdatableLayer() { @@ -166,7 +166,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { res = false; } - tRes.tested("getUpdatableLayer()", res); + tRes.tested("getUpdatableLayer()", res); } public void _getUpdateLayerId() { @@ -174,7 +174,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String UpdateLayerID = oObj.getUpdateLayerId( - "org.openoffice.Office.TypeDetection", + "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); res = false; @@ -190,7 +190,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String ent = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + + (XMultiServiceFactory) tParam.getMSF()) + "/../share/registry"; String UpdateLayerID = oObj.getUpdateLayerId( "org.openoffice.Office.Linguistic", ent); @@ -220,7 +220,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String[] LayerIDs = oObj.listLayerIds( - "org.openoffice.Office.TypeDetection", + "org.openoffice.Office.TypeDetection", "illegal"); log.println("Exception expected -- FAILED"); res = false; @@ -233,9 +233,9 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String ent = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + + (XMultiServiceFactory) tParam.getMSF()) + "/../share/registry"; - String[] LayerIDs = oObj.listLayerIds("org.openoffice.Office.Jobs", + String[] LayerIDs = oObj.listLayerIds("org.openoffice.Office.Jobs", ent); res &= LayerIDs[0].endsWith("Jobs.xcu"); aLayerID = LayerIDs[0]; diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java index 36be98ebc1fb..6c4ed22f8782 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ public class _XSchema extends MultiMethodTest { public XSchema oObj; XSchemaHandlerImpl xSchemaHandlerImpl = new XSchemaHandlerImpl(); String filename = null; - + protected void before() { filename = (String)tEnv.getObjRelation("ParsedFileName"); } - + public void _readComponent() { - requiredMethod("readTemplates()"); + requiredMethod("readTemplates()"); boolean res = false; log.println("Checking for Exception in case of null argument"); @@ -70,10 +70,10 @@ public class _XSchema extends MultiMethodTest { try { xSchemaHandlerImpl.cleanCalls(); oObj.readComponent(xSchemaHandlerImpl); - + String implCalled = xSchemaHandlerImpl.getCalls(); - - System.out.println(implCalled); + + System.out.println(implCalled); int sc = implCalled.indexOf("startComponent"); @@ -134,7 +134,7 @@ public class _XSchema extends MultiMethodTest { xSchemaHandlerImpl.cleanCalls(); oObj.readSchema(xSchemaHandlerImpl); - String implCalled = xSchemaHandlerImpl.getCalls(); + String implCalled = xSchemaHandlerImpl.getCalls(); int sc = implCalled.indexOf("startSchema"); @@ -178,8 +178,8 @@ public class _XSchema extends MultiMethodTest { } catch (com.sun.star.configuration.backend.MalformedDataException e) { log.println("Unexpected Exception (" + e + ") -- FAILED"); } - - tRes.tested("readSchema()", res); + + tRes.tested("readSchema()", res); reopenFile(); } @@ -205,8 +205,8 @@ public class _XSchema extends MultiMethodTest { try { xSchemaHandlerImpl.cleanCalls(); oObj.readComponent(xSchemaHandlerImpl); - - String implCalled = xSchemaHandlerImpl.getCalls(); + + String implCalled = xSchemaHandlerImpl.getCalls(); int sc = implCalled.indexOf("startGroup"); @@ -238,10 +238,10 @@ public class _XSchema extends MultiMethodTest { res &= false; } - tRes.tested("readTemplates()", res); + tRes.tested("readTemplates()", res); reopenFile(); } - + /** * reopen the parsed file again, to avoid the wrapped target exception. */ @@ -251,13 +251,13 @@ public class _XSchema extends MultiMethodTest { try { Object fileacc = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); simpleAccess = (XSimpleFileAccess) - UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); + UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); log.println("Going to parse: "+filename); xStream = simpleAccess.openFileRead(filename); } catch (com.sun.star.uno.Exception e) { - } + } - XActiveDataSink xSink = (XActiveDataSink) UnoRuntime.queryInterface(XActiveDataSink.class, oObj); + XActiveDataSink xSink = (XActiveDataSink) UnoRuntime.queryInterface(XActiveDataSink.class, oObj); xSink.setInputStream(xStream); } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java index 99346705b4fb..0df57288bd00 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public class _XSchemaSupplier extends MultiMethodTest { } tRes.tested("getComponentSchema()",res); } - + protected boolean checkSchema(XSchema aSchema) { boolean res = false; XSchemaHandlerImpl xSchemaHandlerImpl = new XSchemaHandlerImpl(); @@ -80,8 +80,8 @@ public class _XSchemaSupplier extends MultiMethodTest { try { aSchema.readComponent(xSchemaHandlerImpl); - - String implCalled = xSchemaHandlerImpl.getCalls(); + + String implCalled = xSchemaHandlerImpl.getCalls(); int sc = implCalled.indexOf("startComponent"); if (sc < 0) { @@ -112,7 +112,7 @@ public class _XSchemaSupplier extends MultiMethodTest { res &= false; } - return res; - + return res; + } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java index 32049d8f7015..92c90499be0f 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,70 +49,70 @@ public class _XUpdateHandler extends MultiMethodTest { try { xLayerHandler.startLayer(); - xLayerHandler.overrideNode("org.openoffice.Setup", (short) 0, + xLayerHandler.overrideNode("org.openoffice.Setup", (short) 0, false); xLayerHandler.overrideNode("Office", (short) 0, false); - xLayerHandler.overrideProperty("ooSetupInstCompleted", (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupInstCompleted", (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue(new Boolean(false)); xLayerHandler.endProperty(); - xLayerHandler.overrideProperty("ooSetupShowIntro", (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupShowIntro", (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue(new Boolean(true)); xLayerHandler.endProperty(); - xLayerHandler.overrideProperty("ooSetupLocales", (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupLocales", (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue("en-US"); xLayerHandler.endProperty(); xLayerHandler.overrideNode("Factories", (short) 0, false); - xLayerHandler.addOrReplaceNode("com.sun.star.chart.ChartDocument", + xLayerHandler.addOrReplaceNode("com.sun.star.chart.ChartDocument", (short) 0); - xLayerHandler.overrideProperty("ooSetupFactoryEmptyDocumentURL", - (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupFactoryEmptyDocumentURL", + (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue("private:factory/schart"); xLayerHandler.endProperty(); - xLayerHandler.overrideProperty("ooSetupFactoryIcon", (short) 0, - new Type(java.lang.Long.class), + xLayerHandler.overrideProperty("ooSetupFactoryIcon", (short) 0, + new Type(java.lang.Long.class), false); xLayerHandler.setPropertyValue(new Integer(13)); xLayerHandler.endProperty(); - xLayerHandler.overrideProperty("ooSetupFactoryShortName", - (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupFactoryShortName", + (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue("schart"); xLayerHandler.setPropertyValueForLocale("TemplateFile", "en-US"); xLayerHandler.endProperty(); - xLayerHandler.overrideProperty("ooSetupFactoryTemplateFile", - (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("ooSetupFactoryTemplateFile", + (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue("empty"); xLayerHandler.endProperty(); - xLayerHandler.addProperty("ooSetupFactoryTemplateFile", (short) 0, + xLayerHandler.addProperty("ooSetupFactoryTemplateFile", (short) 0, new Type(java.lang.String.class)); - xLayerHandler.addPropertyWithValue("ooSetupFactoryTemplateFile", + xLayerHandler.addPropertyWithValue("ooSetupFactoryTemplateFile", (short) 0, "TemplateFile"); xLayerHandler.endNode(); xLayerHandler.addOrReplaceNode("dropme", (short) 0); - xLayerHandler.overrideProperty("anyway", (short) 0, - new Type(java.lang.String.class), + xLayerHandler.overrideProperty("anyway", (short) 0, + new Type(java.lang.String.class), false); xLayerHandler.setPropertyValue("nice"); xLayerHandler.endProperty(); xLayerHandler.dropNode("dropme"); xLayerHandler.endNode(); - xLayerHandler.addOrReplaceNodeFromTemplate("FromTemplate", + xLayerHandler.addOrReplaceNodeFromTemplate("FromTemplate", new com.sun.star.configuration.backend.TemplateIdentifier( - "org.openoffice.Setup", - "Setup"), + "org.openoffice.Setup", + "Setup"), (short) 0); xLayerHandler.endNode(); @@ -217,17 +217,17 @@ public class _XUpdateHandler extends MultiMethodTest { log.println("Layer called (before): " + xLayer.hasBeenCalled()); oObj.startUpdate(); oObj.addOrReplaceNode("whatever", (short) 0); - oObj.addOrReplaceNodeFromTemplate("Office", (short) 0, + oObj.addOrReplaceNodeFromTemplate("Office", (short) 0, new TemplateIdentifier()); - oObj.addOrReplaceProperty("prop", (short) 0, + oObj.addOrReplaceProperty("prop", (short) 0, new Type(java.lang.String.class)); oObj.addOrReplacePropertyWithValue("prop2", (short) 0, "this"); - oObj.modifyProperty("ooSetupFactoryIcon", (short) 0, (short) 0, + oObj.modifyProperty("ooSetupFactoryIcon", (short) 0, (short) 0, new Type(java.lang.String.class)); oObj.resetPropertyValue(); oObj.resetPropertyValueForLocale("en-US"); oObj.endProperty(); - oObj.modifyProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, + oObj.modifyProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, (short) 0, new Type(java.lang.String.class)); oObj.setPropertyValue("newValue"); oObj.setPropertyValueForLocale("newValue-US", "de-DE"); diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index 7622c547253d..7f0ea801fe97 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java index 12ae67dedea3..d9788976de9a 100644 --- a/qadevOOo/tests/java/ifc/connection/_XConnector.java +++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ public class _XConnector extends MultiMethodTest { public void _connect() { boolean result = true ; AcceptorThread acceptorThread = null; - XAcceptor xAcceptor = null ; + XAcceptor xAcceptor = null ; XConnection aCon = null; XInterface x = null; diff --git a/qadevOOo/tests/java/ifc/container/_XChild.java b/qadevOOo/tests/java/ifc/container/_XChild.java index 2c142573ef01..cda4a19fff42 100644 --- a/qadevOOo/tests/java/ifc/container/_XChild.java +++ b/qadevOOo/tests/java/ifc/container/_XChild.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,9 +74,9 @@ public class _XChild extends MultiMethodTest { */ public void _setParent() { requiredMethod("getParent()") ; - + String parentComment = (String) tEnv.getObjRelation("cannotSwitchParent"); - + if (parentComment != null) { log.println(parentComment); tRes.tested("setParent()",Status.skipped(true)); diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index e3122bc28f66..f4e016100e73 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,12 +108,12 @@ public class _XContainer extends MultiMethodTest { if (NC == null) { container = tEnv.getObjRelation("XContainer.Container") ; } - + if (container != null) { if (container instanceof com.sun.star.awt.XControlContainer) { CC = (XControlContainer) container; } else if (container instanceof com.sun.star.uno.XNamingService) { - NV = (XNamingService) container; + NV = (XNamingService) container; } else if (container instanceof com.sun.star.container.XNameReplace) { NR = (XNameReplace) container; inst2 = tEnv.getObjRelation("XContainer.NewValue"); @@ -122,7 +122,7 @@ public class _XContainer extends MultiMethodTest { NC = (XNameContainer) container; } } - + if (NC == null && CC == null && NV == null && NR == null) throw new StatusException( Status.failed("Neither object implements XNameContainer" + @@ -178,14 +178,14 @@ public class _XContainer extends MultiMethodTest { if (NR == null) bResult &= bElementInserted; if (!bResult) { - log.println("inserted was " + (bElementInserted ? "" : "NOT") + log.println("inserted was " + (bElementInserted ? "" : "NOT") + " called."); - + if (NC != null) { - log.println("replaced was " + (bElementReplaced ? "" : "NOT") + log.println("replaced was " + (bElementReplaced ? "" : "NOT") + " called."); } - log.println("removed was " + (bElementRemoved ? "" : "NOT") + log.println("removed was " + (bElementRemoved ? "" : "NOT") + " called."); } @@ -260,14 +260,14 @@ public class _XContainer extends MultiMethodTest { return bResult; } - + /** * In case no XNameContainer is available, but a XControlContainer - * instead. + * instead. * the XControl instance is inserted * Method returns true if the count of Controls is changed afterwards */ - protected boolean performChanges2() { + protected boolean performChanges2() { int precount = CC.getControls().length; CC.addControl("NewControl",(XControl) inst); shortWait(); @@ -276,25 +276,25 @@ public class _XContainer extends MultiMethodTest { shortWait(); return count>precount; } - + /** * In case no XNameContainer is available, but a XNamingService - * instead. + * instead. * the instance is registered and revoked again * Method return true if getRegisteredObject() works after * registering and doesn't after revoke */ - protected boolean performChanges3() { + protected boolean performChanges3() { boolean res = true; Object reg = null; - + try { reg = NV.getRegisteredObject("MyFactory"); - NV.revokeObject("MyFactory"); + NV.revokeObject("MyFactory"); } catch (Exception e) { - + } - + try { NV.registerObject("MyFactory", inst); reg = NV.getRegisteredObject("MyFactory"); @@ -304,7 +304,7 @@ public class _XContainer extends MultiMethodTest { log.println("registerObject failed"); res &= false; } - + try { NV.revokeObject("MyFactory"); reg = NV.getRegisteredObject("MyFactory"); @@ -313,20 +313,20 @@ public class _XContainer extends MultiMethodTest { } catch (Exception e) { res &= true; } - + return res; - } - + } + /** * In case no XNameContainer is available, but a XNamingReplace - * instead. + * instead. */ - protected boolean performChanges4() { + protected boolean performChanges4() { boolean res = true; Object newValue = inst2; Object originalValue = null; String name = null; - + try { name = (String)inst; } @@ -335,7 +335,7 @@ public class _XContainer extends MultiMethodTest { e.printStackTrace(log); return false; } - + try { originalValue = NR.getByName(name); NR.replaceByName(name, newValue); @@ -352,7 +352,7 @@ public class _XContainer extends MultiMethodTest { } return res; - } + } /** * Sleeps for 0.5 sec. to allow StarOffice to react on <code> @@ -364,7 +364,7 @@ public class _XContainer extends MultiMethodTest { } catch (InterruptedException e) { log.println("While waiting :" + e) ; } - } + } } diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java index eb6fe34c5ff3..03e079156628 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java +++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,13 +45,13 @@ import com.sun.star.container.XEnumeration; * </ul> * This test needs the following object relations : * <ul> -* <li> <code>'XContainerQuery.createSubSetEnumerationByProperties'</code> : -* <code>NameValue[]</code> which is a valid argument for +* <li> <code>'XContainerQuery.createSubSetEnumerationByProperties'</code> : +* <code>NameValue[]</code> which is a valid argument for * <code>createSubSetEnumerationByProperties()</code>.</li> * <li> <code>'XContainerQuery.createSubSetEnumerationByQuery'</code> : <b>(optional)</b> -* Normaly <code>createSubSetEnumerationByProperties()</code> covers all -* possible queries. But for special cases, i.e. sorted output, the function -* <code>createSubSetEnumerationByQuery()</code> was made. The special cases was not +* Normaly <code>createSubSetEnumerationByProperties()</code> covers all +* possible queries. But for special cases, i.e. sorted output, the function +* <code>createSubSetEnumerationByQuery()</code> was made. The special cases was not * implemented by default in the implemetation object. So this function could be * marked as <code>optional</code></li> * <ul> <p> @@ -62,7 +62,7 @@ import com.sun.star.container.XEnumeration; public class _XContainerQuery extends MultiMethodTest { public XContainerQuery oObj = null; - private NamedValue[] m_querySequenze = null; + private NamedValue[] m_querySequenze = null; private String[] m_queryStrings = null; @@ -71,26 +71,26 @@ public class _XContainerQuery extends MultiMethodTest { * @throws StatusException If one of relations not found. */ public void before() throws StatusException { - + m_querySequenze = (NamedValue[]) tEnv.getObjRelation( "XContainerQuery.createSubSetEnumerationByProperties"); if (m_querySequenze == null) { throw new StatusException( - Status.failed("Could not get object relation " + + Status.failed("Could not get object relation " + "'XContainerQuery.createSubSetEnumerationByProperties'")) ; } - + m_queryStrings = (String[]) tEnv.getObjRelation( "XContainerQuery.createSubSetEnumerationByQuery"); if (m_queryStrings == null) { - log.println("Could not get object relation " + + log.println("Could not get object relation " + "'XContainerQuery.createSubSetEnumerationByQuery'"); } } /** - * If object relation is available, the function was called with relation + * If object relation is available, the function was called with relation * as parameter. The returned <code>XEnumeration</code> must not be null and * elements of it must be valid. * If object relation is not available, the result is always <code>true</coed> @@ -129,23 +129,23 @@ public class _XContainerQuery extends MultiMethodTest { } /** - * The function was called with object relation + * The function was called with object relation * as parameter. The returned <code>XEnumeration</code> must not be null and * elements of it must be valid. - * + * */ public void _createSubSetEnumerationByProperties() { boolean bResult = true; XEnumeration subSet = oObj.createSubSetEnumerationByProperties( m_querySequenze ); - + bResult = subSet.hasMoreElements(); - + while (subSet.hasMoreElements()) { try{ Object element = subSet.nextElement(); - + } catch (com.sun.star.container.NoSuchElementException e){ log.println("Exception occured "); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java b/qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java index 5339febb521a..550fc20e7a03 100644 --- a/qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XElementAccess.java b/qadevOOo/tests/java/ifc/container/_XElementAccess.java index e732db774c05..83c121f10927 100644 --- a/qadevOOo/tests/java/ifc/container/_XElementAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XElementAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/tests/java/ifc/container/_XEnumeration.java index eaf5a2d5991d..6b2595656f8a 100644 --- a/qadevOOo/tests/java/ifc/container/_XEnumeration.java +++ b/qadevOOo/tests/java/ifc/container/_XEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public class _XEnumeration extends MultiMethodTest { result = false; } catch (NoSuchElementException e) { log.println("nextElement: correct exception"); - } + } tRes.tested("nextElement()", result); diff --git a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java index 87de9304e309..d929233bcd91 100644 --- a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XHierarchicalName.java b/qadevOOo/tests/java/ifc/container/_XHierarchicalName.java index c2723ccce0af..d690f1df8ebe 100644 --- a/qadevOOo/tests/java/ifc/container/_XHierarchicalName.java +++ b/qadevOOo/tests/java/ifc/container/_XHierarchicalName.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public class _XHierarchicalName extends MultiMethodTest { res = hn.startsWith(expName); if (!res) { - log.println("Getting : " + hn + + log.println("Getting : " + hn + " but expected it to start with " + expName); } } catch (com.sun.star.lang.IllegalArgumentException e) { diff --git a/qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java b/qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java index 2270d68502ba..2fb8e6d19011 100644 --- a/qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java index c87a62baaf23..e9bcad12b2b2 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,16 +125,16 @@ public class _XIndexAccess extends MultiMethodTest { tRes.tested("getByIndex()", result); } // end getByIndex - + private boolean checkGetByIndex(int index){ Object o = null; boolean result = true; try { log.println("getByIndex(" + index + ")"); o = oObj.getByIndex(index); - + if ( tEnv.getObjRelation("XIndexAccess.getByIndex.mustBeNull") != null){ - result = (o == null); + result = (o == null); if (result) log.println("OK"); else log.println("FAILED -> not null"); } else { result = (o != null); @@ -148,7 +148,7 @@ public class _XIndexAccess extends MultiMethodTest { log.println("Exception! " + e); result = false; } - + return result; } diff --git a/qadevOOo/tests/java/ifc/container/_XIndexContainer.java b/qadevOOo/tests/java/ifc/container/_XIndexContainer.java index fcd9e80f7589..60fddf132635 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XIndexReplace.java b/qadevOOo/tests/java/ifc/container/_XIndexReplace.java index b25dce3456ab..518c2f25a256 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexReplace.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XNameAccess.java b/qadevOOo/tests/java/ifc/container/_XNameAccess.java index be3909179f3d..e141d5da5fe8 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XNameAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/container/_XNameContainer.java b/qadevOOo/tests/java/ifc/container/_XNameContainer.java index 045a43f135e7..2e54cca7e0f5 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XNameContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,7 +204,7 @@ public class _XNameContainer extends MultiMethodTest { oObj.removeByName(Name); } catch (com.sun.star.container.NoSuchElementException e1) { } catch (com.sun.star.lang.WrappedTargetException e1) { - } + } } boolean result = true; diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/tests/java/ifc/container/_XNameReplace.java index a56edc5ce3db..91ad64e51051 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XNameReplace.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,24 +136,24 @@ public class _XNameReplace extends MultiMethodTest { log.println("replace object '" + oNames[0] + "' with another instance"); oObj.replaceByName(oNames[0],oInstance); Object newEl = oObj.getByName(oNames[0]) ; - + if (tEnv.getTestCase().getObjectName().equals("ScCellRangesObj")) { ok = compareRanges(old, newEl); } else { - ok = ! ValueComparer.equalValue(old, newEl); + ok = ! ValueComparer.equalValue(old, newEl); } result &= ok; log.println("result of replace: " + ok); log.println("replace back the old object"); - oObj.replaceByName(oNames[0],old); + oObj.replaceByName(oNames[0],old); Object origEl = oObj.getByName(oNames[0]) ; - + if (tEnv.getTestCase().getObjectName().equals("ScCellRangesObj")) { ok = ! compareRanges(old, origEl); } else { ok = ValueComparer.equalValue(old, origEl); } - + result &= ok; log.println("result of replace back: " + ok); } catch (com.sun.star.lang.IllegalArgumentException e ) { @@ -177,48 +177,48 @@ public class _XNameReplace extends MultiMethodTest { public void after() { disposeEnvironment() ; } - + // method returns false if the ranges are equal and true otherwise - + private boolean compareRanges(Object old, Object newEl) { - XCellRangeAddressable xCRA = (XCellRangeAddressable) + XCellRangeAddressable xCRA = (XCellRangeAddressable) UnoRuntime.queryInterface(XCellRangeAddressable.class,old); - - XCellRangeAddressable xCRA2 = (XCellRangeAddressable) + + XCellRangeAddressable xCRA2 = (XCellRangeAddressable) UnoRuntime.queryInterface(XCellRangeAddressable.class,newEl); - + int orgStartCol = xCRA.getRangeAddress().StartColumn; - int orgEndCol = xCRA.getRangeAddress().EndColumn; + int orgEndCol = xCRA.getRangeAddress().EndColumn; int orgStartRow = xCRA.getRangeAddress().StartRow; - int orgEndRow = xCRA.getRangeAddress().EndRow; - + int orgEndRow = xCRA.getRangeAddress().EndRow; + int newStartCol = xCRA2.getRangeAddress().StartColumn; - int newEndCol = xCRA2.getRangeAddress().EndColumn; + int newEndCol = xCRA2.getRangeAddress().EndColumn; int newStartRow = xCRA2.getRangeAddress().StartRow; int newEndRow = xCRA2.getRangeAddress().EndRow; - + boolean ret = true; - + if (orgStartCol == newStartCol) { log.println("\t StartColumn is the same"); ret = false; } - + if (orgEndCol == newEndCol) { log.println("\t EndColumn is the same"); ret = false; - } + } if (orgStartRow == newStartRow) { log.println("\t StartRow is the same"); ret = false; } - + if (orgEndRow == newEndRow) { log.println("\t EndRow is the same"); ret = false; - } - - return ret; + } + + return ret; } } diff --git a/qadevOOo/tests/java/ifc/container/_XNamed.java b/qadevOOo/tests/java/ifc/container/_XNamed.java index 81d9130e17ca..ed569c102922 100644 --- a/qadevOOo/tests/java/ifc/container/_XNamed.java +++ b/qadevOOo/tests/java/ifc/container/_XNamed.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ public class _XNamed extends MultiMethodTest { result &= loc_result; oObj.setName(oldName); } else { - log.println("The names for the object '" + testobjname + + log.println("The names for the object '" + testobjname + "' are fixed."); log.println("It is not possible to rename."); log.println("So 'setName()' is always OK"); diff --git a/qadevOOo/tests/java/ifc/container/_XSet.java b/qadevOOo/tests/java/ifc/container/_XSet.java index 191b107ebc08..bb18e18d9b0b 100644 --- a/qadevOOo/tests/java/ifc/container/_XSet.java +++ b/qadevOOo/tests/java/ifc/container/_XSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java b/qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java index c9343c60ec2f..c97fa9b3f5ec 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java +++ b/qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java b/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java index 6835b2d87aaf..0aca5f06ec85 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java +++ b/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java index c8b13bc73fb4..5d74a3ab8f0e 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java index 186ede4922d3..73baebba772a 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java index 77a9a2d99284..9062b0b03317 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java index c790d42df531..1c0f5b34dd45 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_DocumentInfo.java b/qadevOOo/tests/java/ifc/document/_DocumentInfo.java index 6bb34e303329..ec7d1d24789d 100644 --- a/qadevOOo/tests/java/ifc/document/_DocumentInfo.java +++ b/qadevOOo/tests/java/ifc/document/_DocumentInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_ExportFilter.java b/qadevOOo/tests/java/ifc/document/_ExportFilter.java index e8801774c83a..b3135639f4e9 100644 --- a/qadevOOo/tests/java/ifc/document/_ExportFilter.java +++ b/qadevOOo/tests/java/ifc/document/_ExportFilter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_ImportFilter.java b/qadevOOo/tests/java/ifc/document/_ImportFilter.java index a2d0afb809cc..30133010df80 100644 --- a/qadevOOo/tests/java/ifc/document/_ImportFilter.java +++ b/qadevOOo/tests/java/ifc/document/_ImportFilter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_LinkTarget.java b/qadevOOo/tests/java/ifc/document/_LinkTarget.java index 166dae9de48e..d588c1421a59 100644 --- a/qadevOOo/tests/java/ifc/document/_LinkTarget.java +++ b/qadevOOo/tests/java/ifc/document/_LinkTarget.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_OfficeDocument.java b/qadevOOo/tests/java/ifc/document/_OfficeDocument.java index 71611b09985f..22a3fc0073c2 100644 --- a/qadevOOo/tests/java/ifc/document/_OfficeDocument.java +++ b/qadevOOo/tests/java/ifc/document/_OfficeDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_Settings.java b/qadevOOo/tests/java/ifc/document/_Settings.java index 7cd31f5f137c..a644d57df146 100644 --- a/qadevOOo/tests/java/ifc/document/_Settings.java +++ b/qadevOOo/tests/java/ifc/document/_Settings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ import lib.StatusException; * Generic test for all properties contained in this service */ public class _Settings extends MultiPropertyTest { - + /** * This property accepts only values in a range of 1-3 * @see com.sun.star.document.PrinterIndependentLayout @@ -54,21 +54,21 @@ public class _Settings extends MultiPropertyTest { try{ Short oldVal = (Short) oObj.getPropertyValue("PrinterIndependentLayout"); Short newVal = oldVal.intValue() == 1 ? new Short("3") : new Short("1"); - - + + testProperty("PrinterIndependentLayout", oldVal, newVal); - + } catch (com.sun.star.beans.UnknownPropertyException e) { throw new StatusException(Status.failed("the property 'PrinterIndependentLayout' is unknown.")); } catch (com.sun.star.lang.WrappedTargetException e) { throw new StatusException(Status.failed("the property 'PrinterIndependentLayout' could not be tested.")); } } - + public void _PrinterName() { Object[] oServices = null; Exception ex = null; - + try { Class cPrinterJob = Class.forName("java.awt.print.PrinterJob"); Method lookupMethod = cPrinterJob.getDeclaredMethod("lookupPrintServices", new Class[0]); @@ -98,7 +98,7 @@ public class _Settings extends MultiPropertyTest { // PrintService[] services = PrinterJob.lookupPrintServices(); if (oServices.length > 1) { - testProperty("PrinterName", getPrinterNameWithReflection(oServices[0]), + testProperty("PrinterName", getPrinterNameWithReflection(oServices[0]), getPrinterNameWithReflection(oServices[1])); } else { log.println( @@ -123,16 +123,16 @@ public class _Settings extends MultiPropertyTest { //check if the property has the right type Object pValue = oObj.getPropertyValue("ForbiddenCharacters"); XForbiddenCharacters fc = (XForbiddenCharacters) UnoRuntime.queryInterface( - XForbiddenCharacters.class, + XForbiddenCharacters.class, pValue); res &= (fc != null); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println( - "Exception while checking property 'ForbiddenCharacters' " + + "Exception while checking property 'ForbiddenCharacters' " + e.getMessage()); } catch (com.sun.star.lang.WrappedTargetException e) { log.println( - "Exception while checking property 'ForbiddenCharacters' " + + "Exception while checking property 'ForbiddenCharacters' " + e.getMessage()); } @@ -151,7 +151,7 @@ public class _Settings extends MultiPropertyTest { return res; } - + private String getPrinterNameWithReflection(Object pService) { String pName = null; try { @@ -159,7 +159,7 @@ public class _Settings extends MultiPropertyTest { Method getNameMethod = cPrintService.getDeclaredMethod("getName", new Class[0]); Object retValue = getNameMethod.invoke(pService, new Object[0]); pName = (String)retValue; - } + } // ignore all excptions: we already ran into one of these if Java is too old catch(java.lang.ClassNotFoundException e) { } diff --git a/qadevOOo/tests/java/ifc/document/_XActionLockable.java b/qadevOOo/tests/java/ifc/document/_XActionLockable.java index bfba13d6bb2e..5cfcb5aab072 100644 --- a/qadevOOo/tests/java/ifc/document/_XActionLockable.java +++ b/qadevOOo/tests/java/ifc/document/_XActionLockable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java b/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java index c7b7ec582d1c..d04f0fc66f1a 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java b/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java index e227017937c3..d458465b4db9 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import lib.MultiMethodTest; */ public class _XDocumentInfoSupplier extends MultiMethodTest { public XDocumentInfoSupplier oObj = null; - + public void _getDocumentInfo() { // returns a com.sun.star.document.DocumentInfo XDocumentInfo info = oObj.getDocumentInfo(); @@ -50,7 +50,7 @@ public class _XDocumentInfoSupplier extends MultiMethodTest { e.printStackTrace((java.io.PrintWriter)log); title = null; } - log.println("Got document title: " + title); + log.println("Got document title: " + title); tRes.tested("getDocumentInfo()", title != null); } } diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java index 76a7be2593dc..98a39a7a2c10 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,15 +169,15 @@ public class _XDocumentInsertable extends MultiMethodTest { ex.printStackTrace(log); result = false ; } - + try { PropertyValue [] szEmptyArgs = new PropertyValue [0]; String docURL = "file:///c:/ThisIsAnInvaldURL"; log.println("Inserting document from URL '" + docURL + "'"); oObj.insertDocumentFromURL(docURL, szEmptyArgs); - + result=false; - + } catch (IOException ex) { log.println("expected exception was thrown -> ok"); } catch (com.sun.star.lang.IllegalArgumentException ex) { @@ -187,12 +187,12 @@ public class _XDocumentInsertable extends MultiMethodTest { tRes.tested("insertDocumentFromURL()", result); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } // finish class _XDocumentInsertable diff --git a/qadevOOo/tests/java/ifc/document/_XEmbeddedObjectSupplier.java b/qadevOOo/tests/java/ifc/document/_XEmbeddedObjectSupplier.java index 8a52ed436ef1..c4a26149bdeb 100644 --- a/qadevOOo/tests/java/ifc/document/_XEmbeddedObjectSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XEmbeddedObjectSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java b/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java index 871133307dee..6e507f0618f2 100644 --- a/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,48 +36,48 @@ import com.sun.star.frame.XModel; import com.sun.star.uno.UnoRuntime; public class _XEventBroadcaster extends MultiMethodTest { - + public XEventBroadcaster oObj; protected static boolean listenerCalled=false; private static XEventListener listener=null; - + public class MyEventListener implements XEventListener { - + public void disposing(com.sun.star.lang.EventObject eventObject) { } - + public void notifyEvent(com.sun.star.document.EventObject eventObject) { System.out.println("EventObject "+eventObject.EventName); listenerCalled = true; } - + } - + private void switchFocus() { XModel docModel = (XModel) UnoRuntime.queryInterface( - XModel.class,tEnv.getTestObject()); - docModel.getCurrentController().getFrame().getContainerWindow().setFocus(); - util.utils.shortWait(1000); + XModel.class,tEnv.getTestObject()); + docModel.getCurrentController().getFrame().getContainerWindow().setFocus(); + util.utils.shortWait(1000); XController xc = (XController) UnoRuntime.queryInterface(XController.class,tEnv.getObjRelation("CONT2")); - xc.getFrame().getContainerWindow().setFocus(); + xc.getFrame().getContainerWindow().setFocus(); } - + public void _addEventListener() { - listener = new MyEventListener(); - listenerCalled = false; - oObj.addEventListener(listener); + listener = new MyEventListener(); + listenerCalled = false; + oObj.addEventListener(listener); switchFocus(); util.utils.shortWait(1000); tRes.tested("addEventListener()",listenerCalled); } - + public void _removeEventListener() { - requiredMethod("addEventListener()"); - listenerCalled = false; + requiredMethod("addEventListener()"); + listenerCalled = false; oObj.removeEventListener(listener); switchFocus(); - util.utils.shortWait(1000); - tRes.tested("removeEventListener()",!listenerCalled); + util.utils.shortWait(1000); + tRes.tested("removeEventListener()",!listenerCalled); } - + } diff --git a/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java b/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java index daf0ff59d39a..2d07f295523c 100644 --- a/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XEventsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XExporter.java b/qadevOOo/tests/java/ifc/document/_XExporter.java index 581fe0de7821..c8ea0ad9822d 100644 --- a/qadevOOo/tests/java/ifc/document/_XExporter.java +++ b/qadevOOo/tests/java/ifc/document/_XExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java index dfdaa7acd735..49f7f8b3016e 100644 --- a/qadevOOo/tests/java/ifc/document/_XFilter.java +++ b/qadevOOo/tests/java/ifc/document/_XFilter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public class _XFilter extends MultiMethodTest { protected FilterChecker checker = null ; protected XComponent sourceDoc = null; protected boolean dummy = false; - + /** * Retrieves object relations. * @throws StatusException If one of relations not found.<br> @@ -85,7 +85,7 @@ public class _XFilter extends MultiMethodTest { if (name.indexOf("Importer")>0) { log.println(name+" contains only a dummy implementation"); log.println("therefore all methods are skipped"); - dummy = true; + dummy = true; } mDesc = (PropertyValue[]) tEnv.getObjRelation("MediaDescriptor") ; checker = (FilterChecker) tEnv.getObjRelation("XFilter.Checker") ; @@ -101,11 +101,11 @@ public class _XFilter extends MultiMethodTest { } catch (com.sun.star.lang.IllegalArgumentException e) {} } - + public void after() { - if (dummy) { + if (dummy) { throw new StatusException(Status.skipped(true)); - } + } } /** @@ -119,7 +119,7 @@ public class _XFilter extends MultiMethodTest { } boolean result = true ; result = oObj.filter(mDesc) ; - + if (checker == null) { log.println("!!! Warning : cann't check filter as no relation found"); } else { @@ -137,7 +137,7 @@ public class _XFilter extends MultiMethodTest { if (dummy) { tRes.tested("cancel()",true); return; - } + } requiredMethod("filter()"); if (tEnv.getObjRelation("NoFilter.cancel()") != null) { System.out.println("Cancel not tested."); diff --git a/qadevOOo/tests/java/ifc/document/_XImporter.java b/qadevOOo/tests/java/ifc/document/_XImporter.java index 2296bf5802df..caae1c60b30e 100644 --- a/qadevOOo/tests/java/ifc/document/_XImporter.java +++ b/qadevOOo/tests/java/ifc/document/_XImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java b/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java index bc2c8da5e68f..6fbbd0c73208 100644 --- a/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java b/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java index 02ebd9df736f..b4a7e82c1e2b 100644 --- a/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java +++ b/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java b/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java index 33996a2f6f5f..b01063c9cfff 100644 --- a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java +++ b/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java index 81342805f4df..b615f2c5df17 100644 --- a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java +++ b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ public class _XTypeDetection extends MultiMethodTest { ok = type.indexOf("calc") > -1; result &= ok; log.println("deep detection should detect a calc and has detected '"+ type +"': " + ok); - + log.println("test dokument with bookmark: " + bookmarkURL); mediaDescr = new PropertyValue[1][1]; mediaDescr[0][0] = new PropertyValue(); @@ -116,7 +116,7 @@ public class _XTypeDetection extends MultiMethodTest { ok = type.indexOf("writer") > -1; result &= ok; log.println("deep detection should detect a writer and has detected '"+ type +"': " + ok); - + tRes.tested("queryTypeByDescriptor()", result) ; } } diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java index 59c159229496..6ff065b53592 100644 --- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ import lib.Status; /** * Check the XViewDataSupplier interface. - * Test idea: take the property values from the index access, change one + * Test idea: take the property values from the index access, change one * property value, put this into the index access and write it back. * Get the property value again and check that the change made it. */ @@ -46,7 +46,7 @@ public class _XViewDataSupplier extends MultiMethodTest { PropertyValue[] newProps = null; PropertyValue[] oldProps = null; String myview = "myview1"; - + public void _getViewData() { xAccess = oObj.getViewData(); // util.dbg.printInterfaces(xAccess); @@ -55,15 +55,15 @@ public class _XViewDataSupplier extends MultiMethodTest { } tRes.tested("getViewData()", true); } - + public void _setViewData() { if (xAccess == null) { log.println("No view data to change available"); tRes.tested("setViewData()", Status.skipped(true)); - } + } else { // 2do: provide an own implementation of the XIndexAccess to set. - // this will work without "setViewData()", it just checks that a + // this will work without "setViewData()", it just checks that a // setViewData can be done. oObj.setViewData(xAccess); XIndexAccess xAccess2 = oObj.getViewData(); @@ -71,7 +71,7 @@ public class _XViewDataSupplier extends MultiMethodTest { tRes.tested("setViewData()", newView.equals(myview)); } } - + private void setViewID(XIndexAccess xAccess, String value) { XIndexContainer xIndexContainer = (XIndexContainer)UnoRuntime.queryInterface(XIndexContainer.class, xAccess); int count = xAccess.getCount(); @@ -98,7 +98,7 @@ public class _XViewDataSupplier extends MultiMethodTest { e.printStackTrace((java.io.PrintWriter)log); } } - + private String getViewID(XIndexAccess xAccess) { String retValue = null; int count = xAccess.getCount(); diff --git a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java index cfa23536a205..57dfa0f56e18 100644 --- a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_CaptionShape.java b/qadevOOo/tests/java/ifc/drawing/_CaptionShape.java index a4c7441d63e0..9c55c9a3c69a 100644 --- a/qadevOOo/tests/java/ifc/drawing/_CaptionShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_CaptionShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorProperties.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorProperties.java index 68438641a353..86443f0548d7 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java index 6b9a27841ae5..041e0beb7498 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java index 509ca7b15a87..21f9b5653db5 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java index 29b7be1de0cf..613ca542bcc9 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocument.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocument.java index c74760addd35..0fdf4a3ba122 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocument.java +++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java index 23e54d39d2e8..85e1b981f4a6 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java +++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { e.printStackTrace(log); } } - + public void _ZoomType() { Object oldValue=null; Object newValue=null; @@ -171,7 +171,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { log.println("oldZoomValue: "+oldValue); log.println("newZoomValue: "+newValue); tRes.tested("ZoomType",(!oldValue.equals(newValue))); - } - + } + } diff --git a/qadevOOo/tests/java/ifc/drawing/_EllipseShape.java b/qadevOOo/tests/java/ifc/drawing/_EllipseShape.java index 5f312f823a97..7c0acbfd22cb 100644 --- a/qadevOOo/tests/java/ifc/drawing/_EllipseShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_EllipseShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_EllipseShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_EllipseShapeDescriptor.java index c043369b5f29..f51b27035d3d 100644 --- a/qadevOOo/tests/java/ifc/drawing/_EllipseShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_EllipseShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java index ba1dc4925664..e0c24398e87c 100644 --- a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java b/qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java index 836abbe75f85..8b39c26f995b 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java +++ b/qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_GenericDrawingDocument.java b/qadevOOo/tests/java/ifc/drawing/_GenericDrawingDocument.java index 53afa0cd3cb0..4f787f7543d7 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GenericDrawingDocument.java +++ b/qadevOOo/tests/java/ifc/drawing/_GenericDrawingDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,6 +29,6 @@ package ifc.drawing; import lib.MultiPropertyTest; -public class _GenericDrawingDocument extends MultiPropertyTest { - +public class _GenericDrawingDocument extends MultiPropertyTest { + } diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java index 4e2483dc8630..636138e3869b 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { try { boolean result = true; Object imapObject = tEnv.getObjRelation("ImapObject"); - + if ( imapObject == null){ System.out.println("ERROR: object relation 'ImapObject' isn't available"); tRes.tested("ImageMap", false); @@ -148,12 +148,12 @@ public class _GraphicObjectShape extends MultiPropertyTest { // behind "ImageMap" stays the same, but for a real change a C++ // implementation is needed. See css.lang.XUnoTunnel oObj.setPropertyValue("ImageMap", xIndexContainer); - Object newObject = oObj.getPropertyValue("ImageMap"); + Object newObject = oObj.getPropertyValue("ImageMap"); xIndexContainer = (XIndexContainer)UnoRuntime.queryInterface(XIndexContainer.class, newObject); int elementCountSecond = xIndexContainer.getCount(); result = (elementCountFirst + 1 == elementCountSecond); - + tRes.tested("ImageMap", result); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("Exception while checking 'ImageMap'"); diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java index 21a113fd58f8..82185ffad811 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_Layer.java b/qadevOOo/tests/java/ifc/drawing/_Layer.java index 62ab7ebbdd08..d5cccf4651a1 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Layer.java +++ b/qadevOOo/tests/java/ifc/drawing/_Layer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java index b6fb1f2186a1..34aa8e4fac60 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class _LineProperties extends MultiPropertyTest { log.println("Testing with custom Property tester"); testProperty("LineStartName", LineTester) ; } - + public void _LineDash() { LineDash aLineDash = new LineDash(); LineDash aLineDash2 = new LineDash(); diff --git a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java index 1b3ae8920357..4449d96c8976 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_MeasureProperties.java b/qadevOOo/tests/java/ifc/drawing/_MeasureProperties.java index 6715d6c08e92..4554c31deb43 100644 --- a/qadevOOo/tests/java/ifc/drawing/_MeasureProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_MeasureProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_MeasureShape.java b/qadevOOo/tests/java/ifc/drawing/_MeasureShape.java index 65b0d32134be..2f9dbfa5d4d3 100644 --- a/qadevOOo/tests/java/ifc/drawing/_MeasureShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_MeasureShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_PolyPolygonBezierDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_PolyPolygonBezierDescriptor.java index 674444a361c7..22ad4a0ab27f 100644 --- a/qadevOOo/tests/java/ifc/drawing/_PolyPolygonBezierDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_PolyPolygonBezierDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_PolyPolygonDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_PolyPolygonDescriptor.java index 9b9c1ccbead3..467c745d0b80 100644 --- a/qadevOOo/tests/java/ifc/drawing/_PolyPolygonDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_PolyPolygonDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java index 2a09eeb4dac5..86bc5bcee519 100644 --- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,15 +72,15 @@ public class _RotationDescriptor extends MultiPropertyTest { * Tests the property with custom tester */ public void _ShearAngle() { - + Object noShear = tEnv.getObjRelation("NoShear"); - + if (noShear != null) { log.println("This shape type doesn't support shear, see #85556#"); tRes.tested("ShearAngle",Status.skipped(true)); return; } - + try { oObj.setPropertyValue("RotateAngle",new Short((short) 0)); } catch (Exception e) { @@ -92,7 +92,7 @@ public class _RotationDescriptor extends MultiPropertyTest { /** * Tests the property with custom tester */ - public void _RotateAngle() { + public void _RotateAngle() { log.println("Testing with custom Property tester") ; testProperty("RotateAngle", drawMeasureTester) ; } diff --git a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java index 00ff64c2a49d..0d335d35b609 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_ShadowProperties.java b/qadevOOo/tests/java/ifc/drawing/_ShadowProperties.java index 8ea905755992..8dc1baf01b51 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShadowProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShadowProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_Shape.java b/qadevOOo/tests/java/ifc/drawing/_Shape.java index 5a64f7012b88..1595a1a2e3f3 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Shape.java +++ b/qadevOOo/tests/java/ifc/drawing/_Shape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public class _Shape extends MultiPropertyTest { } else if (tEnv.getTestCase().getObjectName().equals("ScShapeObj")) { log.println("There is only one Layer for ScShapeObj"); log.println("Therefore this property can't be changed"); - tRes.tested("LayerName",true); + tRes.tested("LayerName",true); } else if (tEnv.getTestCase().getObjectName().equals("ScAnnotationShapeObj")) { log.println("There is only one Layer for ScAnnotationShapeObj"); log.println("Therefore this property can't be changed"); @@ -118,7 +118,7 @@ public class _Shape extends MultiPropertyTest { } catch (Exception e) { e.printStackTrace (log); } - tRes.tested("LayerName",aName != null); + tRes.tested("LayerName",aName != null); } else { log.println("Testing with custom Property tester") ; testProperty("LayerName", StringTester) ; @@ -129,12 +129,12 @@ public class _Shape extends MultiPropertyTest { if (tEnv.getTestCase().getObjectName().equals("ScAnnotationShapeObj")) { log.println("There is only one Layer for ScAnnotationShapeObj"); log.println("Therefore this property can't be changed"); - tRes.tested("ZOrder",true); + tRes.tested("ZOrder",true); } else { testProperty("ZOrder", new Integer(0), new Integer(1)); } } - + public void _LayerID() { if (tEnv.getTestCase().getObjectName().equals("ScAnnotationShapeObj")) { log.println("There is only one Layer for ScAnnotationShapeObj"); @@ -146,7 +146,7 @@ public class _Shape extends MultiPropertyTest { } catch (Exception e) { e.printStackTrace (log); } - tRes.tested("LayerID",aID != null); + tRes.tested("LayerID",aID != null); } else { log.println("Testing with custom Property tester") ; testProperty("LayerID"); diff --git a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java index abeb24bf1e33..9c431b08e10b 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_Text.java b/qadevOOo/tests/java/ifc/drawing/_Text.java index 588ff1efe3c4..8e0cf1891f6e 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Text.java +++ b/qadevOOo/tests/java/ifc/drawing/_Text.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_TextProperties.java b/qadevOOo/tests/java/ifc/drawing/_TextProperties.java index e7e8190e4a46..5d63d892eebc 100644 --- a/qadevOOo/tests/java/ifc/drawing/_TextProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_TextProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_TextShape.java b/qadevOOo/tests/java/ifc/drawing/_TextShape.java index 9fa917bae4a3..98e498634d02 100644 --- a/qadevOOo/tests/java/ifc/drawing/_TextShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_TextShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_TextShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_TextShapeDescriptor.java index c5651534bf90..13cf5da5b5cf 100644 --- a/qadevOOo/tests/java/ifc/drawing/_TextShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_TextShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java index 319c5a7c2ee5..7dc3323fd172 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XControlShape.java b/qadevOOo/tests/java/ifc/drawing/_XControlShape.java index 7141ce155f3f..2abd8beb85f1 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XControlShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XControlShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java index 5bbb6560fe59..204f2c639b2e 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java index 01afaee841c1..baa940f1c8a8 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java index fe0d5a9eca77..37a39af23d34 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSupplier.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSupplier.java index c504e2d864ea..a7738bee2272 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSupplier.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ import lib.MultiMethodTest; */ public class _XDrawPageSupplier extends MultiMethodTest { public XDrawPageSupplier oObj = null; - + public void _getDrawPage() { XDrawPage xPage = oObj.getDrawPage(); log.println("xPage: " + util.utils.getImplName(xPage)); diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPages.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPages.java index 078fb1fba876..a6d03cdafe49 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPages.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPages.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier.java index 912051db3dcd..fc70ae1cedf6 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawView.java b/qadevOOo/tests/java/ifc/drawing/_XDrawView.java index 643f68865de6..cd0018d792d5 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XDrawView.java +++ b/qadevOOo/tests/java/ifc/drawing/_XDrawView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XGluePointsSupplier.java b/qadevOOo/tests/java/ifc/drawing/_XGluePointsSupplier.java index b0eb03245414..ca647a7cc0ce 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XGluePointsSupplier.java +++ b/qadevOOo/tests/java/ifc/drawing/_XGluePointsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XLayerManager.java b/qadevOOo/tests/java/ifc/drawing/_XLayerManager.java index c971df91ee9b..ed4210d50c58 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XLayerManager.java +++ b/qadevOOo/tests/java/ifc/drawing/_XLayerManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XLayerSupplier.java b/qadevOOo/tests/java/ifc/drawing/_XLayerSupplier.java index 770abc9c4eba..3dd3e9ff8adc 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XLayerSupplier.java +++ b/qadevOOo/tests/java/ifc/drawing/_XLayerSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XMasterPageTarget.java b/qadevOOo/tests/java/ifc/drawing/_XMasterPageTarget.java index 393469bd21e0..6160a1bb42d1 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XMasterPageTarget.java +++ b/qadevOOo/tests/java/ifc/drawing/_XMasterPageTarget.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XMasterPagesSupplier.java b/qadevOOo/tests/java/ifc/drawing/_XMasterPagesSupplier.java index 3cf4adae07aa..794493e35b8d 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XMasterPagesSupplier.java +++ b/qadevOOo/tests/java/ifc/drawing/_XMasterPagesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShape.java b/qadevOOo/tests/java/ifc/drawing/_XShape.java index e774721c9fdc..c1a6378bfc46 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ public class _XShape extends MultiMethodTest { } Size gSize = oObj.getSize() ; - + log.println("Previously: "+sOld.Height+";"+sOld.Width); log.println("Expected: "+sNew.Height+";"+sNew.Width); log.println("Getting: "+gSize.Height+";"+gSize.Width); @@ -144,7 +144,7 @@ public class _XShape extends MultiMethodTest { //result &= util.ValueComparer.equalValue(sNew, gSize) ; //errors in calculation from points/twips less then 1 are acceptable result &= (sNew.Height-gSize.Height <= 2) && (sNew.Width-gSize.Width <= 2); - + if (result && ((sNew.Height-gSize.Height != 0) || (sNew.Width-gSize.Width != 0))){ log.println("NOTE: there is a difference between the expected and the getted value. " + "This might be ok because of problems in calculation from points <-> twips"); @@ -179,11 +179,11 @@ public class _XShape extends MultiMethodTest { oObj.setPosition(pNew); Point gPos = oObj.getPosition() ; - + log.println("Previously: "+pOld.X+";"+pOld.Y); log.println("Expected: "+pNew.X+";"+pNew.Y); log.println("Getting: "+gPos.X+";"+gPos.Y); - + result = !util.ValueComparer.equalValue(pOld, gPos) ; tRes.tested("setPosition()", result); diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeBinder.java b/qadevOOo/tests/java/ifc/drawing/_XShapeBinder.java index d150aa986815..93326c756210 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeBinder.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeBinder.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeCombiner.java b/qadevOOo/tests/java/ifc/drawing/_XShapeCombiner.java index f83025c08a84..6c22a42614b9 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeCombiner.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeCombiner.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java index 6ebcc1897402..89291f222464 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeGroup.java b/qadevOOo/tests/java/ifc/drawing/_XShapeGroup.java index 5c7dd2d724f4..aa5dfb60ddd7 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeGroup.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeGroup.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeGrouper.java b/qadevOOo/tests/java/ifc/drawing/_XShapeGrouper.java index 9831886ca7c2..251e6ab6b66d 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeGrouper.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeGrouper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapes.java b/qadevOOo/tests/java/ifc/drawing/_XShapes.java index a28833819e09..b5f7e4e02b4a 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapes.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapes.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java index a43eaf6f53e8..7578975a3a2b 100644 --- a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java +++ b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_FormComponent.java b/qadevOOo/tests/java/ifc/form/_FormComponent.java index 094edfea935e..aa8ca1e37a78 100644 --- a/qadevOOo/tests/java/ifc/form/_FormComponent.java +++ b/qadevOOo/tests/java/ifc/form/_FormComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_FormControlModel.java b/qadevOOo/tests/java/ifc/form/_FormControlModel.java index b33b70cfd1d5..749fc911a559 100644 --- a/qadevOOo/tests/java/ifc/form/_FormControlModel.java +++ b/qadevOOo/tests/java/ifc/form/_FormControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java index fc7112312b44..b977764d0d63 100644 --- a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XBoundComponent.java b/qadevOOo/tests/java/ifc/form/_XBoundComponent.java index a95dd18649a5..d6c7e0c23dbe 100644 --- a/qadevOOo/tests/java/ifc/form/_XBoundComponent.java +++ b/qadevOOo/tests/java/ifc/form/_XBoundComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XBoundControl.java b/qadevOOo/tests/java/ifc/form/_XBoundControl.java index 0015c812ff3b..8303447e75ae 100644 --- a/qadevOOo/tests/java/ifc/form/_XBoundControl.java +++ b/qadevOOo/tests/java/ifc/form/_XBoundControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java index e4ad44e55185..a55e44325ea0 100644 --- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -158,7 +158,7 @@ public class _XChangeBroadcaster extends MultiMethodTest { requiredMethod("addChangeListener()"); changed = false; log.println("Testing removeChangeListener ..."); - oObj.addChangeListener( listener ); + oObj.addChangeListener( listener ); XWindow win2 = (XWindow) tEnv.getObjRelation("Win2"); win2.setFocus(); diff --git a/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java index 89359e331157..957dafe6ff4c 100644 --- a/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ import lib.MultiMethodTest; public class _XConfirmDeleteBroadcaster extends MultiMethodTest { public XConfirmDeleteBroadcaster oObj = null; protected boolean confirmed = false; - protected XConfirmDeleteListener mxConfirmDeleteListener = + protected XConfirmDeleteListener mxConfirmDeleteListener = new ConfirmDeleteImpl(); - + private class ConfirmDeleteImpl implements XConfirmDeleteListener { public boolean confirmDelete(RowChangeEvent rowChangeEvent) { confirmed = true; @@ -62,12 +62,12 @@ public class _XConfirmDeleteBroadcaster extends MultiMethodTest { public void disposing(EventObject eventObject) { } } - + protected void addConfirmDeleteListener() { oObj.addConfirmDeleteListener(mxConfirmDeleteListener); tRes.tested("addConfirmDeleteListener()", true); } - + protected void removeConfirmDeleteListener() { oObj.removeConfirmDeleteListener(mxConfirmDeleteListener); tRes.tested("removeConfirmDeleteListener()", true); diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java index c7c9e69bea38..cbc75e7a4a97 100755 --- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ import lib.MultiMethodTest; * */ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { - + // oObj filled by MultiMethodTest public XDatabaseParameterBroadcaster oObj = null ; private CheckParameterListener listenerChecker = null; - + /** * Interface to implement so the call of the listener can be checked. */ @@ -66,19 +66,19 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { tEnv.getObjRelation("ParameterListenerChecker"); listenerChecker.setLog((PrintWriter)log); } - + /** */ public void _addParameterListener() { oObj.addParameterListener(listenerChecker); tRes.tested("addParameterListener()", true); } - + /** */ public void _removeParameterListener() { requiredMethod("addParameterListener()"); - + // trigger the action. try { XRowSet xRowSet = (XRowSet)UnoRuntime.queryInterface(XRowSet.class, oObj); @@ -93,7 +93,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { oObj.removeParameterListener(listenerChecker); tRes.tested("removeParameterListener()", listenerChecker.checkListener()); } - + protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/_XFormController.java b/qadevOOo/tests/java/ifc/form/_XFormController.java index 1fa0c93f868b..5f9ebd8b1eb7 100644 --- a/qadevOOo/tests/java/ifc/form/_XFormController.java +++ b/qadevOOo/tests/java/ifc/form/_XFormController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XFormsSupplier.java b/qadevOOo/tests/java/ifc/form/_XFormsSupplier.java index 1a8083413d6e..c50d7e41c90c 100644 --- a/qadevOOo/tests/java/ifc/form/_XFormsSupplier.java +++ b/qadevOOo/tests/java/ifc/form/_XFormsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,14 +31,14 @@ import com.sun.star.container.XNameContainer; public class _XFormsSupplier extends lib.MultiMethodTest { - public com.sun.star.form.XFormsSupplier oObj = null; + public com.sun.star.form.XFormsSupplier oObj = null; public void _getForms() { XNameContainer forms = oObj.getForms(); if (!forms.hasElements()) { log.println("NameContainer doesn't contain forms"); } - tRes.tested("getForms()",forms.hasElements()); + tRes.tested("getForms()",forms.hasElements()); } - + } diff --git a/qadevOOo/tests/java/ifc/form/_XGrid.java b/qadevOOo/tests/java/ifc/form/_XGrid.java index 92b7332ef74a..8de0741dc357 100644 --- a/qadevOOo/tests/java/ifc/form/_XGrid.java +++ b/qadevOOo/tests/java/ifc/form/_XGrid.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java b/qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java index 4128b26847d2..707fac8cacd5 100644 --- a/qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java +++ b/qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XGridFieldDataSupplier.java b/qadevOOo/tests/java/ifc/form/_XGridFieldDataSupplier.java index c3968a7e21ab..269d3c91d381 100644 --- a/qadevOOo/tests/java/ifc/form/_XGridFieldDataSupplier.java +++ b/qadevOOo/tests/java/ifc/form/_XGridFieldDataSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XImageProducerSupplier.java b/qadevOOo/tests/java/ifc/form/_XImageProducerSupplier.java index 63495f353872..1f794560c4ab 100644 --- a/qadevOOo/tests/java/ifc/form/_XImageProducerSupplier.java +++ b/qadevOOo/tests/java/ifc/form/_XImageProducerSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XLoadListener.java b/qadevOOo/tests/java/ifc/form/_XLoadListener.java index fffc9c1178db..97cba4d7985b 100644 --- a/qadevOOo/tests/java/ifc/form/_XLoadListener.java +++ b/qadevOOo/tests/java/ifc/form/_XLoadListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java index 347a3b7dc870..d04bf79e4555 100644 --- a/qadevOOo/tests/java/ifc/form/_XLoadable.java +++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -239,7 +239,7 @@ public class _XLoadable extends MultiMethodTest { tRes.tested("removeLoadListener()", result) ; } - + protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/_XReset.java b/qadevOOo/tests/java/ifc/form/_XReset.java index 324df29e9976..2a5ac373cce8 100644 --- a/qadevOOo/tests/java/ifc/form/_XReset.java +++ b/qadevOOo/tests/java/ifc/form/_XReset.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java index 0a7fd40f6e0c..bde221c4e11f 100644 --- a/qadevOOo/tests/java/ifc/form/_XSubmit.java +++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -179,13 +179,13 @@ public class _XSubmit extends MultiMethodTest { log.println("While waiting :" + e) ; } } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } - + } + } diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java index 4a527a5d98f1..67c782037295 100644 --- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -235,14 +235,14 @@ public class _XUpdateBroadcaster extends MultiMethodTest { } } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); } - + } diff --git a/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseCheckBox.java b/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseCheckBox.java index ba88f052b6d2..e8025e63ebd4 100644 --- a/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseCheckBox.java +++ b/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseCheckBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,6 +31,6 @@ package ifc.form.binding; import lib.MultiPropertyTest; public class _BindableDatabaseCheckBox extends MultiPropertyTest -{ - +{ + } diff --git a/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseRadioButton.java b/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseRadioButton.java index e5c490201c55..c6fe6baf2efe 100644 --- a/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseRadioButton.java +++ b/qadevOOo/tests/java/ifc/form/binding/_BindableDatabaseRadioButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,6 +31,6 @@ package ifc.form.binding; import lib.MultiPropertyTest; public class _BindableDatabaseRadioButton extends MultiPropertyTest -{ - +{ + } diff --git a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java index d8ecf916965b..dc895edef8ae 100644 --- a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java +++ b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ public class _XBindableValue extends MultiMethodTest { } public void setValue(Object obj) - throws com.sun.star.form.binding.IncompatibleTypesException, + throws com.sun.star.form.binding.IncompatibleTypesException, com.sun.star.lang.NoSupportException { } diff --git a/qadevOOo/tests/java/ifc/form/component/_CheckBox.java b/qadevOOo/tests/java/ifc/form/component/_CheckBox.java index a35a5318203b..7ccee9121742 100644 --- a/qadevOOo/tests/java/ifc/form/component/_CheckBox.java +++ b/qadevOOo/tests/java/ifc/form/component/_CheckBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_ComboBox.java b/qadevOOo/tests/java/ifc/form/component/_ComboBox.java index 6e81cf0718c2..22c66d713b5b 100644 --- a/qadevOOo/tests/java/ifc/form/component/_ComboBox.java +++ b/qadevOOo/tests/java/ifc/form/component/_ComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_CommandButton.java b/qadevOOo/tests/java/ifc/form/component/_CommandButton.java index 88e2161bf5de..d70a51eb284c 100644 --- a/qadevOOo/tests/java/ifc/form/component/_CommandButton.java +++ b/qadevOOo/tests/java/ifc/form/component/_CommandButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java index d5395baebc30..f28ac4196c74 100644 --- a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java +++ b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DataForm.java b/qadevOOo/tests/java/ifc/form/component/_DataForm.java index 2562994ec32a..88cc991e3b11 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DataForm.java +++ b/qadevOOo/tests/java/ifc/form/component/_DataForm.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseComboBox.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseComboBox.java index 255153b2e0f0..97bc9178de95 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseComboBox.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java index 6201f3cbe407..5a6ff6becfb6 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseFormattedField.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseFormattedField.java index 0e7cf7e499ac..04f4d56a6926 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseFormattedField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseFormattedField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseImageControl.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseImageControl.java index 8953e68263b5..d34d774fc09b 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseImageControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseImageControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseListBox.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseListBox.java index 2b2bcd9f28ff..14a73206a4a7 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseListBox.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabasePatternField.java b/qadevOOo/tests/java/ifc/form/component/_DatabasePatternField.java index cedad761180d..b16cdd00d8c0 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabasePatternField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabasePatternField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseTextField.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseTextField.java index 2ff48480d0e7..b82a60f038ab 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseTextField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseTextField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_DateField.java b/qadevOOo/tests/java/ifc/form/component/_DateField.java index 4241b543d1d3..cb020595d796 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DateField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DateField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_FileControl.java b/qadevOOo/tests/java/ifc/form/component/_FileControl.java index 9b73a1d995d5..5aea1454f06d 100644 --- a/qadevOOo/tests/java/ifc/form/component/_FileControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_FileControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_FormattedField.java b/qadevOOo/tests/java/ifc/form/component/_FormattedField.java index e75f212edbef..8ed7517fc7dd 100644 --- a/qadevOOo/tests/java/ifc/form/component/_FormattedField.java +++ b/qadevOOo/tests/java/ifc/form/component/_FormattedField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_GridControl.java b/qadevOOo/tests/java/ifc/form/component/_GridControl.java index 58412dc4667d..685867bf98f0 100644 --- a/qadevOOo/tests/java/ifc/form/component/_GridControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_GridControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public class _GridControl extends MultiPropertyTest { } }) ; } - + /** * This property can be void, so if old value is <code> null </code> * new value must be specified. diff --git a/qadevOOo/tests/java/ifc/form/component/_HTMLForm.java b/qadevOOo/tests/java/ifc/form/component/_HTMLForm.java index d592a979706c..a2d750c9d813 100644 --- a/qadevOOo/tests/java/ifc/form/component/_HTMLForm.java +++ b/qadevOOo/tests/java/ifc/form/component/_HTMLForm.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_HiddenControl.java b/qadevOOo/tests/java/ifc/form/component/_HiddenControl.java index 3e895e9aa2c2..33d34d8c855e 100644 --- a/qadevOOo/tests/java/ifc/form/component/_HiddenControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_HiddenControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_ImageButton.java b/qadevOOo/tests/java/ifc/form/component/_ImageButton.java index 772d41c23ab0..2a51c2bcab69 100644 --- a/qadevOOo/tests/java/ifc/form/component/_ImageButton.java +++ b/qadevOOo/tests/java/ifc/form/component/_ImageButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_ListBox.java b/qadevOOo/tests/java/ifc/form/component/_ListBox.java index 12cb1c9a5808..ffa807c586ba 100644 --- a/qadevOOo/tests/java/ifc/form/component/_ListBox.java +++ b/qadevOOo/tests/java/ifc/form/component/_ListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java index 0b4714d74cbb..61c1b4a75d50 100644 --- a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java +++ b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ package ifc.form.component; import lib.MultiPropertyTest; public class _NavigationToolBar extends MultiPropertyTest { - + public void _TextColor() { testProperty("TextColor", new PropertyTester() { protected Object getNewValue(String prop, Object old) { @@ -38,8 +38,8 @@ public class _NavigationToolBar extends MultiPropertyTest { super.getNewValue(prop, old) ; } }) ; - } - + } + public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { protected Object getNewValue(String prop, Object old) { @@ -47,6 +47,6 @@ public class _NavigationToolBar extends MultiPropertyTest { super.getNewValue(prop, old) ; } }) ; - } - + } + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/form/component/_NumericField.java b/qadevOOo/tests/java/ifc/form/component/_NumericField.java index 12eb31bab662..69e0ec8fbd73 100644 --- a/qadevOOo/tests/java/ifc/form/component/_NumericField.java +++ b/qadevOOo/tests/java/ifc/form/component/_NumericField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_PatternField.java b/qadevOOo/tests/java/ifc/form/component/_PatternField.java index 67a109e28b4d..c5d75c6c0f2b 100644 --- a/qadevOOo/tests/java/ifc/form/component/_PatternField.java +++ b/qadevOOo/tests/java/ifc/form/component/_PatternField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_RadioButton.java b/qadevOOo/tests/java/ifc/form/component/_RadioButton.java index 44e0ef9f7ed0..7387bcf3450b 100644 --- a/qadevOOo/tests/java/ifc/form/component/_RadioButton.java +++ b/qadevOOo/tests/java/ifc/form/component/_RadioButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_RichTextControl.java b/qadevOOo/tests/java/ifc/form/component/_RichTextControl.java index e154930b4336..25c5653a8a60 100644 --- a/qadevOOo/tests/java/ifc/form/component/_RichTextControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_RichTextControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,5 +30,5 @@ package ifc.form.component; import lib.MultiPropertyTest; public class _RichTextControl extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/form/component/_ScrollBar.java b/qadevOOo/tests/java/ifc/form/component/_ScrollBar.java index d2038667dd95..3197ca957e84 100644 --- a/qadevOOo/tests/java/ifc/form/component/_ScrollBar.java +++ b/qadevOOo/tests/java/ifc/form/component/_ScrollBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,6 +29,6 @@ package ifc.form.component; import lib.MultiPropertyTest; -public class _ScrollBar extends MultiPropertyTest{ - +public class _ScrollBar extends MultiPropertyTest{ + } diff --git a/qadevOOo/tests/java/ifc/form/component/_SpinButton.java b/qadevOOo/tests/java/ifc/form/component/_SpinButton.java index 1564705b004b..dfd279582a34 100644 --- a/qadevOOo/tests/java/ifc/form/component/_SpinButton.java +++ b/qadevOOo/tests/java/ifc/form/component/_SpinButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,5 +30,5 @@ package ifc.form.component; import lib.MultiPropertyTest; public class _SpinButton extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/form/component/_TextField.java b/qadevOOo/tests/java/ifc/form/component/_TextField.java index 1b552e184b19..a04cf25db8af 100644 --- a/qadevOOo/tests/java/ifc/form/component/_TextField.java +++ b/qadevOOo/tests/java/ifc/form/component/_TextField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/component/_TimeField.java b/qadevOOo/tests/java/ifc/form/component/_TimeField.java index 70dc2a75720b..19e4deeae2d8 100644 --- a/qadevOOo/tests/java/ifc/form/component/_TimeField.java +++ b/qadevOOo/tests/java/ifc/form/component/_TimeField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java b/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java index 14c8b37be71d..a4788be7f97d 100644 --- a/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java +++ b/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/submission/_XSubmissionSupplier.java b/qadevOOo/tests/java/ifc/form/submission/_XSubmissionSupplier.java index dc003235e8b9..5b033752befb 100644 --- a/qadevOOo/tests/java/ifc/form/submission/_XSubmissionSupplier.java +++ b/qadevOOo/tests/java/ifc/form/submission/_XSubmissionSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java index bc0b30a4f1d1..4db33af162d3 100644 --- a/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java +++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java index 2a7e989418b2..bc3fe69df914 100644 --- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java +++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ public class _XValidatableFormComponent extends MultiMethodTest // System.out.println("Name: "+testPropsNames[i]); // System.out.println("OldValue: "+oldValue); // System.out.println("NewValue: "+newValue); - // System.out.println("#############################################"); + // System.out.println("#############################################"); } try @@ -159,7 +159,7 @@ public class _XValidatableFormComponent extends MultiMethodTest log.println("Exception occured while setting properties"); e.printStackTrace(log); } - // end of try-catch + // end of try-catch } //Get the properties being tested diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidityConstraintListener.java b/qadevOOo/tests/java/ifc/form/validation/_XValidityConstraintListener.java index 055a3da4478b..3c1ed61b7c9f 100644 --- a/qadevOOo/tests/java/ifc/form/validation/_XValidityConstraintListener.java +++ b/qadevOOo/tests/java/ifc/form/validation/_XValidityConstraintListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,20 +42,20 @@ public class _XValidityConstraintListener extends MultiMethodTest { boolean res = false; try { XValidatable xValidatable = (XValidatable) UnoRuntime.queryInterface( - XValidatable.class, + XValidatable.class, tEnv.getTestObject()); log.println("adding Validator"); XValidator xValidator = new MyValidator(); - xValidatable.setValidator(xValidator); + xValidatable.setValidator(xValidator); ValidatorCalled = false; - + log.println("calling validityConstraintChanged()"); oObj.validityConstraintChanged( new com.sun.star.lang.EventObject()); res = ValidatorCalled; } catch (com.sun.star.util.VetoException e) { - e.printStackTrace(); + e.printStackTrace(); } tRes.tested("validityConstraintChanged()",res); } diff --git a/qadevOOo/tests/java/ifc/formula/_FormulaProperties.java b/qadevOOo/tests/java/ifc/formula/_FormulaProperties.java index f78b6b024771..6f6f412c7ede 100644 --- a/qadevOOo/tests/java/ifc/formula/_FormulaProperties.java +++ b/qadevOOo/tests/java/ifc/formula/_FormulaProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_Desktop.java b/qadevOOo/tests/java/ifc/frame/_Desktop.java index 1e608f73fe8d..f930c5396974 100644 --- a/qadevOOo/tests/java/ifc/frame/_Desktop.java +++ b/qadevOOo/tests/java/ifc/frame/_Desktop.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_Frame.java b/qadevOOo/tests/java/ifc/frame/_Frame.java index a389bb17d242..34787b5c5c72 100644 --- a/qadevOOo/tests/java/ifc/frame/_Frame.java +++ b/qadevOOo/tests/java/ifc/frame/_Frame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_FrameLoader.java b/qadevOOo/tests/java/ifc/frame/_FrameLoader.java index 06ffd1c4b358..e55ec835a8b9 100644 --- a/qadevOOo/tests/java/ifc/frame/_FrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_FrameLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_SynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_SynchronousFrameLoader.java index 259cd21d9afa..7d011edd59c1 100644 --- a/qadevOOo/tests/java/ifc/frame/_SynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_SynchronousFrameLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java index 39e7a0b9bb49..0149b8682800 100644 --- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public class _XComponentLoader extends MultiMethodTest { PropertyValue [] szEmptyArgs = new PropertyValue [0]; String frameName = "_blank"; XComponent oDoc = null; - + log.println("load writer doc that contains links"); PropertyValue [] szArgs = new PropertyValue [1]; PropertyValue Arg = new PropertyValue(); @@ -73,30 +73,30 @@ public class _XComponentLoader extends MultiMethodTest { log.println("try to load '" + url + "'"); oDoc = oObj.loadComponentFromURL( url, frameName, 0, szArgs); - - try { + + try { Thread.sleep(500); } catch (InterruptedException ex) { - } - + } + oDoc.dispose(); - + url = util.utils.getFullTestURL("Calc_Link.sxc"); log.println("try to load '" + url + "'"); oDoc = oObj.loadComponentFromURL( url, frameName, 0, szArgs); - - try { + + try { Thread.sleep(500); } catch (InterruptedException ex) { - } - - oDoc.dispose(); - - - + } + + oDoc.dispose(); + + + log.println("load a blank impress doc"); Arg.Name = "OpenFlags"; Arg.Value = "S"; diff --git a/qadevOOo/tests/java/ifc/frame/_XController.java b/qadevOOo/tests/java/ifc/frame/_XController.java index dd2afe4ca825..7105622ef893 100644 --- a/qadevOOo/tests/java/ifc/frame/_XController.java +++ b/qadevOOo/tests/java/ifc/frame/_XController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XDesktop.java b/qadevOOo/tests/java/ifc/frame/_XDesktop.java index 996cc5af1ae9..a3e99723870c 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDesktop.java +++ b/qadevOOo/tests/java/ifc/frame/_XDesktop.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java index 6fad036bec57..3f760dded161 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,8 +120,8 @@ public class _XDispatch extends MultiMethodTest { TestNotificationListener notificationListener = null; URL url = null ; - /** - * Not all implementations could call the + /** + * Not all implementations could call the * <code>com.sun.star.frame.XStatusListener</code>. For this purposes the * <code>com.sun.star.frame.XDispatchWithNotification</code> was designed. * If <code>com.sun.star.frame.XStatusListener</code> was not called and @@ -130,13 +130,13 @@ public class _XDispatch extends MultiMethodTest { */ private boolean checkXDispatchWithNotification() { - XNotifyingDispatch xND = (XNotifyingDispatch) + XNotifyingDispatch xND = (XNotifyingDispatch) UnoRuntime.queryInterface(XNotifyingDispatch.class, oObj); if ( xND != null) { log.println(" XNotifyingDispatch found:"); - PropertyValue[] arguments = (PropertyValue[]) + PropertyValue[] arguments = (PropertyValue[]) tEnv.getObjRelation("XNotifyingDispatchArgument"); - + notificationListener = new TestNotificationListener(log) ; xND.dispatchWithNotification(url, arguments, notificationListener); @@ -151,7 +151,7 @@ public class _XDispatch extends MultiMethodTest { } else { return false; } - + } /** * Retrieves object relations and creates new listeners. @@ -189,9 +189,9 @@ public class _XDispatch extends MultiMethodTest { catch(java.lang.InterruptedException e) {} log.println("Listener called: "+ listener.statusChangedCalled); - + result = listener.statusChangedCalled; - + if (result == false) { result = checkXDispatchWithNotification(); } @@ -234,9 +234,9 @@ public class _XDispatch extends MultiMethodTest { catch(java.lang.InterruptedException e) {} System.out.println("Listener called: "+ listener.statusChangedCalled); - + result = ! listener.statusChangedCalled; - + tRes.tested("removeStatusListener()", result) ; } } diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java index d3091201070d..39f4849eda95 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java index 549731315d7c..5455ab227e5d 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java index 0b1cd3afd430..b6e73a80d246 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,18 +70,18 @@ public class _XDispatchRecorder extends MultiMethodTest { } public void _startRecording() { - + oObj.startRecording(xFrame); oObj.endRecording(); tRes.tested("startRecording()", true); } public void _getRecordedMacro() { - + clearBuffer(); - + oObj.startRecording(xFrame); - + log.println("dispatch calles via API must be recorded"); dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); @@ -109,12 +109,12 @@ public class _XDispatchRecorder extends MultiMethodTest { && macro.indexOf(dispURL.Complete) > -1; if (!res) log.println("Dispatch URL '" + dispURL.Complete + "' was NOT found in macro - FAILED"); - + tRes.tested("getRecordedMacro()", res); } public void _endRecording() { - + oObj.startRecording(xFrame); oObj.endRecording(); String macro = oObj.getRecordedMacro(); @@ -124,16 +124,16 @@ public class _XDispatchRecorder extends MultiMethodTest { log.println(macro); res = false; } - + tRes.tested("endRecording()", res); } public void _recordDispatch() { clearBuffer(); - + oObj.startRecording(xFrame); - // positve test + // positve test dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); @@ -149,7 +149,7 @@ public class _XDispatchRecorder extends MultiMethodTest { log.println(macro); oObj.endRecording(); - + boolean res = macro != null && macro.indexOf(dispURL.Complete) > -1 && macro.indexOf((String)dispArgs[0].Value) > -1; @@ -162,9 +162,9 @@ public class _XDispatchRecorder extends MultiMethodTest { public void _recordDispatchAsComment() { clearBuffer(); - + oObj.startRecording(xFrame); - + dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); @@ -178,7 +178,7 @@ public class _XDispatchRecorder extends MultiMethodTest { log.println("Getting macro ... :"); String macro = oObj.getRecordedMacro(); log.println(macro); - + oObj.endRecording(); boolean res = macro != null @@ -204,13 +204,13 @@ public class _XDispatchRecorder extends MultiMethodTest { tRes.tested("recordDispatchAsComment()", res); } - + private void shortWait() { try { Thread.sleep(500); } catch (InterruptedException ex) {} } - + private void clearBuffer() { oObj.startRecording(xFrame); oObj.endRecording(); @@ -220,5 +220,5 @@ public class _XDispatchRecorder extends MultiMethodTest { log.println(macro); } } - + } diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java index b6c1f06c5a7e..f89edf56426a 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -194,7 +194,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { UnoRuntime.queryInterface(XDispatchProvider.class, fr); URL dispURL = utils.parseURL((XMultiServiceFactory) tParam.getMSF(), ".uno:InsertText"); - + XDispatch xDisp = xDispProv.queryDispatch(dispURL,"",0); PropertyValue[] args = new PropertyValue[1]; diff --git a/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java b/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java index 5bd47fa83904..7aee5f6eb47e 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java +++ b/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java index aaf59e61ee59..12beaccc011a 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrame.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -290,7 +290,7 @@ public class _XFrame extends MultiMethodTest { boolean result = true; XWindow win = oObj.getComponentWindow() ; - + if (tEnv.getTestCase().getObjectName().equals("Desktop")) { log.println("Desktop has no component window"); tRes.tested("getComponentWindow()", true) ; @@ -503,7 +503,7 @@ public class _XFrame extends MultiMethodTest { requiredMethod("setCreator()") ; boolean result = true; - + XWindow oldWindow = oObj.getComponentWindow(); XController oldController = oObj.getController(); boolean rs = oObj.setComponent(null, null); @@ -527,10 +527,10 @@ public class _XFrame extends MultiMethodTest { /** * Test calls the method. <p> * Has <b> OK </b> status if the method successfully returns. - * In case a frame should initialised twice, a + * In case a frame should initialised twice, a * <CODE>com.sun.star.uno.RuntimeException</CODE> was thron. This is ok. But since * a com.sun.star.uno.RuntimeException could thrown in any state the message of - * the exception must contain a defined string. In this case the test get an + * the exception must contain a defined string. In this case the test get an * <CODE>OK</CODE> status. * The following method tests are to be completed successfully before : * <ul> @@ -553,7 +553,7 @@ public class _XFrame extends MultiMethodTest { log.println(e.toString()); bOK=false; } - + } tRes.tested("initialize()", bOK) ; } @@ -573,7 +573,7 @@ public class _XFrame extends MultiMethodTest { return false; } } - + /** * Forces environment recreation. */ diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameActionListener.java b/qadevOOo/tests/java/ifc/frame/_XFrameActionListener.java index b95e438972ac..bf74de351059 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameActionListener.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameActionListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ import com.sun.star.frame.XFrameActionListener; import lib.MultiMethodTest; public class _XFrameActionListener extends MultiMethodTest { - + public XFrameActionListener oObj = null; - + public void _frameAction() { FrameActionEvent event = new FrameActionEvent(); oObj.frameAction(event); diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java index a914d3e711b9..f386667de545 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java b/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java index bd6bcd7a4f86..ffb34939a793 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -172,7 +172,7 @@ public class _XFramesSupplier extends MultiMethodTest { new Type(XFrame.class),frames.getByIndex(0)); } catch (com.sun.star.lang.IllegalArgumentException iae) { log.println("Can't convert any"); - } + } else try { sFrame = (XFrame) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java b/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java index 2d644d2b2391..74d9e42efa55 100644 --- a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java +++ b/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ public class _XInplaceLayout extends MultiMethodTest { // oObj.setInplaceMenuBar(l); tRes.tested("setInplaceMenuBar()", true); } - + public void _resetInplaceMenuBar() { requiredMethod("setInplaceMenuBar()"); oObj.resetInplaceMenuBar(); diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index 34fd55182e92..24ef9d4eee12 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,14 +39,14 @@ import util.utils; public class _XLayoutManager extends MultiMethodTest { public XLayoutManager oObj = null; - + private XFrame xFrame = null; private String sElementName = "private:resource/menubar/myMenu"; - + public void before() { xFrame = (XFrame)tEnv.getObjRelation("XLayoutManager.Frame"); } - + public void _attachFrame() { oObj.attachFrame(xFrame); tRes.tested("attachFrame()", true); @@ -57,19 +57,19 @@ public class _XLayoutManager extends MultiMethodTest { oObj.createElement(sElementName); tRes.tested("createElement()", true); } - + public void _destroyElement() { requiredMethod("getElement()"); requiredMethod("getElements()"); oObj.destroyElement(sElementName); tRes.tested("destroyElement()", true); } - + public void _doLayout() { oObj.doLayout(); tRes.tested("doLayout()", true); } - + public void _dockWindow() { requiredMethod("createElement()"); Point p = new Point(); @@ -78,35 +78,35 @@ public class _XLayoutManager extends MultiMethodTest { oObj.dockWindow(sElementName, DockingArea.DOCKINGAREA_TOP, p); tRes.tested("dockWindow()", true); } - + public void _floatWindow() { requiredMethod("createElement()"); oObj.floatWindow(sElementName); tRes.tested("floatWindow()", true); } - + public void _getCurrentDockingArea() { requiredMethod("attachFrame()"); Rectangle rect = oObj.getCurrentDockingArea(); tRes.tested("getCurrentDockingArea()", rect != null); } - + public void _getElement() { requiredMethod("createElement()"); XUIElement xElement = oObj.getElement(sElementName); tRes.tested("getElement()", true); } - + public void _getElementPos() { Point p = oObj.getElementPos(sElementName); tRes.tested("getElementPos()", p != null); } - + public void _getElementSize() { Size s = oObj.getElementSize(sElementName); tRes.tested("getElementSize()", s != null); } - + public void _getElements() { requiredMethod("createElement()"); XUIElement[] xElements = oObj.getElements(); @@ -116,42 +116,42 @@ public class _XLayoutManager extends MultiMethodTest { } tRes.tested("getElements()", xElements != null); } - + public void _hideElement() { boolean hidden = oObj.hideElement(sElementName); tRes.tested("hideElement()", true); } - + public void _isElementDocked() { boolean docked = oObj.isElementDocked(sElementName); tRes.tested("isElementDocked()", true); } - + public void _isElementFloating() { boolean docked = oObj.isElementFloating(sElementName); tRes.tested("isElementFloating()", true); } - + public void _isElementVisible() { boolean docked = oObj.isElementVisible(sElementName); tRes.tested("isElementVisible()", true); } - + public void _lock() { oObj.lock(); tRes.tested("lock()", true); } - + public void _reset() { oObj.reset(); tRes.tested("reset()", true); } - + public void _setDockingAreaAcceptor() { oObj.setDockingAreaAcceptor(null); tRes.tested("setDockingAreaAcceptor()", true); } - + public void _setElementPos() { requiredMethod("createElement()"); Point p = new Point(); @@ -160,7 +160,7 @@ public class _XLayoutManager extends MultiMethodTest { oObj.setElementPos(sElementName, p); tRes.tested("setElementPos()", true); } - + public void _setElementPosSize() { requiredMethod("createElement()"); Point p = new Point(); @@ -172,7 +172,7 @@ public class _XLayoutManager extends MultiMethodTest { oObj.setElementPosSize(sElementName, p, size); tRes.tested("setElementPosSize()", true); } - + public void _setElementSize() { requiredMethod("createElement()"); Size size = new Size(); @@ -181,18 +181,18 @@ public class _XLayoutManager extends MultiMethodTest { oObj.setElementSize(sElementName, size); tRes.tested("setElementSize()", true); } - + public void _showElement() { requiredMethod("createElement()"); boolean shown = oObj.showElement(sElementName); tRes.tested("showElement()", true); } - + public void _unlock() { requiredMethod("lock()"); oObj.unlock(); tRes.tested("unlock()", true); } - + } diff --git a/qadevOOo/tests/java/ifc/frame/_XModel.java b/qadevOOo/tests/java/ifc/frame/_XModel.java index 6fa133e28780..4cc92fbe553b 100644 --- a/qadevOOo/tests/java/ifc/frame/_XModel.java +++ b/qadevOOo/tests/java/ifc/frame/_XModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java index 375500f89bb6..e542b249266b 100755 --- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public class _XModuleManager extends MultiMethodTest { * coresponding value.<p> * As enhancement the method <CODE>identify()</CODE> was called with incvalid * parameter. In this case the thrown exceptions was catched. - */ + */ public XModuleManager oObj = null; /** * Test calls the method. <p> @@ -82,35 +82,35 @@ public class _XModuleManager extends MultiMethodTest { * relation 'Frame' </li> * </ul> */ - + private PropertyValue[] xFrameSeq = null; private PropertyValue[] xControllerSeq = null; private PropertyValue[] xModelSeq = null; /** Retrieves object relations. */ - + public void before() { - + xFrameSeq = (PropertyValue[]) tEnv.getObjRelation("XModuleManager.XFrame") ; if (xFrameSeq == null) throw new StatusException (Status.failed("Relation 'xFrameSeq' not found.")) ; - - + + xControllerSeq = (PropertyValue[]) tEnv.getObjRelation("XModuleManager.XController") ; if (xControllerSeq == null) throw new StatusException (Status.failed("Relation 'xControllerSeq' not found.")) ; - - + + xModelSeq = (PropertyValue[]) tEnv.getObjRelation("XModuleManager.XModel") ; if (xModelSeq == null) throw new StatusException (Status.failed("Relation 'xModelSeq' not found.")) ; } - + /** The method <CODE>identify()</CODE> was tesed for every entry in sequeze of * object relations. - */ + */ public void _identify() { boolean ok = true; log.println("testing frame sequenze..."); @@ -130,7 +130,7 @@ public class _XModuleManager extends MultiMethodTest { log.println("expected exception."); } } - + private boolean testSequenze(PropertyValue[] sequenze){ boolean ok = true; for (int i = 0 ; i < sequenze.length; i++){ @@ -138,10 +138,10 @@ public class _XModuleManager extends MultiMethodTest { log.println("testing '" + sequenze[i].Name + "'"); if (oObj.identify(sequenze[i].Value).equals( sequenze[i].Name)){ - ok &= ok; + ok &= ok; }else{ - log.println("failure: returned value: '" + - oObj.identify(sequenze[i].Value) + + log.println("failure: returned value: '" + + oObj.identify(sequenze[i].Value) + "' ,expected value: '" + sequenze[i].Name + "'"); ok = false; } @@ -149,7 +149,7 @@ public class _XModuleManager extends MultiMethodTest { log.println("Could not get value of sequenze '" + sequenze[i].Name + "'"); return false; - + } catch (UnknownModuleException e){ log.println("Could not indetify value of sequenze '" + sequenze[i].Name + "'"); @@ -158,6 +158,6 @@ public class _XModuleManager extends MultiMethodTest { } return ok; } - + } diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index 8402aac41db2..096408a55e31 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ import com.sun.star.frame.DispatchResultEvent; * <ul> * <li> <code>'XDispatch.URL'</code> (of type <code>com.sun.star.util.URL * </code>): URL for passing to <code>dispatch()</code> method. </li> -* <li> <code>[OPTIONAL] 'XNotifyingDispatchArgument'</code> +* <li> <code>[OPTIONAL] 'XNotifyingDispatchArgument'</code> * (of type sequence<code>com::sun::star::beans::PropertyValue * </code>): argumets for <code>dispatchWithNotification()</code> method. </li> * <ul> <p> @@ -98,8 +98,8 @@ public class _XNotifyingDispatch extends MultiMethodTest { if (url == null) throw new StatusException (Status.failed("Relation not found.")) ; - - arguments = (PropertyValue[]) + + arguments = (PropertyValue[]) tEnv.getObjRelation("XNotifyingDispatchArgument"); } @@ -120,9 +120,9 @@ public class _XNotifyingDispatch extends MultiMethodTest { catch(java.lang.InterruptedException e) {} log.println("Listener called: "+ notificationListener.finishedDispatch); - + result = notificationListener.finishedDispatch; - + tRes.tested("dispatchWithNotification()", result) ; } diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java index f057e64824c5..d53acd11e290 100644 --- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java +++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,103 +35,103 @@ public class _XPopupMenuController extends MultiMethodTest { public XPopupMenuController oObj = null; public void before() { - + } - + public void _setPopupMenu() { XPopupMenu xMenu = new PopupMenuImpl(); oObj.setPopupMenu(xMenu); tRes.tested("setPopupMenu()", true); } - + public void _updatePopupMenu() { oObj.updatePopupMenu(); tRes.tested("updatePopupMenu()", true); } - + private class PopupMenuImpl implements XPopupMenu { - + public void addMenuListener(com.sun.star.awt.XMenuListener xMenuListener) { System.out.println("addMenuListener called."); } - + public void checkItem(short param, boolean param1) { System.out.println("checkItemListener called."); } - + public void enableItem(short param, boolean param1) { System.out.println("enableItem called."); } - + public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Rectangle rectangle, short param) { System.out.println("execute called."); return 0; } - + public short getDefaultItem() { System.out.println("getDefaultItem called."); return 0; } - + public short getItemCount() { System.out.println("getItemCount called."); return 0; } - + public short getItemId(short param) { System.out.println("getItemId called."); return 0; } - + public short getItemPos(short param) { System.out.println("getItemPos called."); return 0; } - + public String getItemText(short param) { System.out.println("getItemText called."); return "Hi."; } - + public com.sun.star.awt.XPopupMenu getPopupMenu(short param) { System.out.println("getPopupMenu called."); return this; } - + public void insertItem(short param, String str, short param2, short param3) { System.out.println("insertItem called."); } - + public void insertSeparator(short param) { System.out.println("insertSeparator called."); } - + public boolean isItemChecked(short param) { System.out.println("isItemChecked called."); return false; } - + public boolean isItemEnabled(short param) { System.out.println("isItemEnabled called."); return false; } - + public void removeItem(short param, short param1) { System.out.println("removeItem called."); } - + public void removeMenuListener(com.sun.star.awt.XMenuListener xMenuListener) { System.out.println("removeMenuListener called."); } - + public void setDefaultItem(short param) { System.out.println("setDefaultItem called."); } - + public void setItemText(short param, String str) { System.out.println("setItemText called."); } - + public void setPopupMenu(short param, com.sun.star.awt.XPopupMenu xPopupMenu) { System.out.println("setPopupMenu called."); } diff --git a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java index 23f71df14e78..4b08c23e320f 100644 --- a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java +++ b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ import lib.MultiMethodTest; public class _XStatusListener extends MultiMethodTest { public XStatusListener oObj = null; - + public void before() { - + } - + public void _statusChanged() { FeatureStateEvent event = new FeatureStateEvent(); oObj.statusChanged(event); diff --git a/qadevOOo/tests/java/ifc/frame/_XStorable.java b/qadevOOo/tests/java/ifc/frame/_XStorable.java index 4edc1eb45e54..416065db5e4e 100644 --- a/qadevOOo/tests/java/ifc/frame/_XStorable.java +++ b/qadevOOo/tests/java/ifc/frame/_XStorable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java index 2f430afa6e39..0fd36904c26c 100644 --- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { descr[0].Name = "URL" ; descr[0].Value = urlS[0] ; } - + /** * Tries to load component to a frame. <p> diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java index c6702fd9dec1..18c2997e304b 100644 --- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java index 34441e23e36d..595acf8fc7c8 100644 --- a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java +++ b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,20 +38,20 @@ public class _XUIControllerRegistration extends MultiMethodTest { public void before() { aRegisteredController = (String)tEnv.getObjRelation("XUIControllerRegistration.RegisteredController"); } - - + + public void _registerController() { oObj.registerController(aController, "", "com.sun.star.comp.framework.FooterMenuController"); oObj.registerController(aRegisteredController, "", "com.sun.star.comp.framework.HeaderMenuController"); tRes.tested("registerController()", true); } - + public void _deregisterController() { requiredMethod("registerController()"); oObj.deregisterController(aController, ""); tRes.tested("deregisterController()", true); } - + public void _hasController() { requiredMethod("registerController()"); requiredMethod("deregisterController()"); @@ -59,5 +59,5 @@ public class _XUIControllerRegistration extends MultiMethodTest { res &= !oObj.hasController(aController, ""); tRes.tested("hasController()", res); } - + } diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java index 7589bc8774c8..9ab9fe9ef5cd 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,7 +152,7 @@ public class _XBreakIterator extends MultiMethodTest { public void _previousCharacters() { short nCharacterIteratorMode = com.sun.star.i18n.CharacterIteratorMode.SKIPCHARACTER; - + //Start from position : Travel ... chars : Actual position after : //How many chars traveled diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 5453eefa49cb..cc0fd80aaef4 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public class _XCalendar extends MultiMethodTest { count = new int[installed_locales.length]; oObj.loadDefaultCalendar(installed_locales[0]); aOriginalDTime = oObj.getDateTime(); - + debug = tParam.getBool("DebugIsActive"); } @@ -105,7 +105,7 @@ public class _XCalendar extends MultiMethodTest { oObj.loadDefaultCalendar(installed_locales[0]); oObj.setDateTime(aOriginalDTime); } - + /** * Loads default calendar for different locales. <p> * Has <b> OK </b> status if method loads calendar, that is @@ -250,7 +250,7 @@ public class _XCalendar extends MultiMethodTest { public void _setDateTime() { boolean res = true; - + for (int i=0; i<installed_locales.length; i++) { String lang = "Language: "+installed_locales[i].Language + ", Country: "+ installed_locales[i].Country + @@ -320,15 +320,15 @@ public class _XCalendar extends MultiMethodTest { CalendarFieldIndex.MONTH }; for (int k=0; k<fields.length;k++) { - + oObj.setDateTime(0.0); - + // save the current values for debug purposes short[] oldValues = new short[fields.length]; for (int n=0; n < oldValues.length; n++){ oldValues[n] = oObj.getValue(fields[n]); } - + short set = oObj.getValue(fields[k]); if (fields[k] == CalendarFieldIndex.MONTH) set = newValue; oObj.setValue(fields[k],set); @@ -344,7 +344,7 @@ public class _XCalendar extends MultiMethodTest { for (int n=0; n < fields.length;n++){ log.println(names[n] + ":" + oObj.getValue(fields[n])); } - + error += "failed for "+names[k]+" expected "+ set+" gained "+get+" ; \n"; } @@ -539,7 +539,7 @@ public class _XCalendar extends MultiMethodTest { */ public void _isValid() { boolean res = true; - + oObj.loadDefaultCalendar(installed_locales[0]); oObj.setValue(CalendarFieldIndex.MONTH, (short) 37); res &= !oObj.isValid(); diff --git a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java index e81b8aa68307..0b6ee05ca44c 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ public class _XCharacterClassification extends MultiMethodTest { public void _toUpper() { boolean res = true; char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404}; - String toCheck = new String(characters); + String toCheck = new String(characters); String get = ""; String exp = ""; diff --git a/qadevOOo/tests/java/ifc/i18n/_XCollator.java b/qadevOOo/tests/java/ifc/i18n/_XCollator.java index 1905ca9a68ea..b5cd552a74d6 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCollator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCollator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java index 8004a4eb97b0..9240ee792c56 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public class _XExtendedCalendar extends MultiMethodTest { Locale lo = installed_locales[0]; for (int i=0; i<installed_locales.length; i++) { // search for "en" and "US" - if (installed_locales[i].Language.equals("en") && + if (installed_locales[i].Language.equals("en") && installed_locales[i].Country.equals("US")) { lo = installed_locales[i]; useUSENLocale = true; @@ -73,8 +73,8 @@ public class _XExtendedCalendar extends MultiMethodTest { log.println("Choose Locale: '" + lo.Language + "', '" + lo.Country + "'"); oObj.loadDefaultCalendar(lo); } - - + + public void _getDisplayString() { // against regression: the current state is the right one. boolean result = true; @@ -83,13 +83,13 @@ public class _XExtendedCalendar extends MultiMethodTest { String[] expectedStringResult = new String[6]; Calendar cal = new GregorianCalendar(); Date actualDate = cal.getTime(); - + SimpleDateFormat sdf = getSDF("yy"); expectedStringResult[0] = "AD" + sdf.format(actualDate); - + sdf = getSDF("yyyy"); expectedStringResult[1] = "AD" + sdf.format(actualDate); - + sdf = getSDF("MM"); expectedStringResult[2] = sdf.format(actualDate); @@ -101,36 +101,36 @@ public class _XExtendedCalendar extends MultiMethodTest { else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th quarter"; } expectedStringResult[3] = quarter; expectedStringResult[4] = longQuarter; - + sdf = getSDF("MMMM"); expectedStringResult[5] = sdf.format(actualDate); - + displayString[0] = oObj.getDisplayString(CalendarDisplayCode.SHORT_YEAR_AND_ERA, NativeNumberMode.NATNUM0); displayString[1] = oObj.getDisplayString(CalendarDisplayCode.LONG_YEAR_AND_ERA, NativeNumberMode.NATNUM0); displayString[2] = oObj.getDisplayString(CalendarDisplayCode.LONG_MONTH, NativeNumberMode.NATNUM0); displayString[3] = oObj.getDisplayString(CalendarDisplayCode.SHORT_QUARTER, NativeNumberMode.NATNUM0); displayString[4] = oObj.getDisplayString(CalendarDisplayCode.LONG_QUARTER, NativeNumberMode.NATNUM0); displayString[5] = oObj.getDisplayString(CalendarDisplayCode.LONG_MONTH_NAME, NativeNumberMode.NATNUM0); - + for (int i=0; i<displayString.length; i++) { boolean locResult = false; if (useUSENLocale) { locResult = displayString[i].equals(expectedStringResult[i]); if (!locResult) - log.println("getDisplayString() result " + i + ": '" + displayString[i] + log.println("getDisplayString() result " + i + ": '" + displayString[i] + "', expected: '" + expectedStringResult[i] + "'"); result &= locResult; } else { // no defaults for other locales, just expect a String locResult &= displayString[i] != null; if (!locResult) - log.println("getDisplayString() result " + i + " was 'null'"); + log.println("getDisplayString() result " + i + " was 'null'"); result &= locResult; } } tRes.tested("getDisplayString()", result); } - + private SimpleDateFormat getSDF(String format){ if (useUSENLocale) return new SimpleDateFormat(format, java.util.Locale.US); return new SimpleDateFormat(format); diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java index 2443156b0baf..abdce31d7dc6 100755 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { short result1 = oObj.compareIndexEntry(val1, "", locale, val1, "", locale); short result2 = oObj.compareIndexEntry(val1, "", locale, val2, "", locale); short result3 = oObj.compareIndexEntry(val2, "", locale, val1, "", locale); - + tRes.tested("compareIndexEntry()", result1 == 0 && result2 + result3 == 0); } @@ -60,21 +60,21 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { requiredMethod("getLocaleList()"); boolean result = true; - boolean locResult = false; - + boolean locResult = false; + for (int i = 0; i < locales.length; i++) { String[] algNames = oObj.getAlgorithmList(locales[i]); algorithms.put(new Integer(i), algNames); locResult = algNames != null && algNames.length > 0; System.out.println("Locale " + i + ": " + locales[i].Country+","+locales[i].Language); - + for (int j=0; j<algNames.length; j++) { System.out.println("\tAlgorithm " + j + ": " + algNames[j]); } - + if (!locResult) { - log.println("No Algorithm found for " + locales[i].Country + + log.println("No Algorithm found for " + locales[i].Country + "," + locales[i].Language); } @@ -94,10 +94,10 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { for (int j = 0; j < algorithms.size(); j++) { String[] algs = (String[])algorithms.get(new Integer(j)); for (int k=0;k<algs.length;k++) { - log.println("\t Algorythm :" + + log.println("\t Algorythm :" + algs[k]); oObj.loadAlgorithm(locales[i], algs[k], CollatorOptions.CollatorOptions_IGNORE_CASE); - log.println("\t\t Get: " + + log.println("\t\t Get: " + oObj.getIndexKey(getIndexFor, "", locales[i])); } } @@ -123,8 +123,8 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { boolean res = true; Locale loc = new Locale("zh", "CN", ""); - - for (int i = 0;i<UnicodeStringPair.getValCount();i++) { + + for (int i = 0;i<UnicodeStringPair.getValCount();i++) { char[] c = new char[]{UnicodeStringPair.getUnicodeValue(i)}; @@ -144,8 +144,8 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { } /* - * loads all algorithms available in all language. - * Is OK if no exception occurs and the method returns + * loads all algorithms available in all language. + * Is OK if no exception occurs and the method returns * true for each valid algorithm and false otherwise */ public void _loadAlgorithm() { @@ -155,13 +155,13 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { for (int i = 0; i < algorithms.size(); i++) { String[] names = (String[]) algorithms.get(new Integer(i)); - log.println("loading algorithms for " + locales[i].Country + + log.println("loading algorithms for " + locales[i].Country + "," + locales[i].Language); for (int j = 0; j < names.length; j++) { log.println("\t Loading " + names[j]); - boolean localres = oObj.loadAlgorithm(locales[i], names[j], + boolean localres = oObj.loadAlgorithm(locales[i], names[j], CollatorOptions.CollatorOptions_IGNORE_CASE); if (!localres) { @@ -175,7 +175,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { /* log.println("\tTrying to load 'dummy' algorithm"); - boolean localres = !oObj.loadAlgorithm(locales[i], "dummy", + boolean localres = !oObj.loadAlgorithm(locales[i], "dummy", CollatorOptions.CollatorOptions_IGNORE_WIDTH); if (!localres) { @@ -191,7 +191,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { } /* - * checks the method usePhoneticEntry(). Only the languages ja, ko and zh + * checks the method usePhoneticEntry(). Only the languages ja, ko and zh * should return true. Has OK state if exactly this is the case. */ public void _usePhoneticEntry() { @@ -202,8 +202,8 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { for (int i = 0; i < locales.length; i++) { boolean expected = false; - if (locales[i].Language.equals("ja") || - locales[i].Language.equals("ko") || + if (locales[i].Language.equals("ja") || + locales[i].Language.equals("ko") || locales[i].Language.equals("zh")) { expected = true; } @@ -221,7 +221,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { tRes.tested("usePhoneticEntry()", res); } - + /** * Helper class to handle the phonetic equivalence of unicode characters * This class delivers an amount oif unicode characters and the equivalent phonetics @@ -231,27 +231,27 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { final static int valCount = 78; static String[] sStringEquivalence = null; static char[] iUnicodeEquivalence = null; - + static { sStringEquivalence = new String[valCount]; iUnicodeEquivalence = new char[valCount]; fillValues(); } - + public static int getValCount() { return valCount; } - + public static String getExpectedPhoneticString(int index) { if (index >= valCount) return null; return sStringEquivalence[index]; } - + public static char getUnicodeValue(int index) { if (index > valCount) return 0; return iUnicodeEquivalence[index]; } - + private static void fillValues() { iUnicodeEquivalence[0] = 20049; sStringEquivalence[0] = "zhong"; iUnicodeEquivalence[1] = 19968; sStringEquivalence[1] = "yi"; diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java index caea6c06541a..087710c79420 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ public class _XExtendedTransliteration extends MultiMethodTest { public XExtendedTransliteration oObj = null; // private Locale loc = new Locale("ja", "JP", "") ; private Locale loc = new Locale("en", "US", "") ; - + public void before() { oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc); } - + /** * Check lowercase - uppercase conversion of chars */ @@ -62,7 +62,7 @@ public class _XExtendedTransliteration extends MultiMethodTest { } tRes.tested("transliterateChar2Char()", result); } - + /** * Check lowercase - uppercase conversion of char to string */ @@ -77,7 +77,7 @@ public class _XExtendedTransliteration extends MultiMethodTest { result &= out.equals("$"); tRes.tested("transliterateChar2String()", result); } - + /** * Check lowercase - uppercase conversion of strings */ diff --git a/qadevOOo/tests/java/ifc/i18n/_XIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XIndexEntrySupplier.java index 903068b152aa..124004934271 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XIndexEntrySupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java index fcb1f4b266a5..9df9a573715b 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java +++ b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/i18n/_XNumberFormatCode.java b/qadevOOo/tests/java/ifc/i18n/_XNumberFormatCode.java index 0566e27112c4..7f35409a3f89 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XNumberFormatCode.java +++ b/qadevOOo/tests/java/ifc/i18n/_XNumberFormatCode.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java index ea8502d31f29..b7c0893e878c 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java index 8bf57eb657fe..714246a1d3f1 100644 --- a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java +++ b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ import lib.StatusException; */ public class _XObjectInspector extends MultiMethodTest { - + /** * the test object */ @@ -71,7 +71,7 @@ public class _XObjectInspector extends MultiMethodTest { * test the method <CODE>setInspectorModel()</CODE> */ public XObjectInspectorModel xSetModel = null; - + /** * get object relations * <ul> @@ -79,38 +79,38 @@ public class _XObjectInspector extends MultiMethodTest { * </ul> */ public void before() { - + oInspect = (Object[]) tEnv.getObjRelation("XObjectInspector.toInspect"); - + if (oInspect == null) throw new StatusException (Status.failed("Relation 'XObjectInspector.toInspect' not found.")) ; - + xSetModel = (XObjectInspectorModel) tEnv.getObjRelation("XObjectInspector.InspectorModelToSet"); - + if (xSetModel == null) throw new StatusException (Status.failed("Relation 'XObjectInspector.InspectorModelToSet' not found.")) ; } - + /** * Inspects a new collection of one or more objects given by object realtion * <CODE>XObjectInspector.toInspect</CODE><br> * Has <b>OK</b> status if no runtime exceptions occured. */ public void _inspect() { - + boolean result = true; - + try { oObj.inspect(oInspect); - + } catch (com.sun.star.util.VetoException e){ log.println("ERROR:" + e.toString()); result = false; } - + tRes.tested("inspect()", result) ; } - + /** * First call the method <CODE>getInspectorModel()</CODE> and save the value<br> * Second call the method <CODE>setInspectorModel()</CODE> with the module variable @@ -124,20 +124,20 @@ public class _XObjectInspector extends MultiMethodTest { log.println("testing 'getInspectorModel()'..."); XObjectInspectorModel xGetModel = oObj.getInspectorModel() ; - + boolean result = xGetModel != null; - + log.println(result? "got a not null object -> OK" : "got a NULL object -> FAILED"); log.println("testing 'setInspectorModel()'..."); oObj.setInspectorModel(xSetModel); - + XObjectInspectorModel xNewModel = oObj.getInspectorModel(); - + if (result) oObj.setInspectorModel(xGetModel); - + result &= xSetModel.equals(xNewModel); - + tRes.tested("InspectorModel()", result) ; } diff --git a/qadevOOo/tests/java/ifc/inspection/_XObjectInspectorModel.java b/qadevOOo/tests/java/ifc/inspection/_XObjectInspectorModel.java index e03cb51a1c5f..c064f9b19fa8 100644 --- a/qadevOOo/tests/java/ifc/inspection/_XObjectInspectorModel.java +++ b/qadevOOo/tests/java/ifc/inspection/_XObjectInspectorModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,116 +45,116 @@ import lib.MultiMethodTest; * */ public class _XObjectInspectorModel extends MultiMethodTest { - + /** * the test object */ public XObjectInspectorModel oObj = null; - + /** * calls the method <CODE>getHandlerFactories()</CODE> * Has <b>OK</b> status if returned value is not null. */ public void _HandlerFactories() { - + Object[] HandlerFactories = oObj.getHandlerFactories(); - + tRes.tested("HandlerFactories()", HandlerFactories != null) ; } - + /** * Call the method <CODE>getPropertyOrderIndex()</CODE> with an invalid propety name. * Has <CODE>OK</CODE> status if the returned index is "0". */ public void _getPropertyOrderIndex() { - + int index = 0; boolean result = true; - + log.println("try to get index of INvalid property name 'InvalidPropertyName' ..."); index = oObj.getPropertyOrderIndex("InvalidPropertyName"); log.println("index is: " + index); result = (index == 0); - + tRes.tested("getPropertyOrderIndex()", result) ; } - + /** * Call the method <CODE>describeCategories()</CODE> * Has <b>OK</b> status if returned value is not null. */ public void _describeCategories() { - + PropertyCategoryDescriptor[] categories = oObj.describeCategories(); - + tRes.tested("describeCategories()", categories != null) ; } - + /** * Call the method <CODE>getHasHelpSection()</CODE> * Has <b>OK</b> status if method returned </CODE>true</CODE> */ public void _HasHelpSection() { - + boolean hasHelpSection = oObj.getHasHelpSection(); - + tRes.tested("HasHelpSection()", hasHelpSection) ; } - + /** * Call the method <CODE>getMinHelpTextLines()</CODE> * Has <b>OK</b> status if returned value equals to object relation 'minHelpTextLines' */ public void _MinHelpTextLines() { - + Integer minHelpTextLines = (Integer) tEnv.getObjRelation("minHelpTextLines"); - + int getMinHelpTextLines = oObj.getMinHelpTextLines(); - + boolean result = (minHelpTextLines.intValue() == getMinHelpTextLines); - + if (!result) log.println("FAILED: value:" + minHelpTextLines + " getted value:" + getMinHelpTextLines); - + tRes.tested("MinHelpTextLines()", result) ; } - + /** * Call the method <CODE>getMaxHelpTextLines())</CODE> * Has <b>OK</b> status if returned value equals to object relation 'maxHelpTextLines' */ public void _MaxHelpTextLines() { - + Integer maxHelpTextLines = (Integer) tEnv.getObjRelation("maxHelpTextLines"); - + int getMaxHelpTextLines = oObj.getMaxHelpTextLines(); - + boolean result = (maxHelpTextLines.intValue() == getMaxHelpTextLines); - + if (!result) log.println("FAILED: expected value:" + maxHelpTextLines + " getted value:" + getMaxHelpTextLines); - + tRes.tested("MaxHelpTextLines()", result); } - + public void _IsReadOnly() { boolean readOnly = oObj.getIsReadOnly(); - + oObj.setIsReadOnly(!readOnly); - + boolean result = (readOnly != oObj.getIsReadOnly()); if (!result){ log.println("FAILED: could not change 'IsReadOnly' to value '" + !readOnly + "'"); } - + oObj.setIsReadOnly(readOnly); - + result &= (readOnly == oObj.getIsReadOnly()); if (!result){ log.println("FAILED: could not change back 'IsReadOnly' to value '" + !readOnly + "'"); } - + tRes.tested("IsReadOnly()", result); } - + } diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java index 1203fdeecbcb..905558b55118 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java index 5a1c5f054719..c415d0c02b4a 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java index a363dd5edeb8..e0589774c72b 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XConnectable.java b/qadevOOo/tests/java/ifc/io/_XConnectable.java index 471714aeee23..e0c054fd91bb 100644 --- a/qadevOOo/tests/java/ifc/io/_XConnectable.java +++ b/qadevOOo/tests/java/ifc/io/_XConnectable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java index b4015abacc82..b7e26b1b95e8 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java index 5511422f777c..fc61a9dd5206 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XInputStream.java b/qadevOOo/tests/java/ifc/io/_XInputStream.java index 2f3161532ef4..73155b6138e1 100644 --- a/qadevOOo/tests/java/ifc/io/_XInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XMarkableStream.java b/qadevOOo/tests/java/ifc/io/_XMarkableStream.java index 629122702438..32ee221361fb 100644 --- a/qadevOOo/tests/java/ifc/io/_XMarkableStream.java +++ b/qadevOOo/tests/java/ifc/io/_XMarkableStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java index 6f3d94e38e92..bf4888e48526 100644 --- a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public class _XObjectInputStream extends MultiMethodTest { tRes.tested("readObject()", false) ; return ; } - + // write the object try { XObjectOutputStream oStream = (XObjectOutputStream) diff --git a/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java index fb635d472a5f..96b9f94e97af 100644 --- a/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index c49aa479ee38..7b92d23d26b5 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java index 94d1e87ca9ed..4d236b89e17a 100644 --- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java +++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java index 3aa2d4f6e712..d7658959f020 100644 --- a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java +++ b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/java/_XJavaVM.java b/qadevOOo/tests/java/ifc/java/_XJavaVM.java index c0db5e795d3d..86482d9beea9 100644 --- a/qadevOOo/tests/java/ifc/java/_XJavaVM.java +++ b/qadevOOo/tests/java/ifc/java/_XJavaVM.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_ServiceManager.java b/qadevOOo/tests/java/ifc/lang/_ServiceManager.java index d2e84e748c6a..0d96ffbbf2c0 100644 --- a/qadevOOo/tests/java/ifc/lang/_ServiceManager.java +++ b/qadevOOo/tests/java/ifc/lang/_ServiceManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java index e7493e377141..9e443916add0 100644 --- a/qadevOOo/tests/java/ifc/lang/_XComponent.java +++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ public class _XComponent extends MultiMethodTest { public static XComponent oObj = null; private XNameContainer xContainer = null; private XComponent altDispose = null; - + boolean listenerDisposed[] = new boolean[2]; String[] Loutput = new String[2]; @@ -91,7 +91,7 @@ public class _XComponent extends MultiMethodTest { altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis"); } - + /** * Adds two listeners. <p> * Has OK status if then the first listener will receive an event @@ -145,15 +145,15 @@ public class _XComponent extends MultiMethodTest { log.println( "begin dispose in thread " + Thread.currentThread()); XDesktop oDesk = (XDesktop) tEnv.getObjRelation("Desktop"); if (oDesk !=null) { - oDesk.terminate(); + oDesk.terminate(); } else { - if (altDispose == null) - oObj.dispose(); + if (altDispose == null) + oObj.dispose(); else altDispose.dispose(); } - + try { Thread.sleep(500) ; } catch (InterruptedException e) {} diff --git a/qadevOOo/tests/java/ifc/lang/_XEventListener.java b/qadevOOo/tests/java/ifc/lang/_XEventListener.java index a2748309dcc0..0a93d54711f2 100644 --- a/qadevOOo/tests/java/ifc/lang/_XEventListener.java +++ b/qadevOOo/tests/java/ifc/lang/_XEventListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XInitialization.java b/qadevOOo/tests/java/ifc/lang/_XInitialization.java index 4ce7fe05a410..bf7d3fb3ff5f 100644 --- a/qadevOOo/tests/java/ifc/lang/_XInitialization.java +++ b/qadevOOo/tests/java/ifc/lang/_XInitialization.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ public class _XInitialization extends MultiMethodTest { */ public void _initialize() { boolean result = true ; - + try { XInitialization xInit = (XInitialization) tEnv.getObjRelation("XInitialization.xIni"); if (xInit == null) xInit = oObj; - + log.println("calling method with valid arguments..."); Object[] args = (Object[]) tEnv.getObjRelation("XInitialization.args"); if (args==null) { @@ -68,7 +68,7 @@ public class _XInitialization extends MultiMethodTest { } else { xInit.initialize(args); } - + // try to call the method with invalid parameters Object[] ExArgs = (Object[]) tEnv.getObjRelation("XInitialization.ExceptionArgs"); if (ExArgs !=null) { @@ -83,7 +83,7 @@ public class _XInitialization extends MultiMethodTest { log.println("Expected Exception 'com.sun.star.uno.RuntimeException' occured -> OK") ; result = true ; } catch (Exception e) { - log.println("Un-Expected Exception occured -> FALSE") ; + log.println("Un-Expected Exception occured -> FALSE") ; log.println(e.toString()); e.printStackTrace(); } diff --git a/qadevOOo/tests/java/ifc/lang/_XLocalizable.java b/qadevOOo/tests/java/ifc/lang/_XLocalizable.java index fd2f503c0529..e305063a1de2 100644 --- a/qadevOOo/tests/java/ifc/lang/_XLocalizable.java +++ b/qadevOOo/tests/java/ifc/lang/_XLocalizable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ public class _XLocalizable extends MultiMethodTest { oObj.setLocale(newLocale); Locale getLocale = oObj.getLocale(); - boolean res = ((getLocale.Country.equals(newLocale.Country)) && + boolean res = ((getLocale.Country.equals(newLocale.Country)) && (getLocale.Language.equals(newLocale.Language))); if (!res) { - log.println("Expected Language " + newLocale.Language + + log.println("Expected Language " + newLocale.Language + " and Country " + newLocale.Country); - log.println("Getting Language " + getLocale.Language + + log.println("Getting Language " + getLocale.Language + " and Country " + getLocale.Country); } diff --git a/qadevOOo/tests/java/ifc/lang/_XMain.java b/qadevOOo/tests/java/ifc/lang/_XMain.java index e1cecaeb1849..ab3954ec3c55 100644 --- a/qadevOOo/tests/java/ifc/lang/_XMain.java +++ b/qadevOOo/tests/java/ifc/lang/_XMain.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java index 4abeca730765..5c2bb53c81d6 100644 --- a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public class _XMultiComponentFactory extends MultiMethodTest { public XComponentContext xContext = null; private String[] availableServiceNames = null; - + public void before(){ xContext = (XComponentContext)tEnv.getObjRelation("DC"); availableServiceNames = (String[])tEnv.getObjRelation("XMultiComponentFactory.ServiceNames"); @@ -88,7 +88,7 @@ public class _XMultiComponentFactory extends MultiMethodTest { requiredMethod("getAvailableServiceNames()"); boolean result = true; XInterface component = null; - + try { component = (XInterface)oObj.createInstanceWithArgumentsAndContext( availableServiceNames[0], new Object[0], xContext); diff --git a/qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java b/qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java index 49d3be1daf35..5eafe0a7fa3c 100644 --- a/qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,14 +117,14 @@ public class _XMultiServiceFactory extends MultiMethodTest { String needArgs = (String) tEnv.getObjRelation("needArgs"); if (needArgs != null) { - log.println("The " + needArgs + + log.println("The " + needArgs + " doesn't support createInstance without arguments"); tRes.tested("createInstance()", true); return; } - boolean res = true; + boolean res = true; for (int k = 0; k < services.length; k++) { try { @@ -165,7 +165,7 @@ public class _XMultiServiceFactory extends MultiMethodTest { if (args == null) { log.println("Relation 'XMSF.serviceNamesWithArgs' not found"); - log.println("The component assumed not support " + + log.println("The component assumed not support " + "createInstanceWithArguments()"); tRes.tested("createInstanceWithArguments()", true); } else { @@ -176,11 +176,11 @@ public class _XMultiServiceFactory extends MultiMethodTest { boolean res = true; for (int k = 0; k < sNames.length; k++) { - log.println("Creating service '" + sNames[k] + + log.println("Creating service '" + sNames[k] + "' with arguments"); try { - Object Inst = oObj.createInstanceWithArguments(sNames[k], + Object Inst = oObj.createInstanceWithArguments(sNames[k], args[k]); res &= (Inst != null); } catch (com.sun.star.uno.Exception ex) { diff --git a/qadevOOo/tests/java/ifc/lang/_XServiceDisplayName.java b/qadevOOo/tests/java/ifc/lang/_XServiceDisplayName.java index 1a7884b8f02d..50f56583d57b 100644 --- a/qadevOOo/tests/java/ifc/lang/_XServiceDisplayName.java +++ b/qadevOOo/tests/java/ifc/lang/_XServiceDisplayName.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java b/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java index 3ff929c895dd..0eed0e8c67e6 100644 --- a/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java +++ b/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java index 1bc68938ce41..1bba7b25cc3b 100644 --- a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/lang/_XTypeProvider.java b/qadevOOo/tests/java/ifc/lang/_XTypeProvider.java index 123f7729fb5a..940f1fb90427 100644 --- a/qadevOOo/tests/java/ifc/lang/_XTypeProvider.java +++ b/qadevOOo/tests/java/ifc/lang/_XTypeProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_LinguProperties.java b/qadevOOo/tests/java/ifc/linguistic2/_LinguProperties.java index 2e533e449eac..e0a865b65696 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_LinguProperties.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_LinguProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XAvailableLocales.java b/qadevOOo/tests/java/ifc/linguistic2/_XAvailableLocales.java index c8342fe1ecbd..2c4a4b8c03fa 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XAvailableLocales.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XAvailableLocales.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java b/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java index 36850c05364d..9aebd66e0ea2 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XHyphenator.java b/qadevOOo/tests/java/ifc/linguistic2/_XHyphenator.java index 4752651e71f9..64f37366cbab 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XHyphenator.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XHyphenator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceEventBroadcaster.java b/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceEventBroadcaster.java index d799299db636..3295e6721d54 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceEventBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceManager.java b/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceManager.java index 12dd56a3028f..622abee984df 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceManager.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSearchableDictionaryList.java b/qadevOOo/tests/java/ifc/linguistic2/_XSearchableDictionaryList.java index ce12dc72522b..a39562321f7a 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XSearchableDictionaryList.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XSearchableDictionaryList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java index 47ad1d25e836..0f41bebd33f0 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public class _XSpellChecker extends MultiMethodTest { public XSpellChecker oObj = null; XSpellChecker alternative = null; - + public void before() { alternative = (XSpellChecker) tEnv.getObjRelation("AlternativeChecker"); if (alternative == null) throw new StatusException(Status.failed @@ -70,10 +70,10 @@ public class _XSpellChecker extends MultiMethodTest { PropertyValue[] empty = new PropertyValue[0] ; res &= oObj.isValid("Sun", new Locale("en","US",""), empty); res &= !oObj.isValid("Summersun", new Locale("en","US","") ,empty); - log.println("Result so far is - "+ (res ? "OK" : "failed")); + log.println("Result so far is - "+ (res ? "OK" : "failed")); log.println("Checking alternative Spellchecker"); res &= alternative.isValid("Sun", new Locale("en","US",""), empty); - res &= !alternative.isValid("Summersun", new Locale("en","US","") ,empty); + res &= !alternative.isValid("Summersun", new Locale("en","US","") ,empty); } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("Exception while checking 'isValid'"); res = false; @@ -97,7 +97,7 @@ public class _XSpellChecker extends MultiMethodTest { "Summersun",new Locale("en","US",""),empty); String alternatives = alt.getAlternatives()[0]; res = (alternatives != null); - log.println("Result so far is - "+ (res ? "OK" : "failed")); + log.println("Result so far is - "+ (res ? "OK" : "failed")); log.println("Checking alternative Spellchecker"); alt =alternative.spell( "Summersun",new Locale("en","US",""),empty); diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSupportedLocales.java b/qadevOOo/tests/java/ifc/linguistic2/_XSupportedLocales.java index 1457bd76fd39..8302b4cb99cf 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XSupportedLocales.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XSupportedLocales.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XThesaurus.java b/qadevOOo/tests/java/ifc/linguistic2/_XThesaurus.java index c8a9ffbafe8c..87bd8453e3e6 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XThesaurus.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XThesaurus.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java index 47918fef95af..1230579543d6 100644 --- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java +++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_OutlineView.java b/qadevOOo/tests/java/ifc/presentation/_OutlineView.java index 1b1f4af09fda..1c9322f99958 100644 --- a/qadevOOo/tests/java/ifc/presentation/_OutlineView.java +++ b/qadevOOo/tests/java/ifc/presentation/_OutlineView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_Presentation.java b/qadevOOo/tests/java/ifc/presentation/_Presentation.java index 41b89e851459..bb8e549662c9 100644 --- a/qadevOOo/tests/java/ifc/presentation/_Presentation.java +++ b/qadevOOo/tests/java/ifc/presentation/_Presentation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java index a79684570a50..18e5462e4683 100644 --- a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java +++ b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_PreviewView.java b/qadevOOo/tests/java/ifc/presentation/_PreviewView.java index 1e2e6436ab04..72b2c02948e0 100644 --- a/qadevOOo/tests/java/ifc/presentation/_PreviewView.java +++ b/qadevOOo/tests/java/ifc/presentation/_PreviewView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ package ifc.presentation; import lib.MultiPropertyTest; public class _PreviewView extends MultiPropertyTest { - + public void _CurrentPage() { Object obj1 = tEnv.getObjRelation("FirstPage"); Object obj2 = tEnv.getObjRelation("SecondPage"); diff --git a/qadevOOo/tests/java/ifc/presentation/_SlidesView.java b/qadevOOo/tests/java/ifc/presentation/_SlidesView.java index e20e9a9d14ab..b5c433965d10 100644 --- a/qadevOOo/tests/java/ifc/presentation/_SlidesView.java +++ b/qadevOOo/tests/java/ifc/presentation/_SlidesView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier.java b/qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier.java index 8507daae8bf0..7af935049f08 100644 --- a/qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier.java +++ b/qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_XPresentation.java b/qadevOOo/tests/java/ifc/presentation/_XPresentation.java index d729348bed04..cc3ca14e2a12 100644 --- a/qadevOOo/tests/java/ifc/presentation/_XPresentation.java +++ b/qadevOOo/tests/java/ifc/presentation/_XPresentation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier.java b/qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier.java index b3fbdcb4c407..63880efed4d3 100644 --- a/qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier.java +++ b/qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java index 32c37ee87710..c38faa0d3625 100755 --- a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java +++ b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ public class _SelfTest extends MultiMethodTest /** */ - public void before() + public void before() { log.println("_SelfTest.before()"); } @@ -58,7 +58,7 @@ public class _SelfTest extends MultiMethodTest log.println("_SelfTest._testmethod()"); tRes.tested("testmethod()", true); } - + public void _testmethod2() { log.println("_SelfTest._testmethod2()"); diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java index 3f6345ff183f..4bc54010a8b8 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java +++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java b/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java index 655cb59256d0..bb207246fb1f 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java +++ b/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java b/qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java index 615d12f18a35..a53278a46ea8 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java +++ b/qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ public class _XTypeDescriptionEnumerationAccess extends MultiMethodTest { return; } try { - XTypeDescriptionEnumeration oEnum = - oObj.createTypeDescriptionEnumeration(sString, tClass, + XTypeDescriptionEnumeration oEnum = + oObj.createTypeDescriptionEnumeration(sString, tClass, TypeDescriptionSearchDepth.INFINITE); try { log.println("Got an enumeration."); while (true) { XTypeDescription desc = oEnum.nextTypeDescription(); i++; - log.println("\tdesc name: " + desc.getName()); + log.println("\tdesc name: " + desc.getName()); } } catch(com.sun.star.container.NoSuchElementException e) { diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java index 6d2458274cf1..409242d74f5b 100644 --- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java +++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java index 9a7b22ac3002..30d437059c8c 100644 --- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java +++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -384,7 +384,7 @@ public class _XSimpleRegistry extends MultiMethodTest { * @param arg2 specifies if the data source should be created if it does not * already exist */ - public void openReg(XSimpleRegistry reg, String url, boolean arg1, + public void openReg(XSimpleRegistry reg, String url, boolean arg1, boolean arg2) { if (nr == null) { try { diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java index 8d9007dddc29..42215aaa44c1 100644 --- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java +++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java index e71b7f052182..718c5dd83dfe 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java index 50a563986974..5f959312e6e0 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java index 9a25a8fd2d22..f288f2839158 100644 --- a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java +++ b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java index e829acf98d5b..8ac12a3bba8b 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java +++ b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); - + log.println("get the new value..."); XResultSet getValue = (XResultSet) UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); @@ -66,7 +66,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { log.println("Property '" + propName + "' is optional and not supported"); tRes.tested(propName,true); - + } else { log.println("could not get property '"+ propName +"' from XPropertySet!"); tRes.tested(propName, false); @@ -92,7 +92,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); - + log.println("get the new value..."); XConnection getValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); @@ -109,7 +109,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { log.println("Property '" + propName + "' is optional and not supported"); tRes.tested(propName,true); - + } else { log.println("could not get property '"+ propName +"' from XPropertySet!"); tRes.tested(propName, false); @@ -119,7 +119,7 @@ public class _DataAccessDescriptor extends MultiPropertyTest { tRes.tested(propName, false); } } - + } diff --git a/qadevOOo/tests/java/ifc/sdb/_DataSource.java b/qadevOOo/tests/java/ifc/sdb/_DataSource.java index 735ad17f0d81..dc275fe5df7a 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DataSource.java +++ b/qadevOOo/tests/java/ifc/sdb/_DataSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_DatasourceAdministrationDialog.java b/qadevOOo/tests/java/ifc/sdb/_DatasourceAdministrationDialog.java index d3eca94c6556..9d62bab6405c 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DatasourceAdministrationDialog.java +++ b/qadevOOo/tests/java/ifc/sdb/_DatasourceAdministrationDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_ErrorMessageDialog.java b/qadevOOo/tests/java/ifc/sdb/_ErrorMessageDialog.java index 581e4c59ecdd..f9af42b69173 100644 --- a/qadevOOo/tests/java/ifc/sdb/_ErrorMessageDialog.java +++ b/qadevOOo/tests/java/ifc/sdb/_ErrorMessageDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public class _ErrorMessageDialog extends MultiPropertyTest { testProperty("SQLException", tEnv.getObjRelation("ERR1"), tEnv.getObjRelation("ERR2")) ; } - + public void _ParentWindow(){ log.println("Testing with custom Property tester"); testProperty("ParentWindow", tEnv.getObjRelation("ERR_XWindow"), null); diff --git a/qadevOOo/tests/java/ifc/sdb/_QueryDefinition.java b/qadevOOo/tests/java/ifc/sdb/_QueryDefinition.java index 593420423a0b..a87733c044ff 100644 --- a/qadevOOo/tests/java/ifc/sdb/_QueryDefinition.java +++ b/qadevOOo/tests/java/ifc/sdb/_QueryDefinition.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_RowSet.java b/qadevOOo/tests/java/ifc/sdb/_RowSet.java index 367b353d0f68..593092780a1e 100644 --- a/qadevOOo/tests/java/ifc/sdb/_RowSet.java +++ b/qadevOOo/tests/java/ifc/sdb/_RowSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,15 +119,15 @@ public class _RowSet extends MultiPropertyTest { boolean result = false; try { XConnection the_connection = null; - + try { the_connection = (XConnection) AnyConverter.toObject( new Type(XConnection.class), oObj.getPropertyValue("ActiveConnection")); } catch (com.sun.star.lang.IllegalArgumentException iae) { throw new StatusException("couldn't convert Any",iae); - } - + } + result = (the_connection != null); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("the property is unknown"); diff --git a/qadevOOo/tests/java/ifc/sdb/_SingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_SingleSelectQueryComposer.java index e7fb46e65055..0ccbf0420602 100644 --- a/qadevOOo/tests/java/ifc/sdb/_SingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_SingleSelectQueryComposer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XBookmarksSupplier.java b/qadevOOo/tests/java/ifc/sdb/_XBookmarksSupplier.java index 135188848a7f..47a1f501224e 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XBookmarksSupplier.java +++ b/qadevOOo/tests/java/ifc/sdb/_XBookmarksSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedConnection.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedConnection.java index 8dc2192ab057..6d36198bfa0f 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedConnection.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedConnection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java index 2710085b3281..3d1c28c6aea0 100755 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ public class _XCompletedExecution extends MultiMethodTest { // oObj filled by MultiMethodTest public XCompletedExecution oObj = null ; - + private CheckInteractionHandler checkHandler = null; /** * Interface to implement so the call of the listener can be checked. @@ -64,7 +64,7 @@ public class _XCompletedExecution extends MultiMethodTest { checkHandler.setLog((PrintWriter)log); } - + public void _executeWithCompletion() { try { oObj.executeWithCompletion(checkHandler); @@ -74,7 +74,7 @@ public class _XCompletedExecution extends MultiMethodTest { tRes.tested("executeWithCompletion()", false); return; } - + tRes.tested("executeWithCompletion()", checkHandler.checkInteractionHandler()); } diff --git a/qadevOOo/tests/java/ifc/sdb/_XFormDocumentsSupplier.java b/qadevOOo/tests/java/ifc/sdb/_XFormDocumentsSupplier.java index b4a415bc3ac1..b8985324e96a 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XFormDocumentsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdb/_XFormDocumentsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XParametersSupplier.java b/qadevOOo/tests/java/ifc/sdb/_XParametersSupplier.java index 109bb24c4462..865c3f15e47f 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XParametersSupplier.java +++ b/qadevOOo/tests/java/ifc/sdb/_XParametersSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XQueryDefinitionsSupplier.java b/qadevOOo/tests/java/ifc/sdb/_XQueryDefinitionsSupplier.java index 942da74cc999..2c9d83716d2f 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XQueryDefinitionsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdb/_XQueryDefinitionsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XReportDocumentsSupplier.java b/qadevOOo/tests/java/ifc/sdb/_XReportDocumentsSupplier.java index 75b7c2f51a0a..2abe69303961 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XReportDocumentsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdb/_XReportDocumentsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XResultSetAccess.java b/qadevOOo/tests/java/ifc/sdb/_XResultSetAccess.java index 7f68a57d0b1c..29711bff9f33 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XResultSetAccess.java +++ b/qadevOOo/tests/java/ifc/sdb/_XResultSetAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java index 2993b60fe19a..cd4a0490559b 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster.java index 47facc31805e..2b5d7f1513a7 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,6 +33,6 @@ import lib.MultiMethodTest; * */ public class _XSQLErrorBroadcaster extends MultiMethodTest { - + public XSQLErrorBroadcaster oObj = null; } diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index 5b7dca9342f4..cc88075a9b8b 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,9 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { public XSingleSelectQueryAnalyzer oObj = null ; private String queryString = "SELECT * FROM \"biblio\""; - + private XSingleSelectQueryComposer xComposer = null; - + /** * Recieves the object relations: * <ul> @@ -79,9 +79,9 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { if (xComposer == null) { throw new StatusException(Status.failed( "Couldn't get object relation 'xComposer'. Test must be modified")); - + } - + } /** * call <code>setQuery()</code> once with valid query, once with invalid @@ -94,7 +94,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { } catch (com.sun.star.sdbc.SQLException e){ log.println("expected Exception. "); } - + try{ oObj.setQuery(queryString); } catch (com.sun.star.sdbc.SQLException e){ @@ -103,7 +103,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { } tRes.tested("setQuery()", true); } - + /** * checks of the returned value of <code>getQuery()</code> * equals the string which was set by <code>setQuery()</code> @@ -117,13 +117,13 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { this.requiredMethod("setQuery()"); boolean res = false; - + res = oObj.getQuery().equals(queryString); - + tRes.tested("getQuery()", res); } - - + + /** * Object relation <code>xComposer</code> set a filter. This filter * must returned while calling <code>getFilter</code> @@ -133,13 +133,13 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { String filter = "\"Identifier\" = 'BOR02b'"; xComposer.setFilter(filter); tRes.tested("getFilter()", (oObj.getFilter().equals(filter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getFilter()", false); } } - + /** * Object relation <code>xComposer</code> set a complex filter with method . <code>setFilter</code>. Then <code>getStructuredFilter</code> returns a @@ -164,7 +164,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { xComposer.setFilter(""); xComposer.setStructuredFilter(aStructuredFilter); tRes.tested("getStructuredFilter()", (oObj.getFilter().equals(complexFilter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getStructuredFilter()", false); @@ -173,7 +173,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { tRes.tested("getStructuredFilter()", false); } } - + /** * Object relation <code>xComposer</code> set a goup. This group * must returned while calling <code>getGroup</code> @@ -183,25 +183,25 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { String group = "\"Identifier\""; xComposer.setGroup(group); tRes.tested("getGroup()", (oObj.getGroup().equals(group))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getGroup()", false); } } - + /** * Method <code>getGroupColumns</code> retunrs a <code>XIndexAccess</code> * Test has ok status if returned value is an useable <code>XIndexAccess</code> */ public void _getGroupColumns() { try{ - XIndexAccess xGroupColumns = oObj.getGroupColumns(); - - tRes.tested("getGroupColumns()", (xGroupColumns != null && - xGroupColumns.getCount() == 1 && + XIndexAccess xGroupColumns = oObj.getGroupColumns(); + + tRes.tested("getGroupColumns()", (xGroupColumns != null && + xGroupColumns.getCount() == 1 && xGroupColumns.getByIndex(0) != null)); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getGroupColumns()", false); @@ -210,7 +210,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { tRes.tested("getGroupColumns()", false); } } - + /** * Object relation <code>xComposer</code> set a clause. This clause * must returned while calling <code>getHavingClause</code> @@ -221,13 +221,13 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { xComposer.setHavingClause(clause); tRes.tested("getHavingClause()", ( oObj.getHavingClause().equals(clause))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getHavingClause()", false); } } - + /** * Object relation <code>xComposer</code> set a clause. This clause * must returned while calling <code>getHavingClause</code> @@ -244,21 +244,21 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { requiredMethod("getFilter()"); executeMethod("getStructuredFilter()"); String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; - + try{ xComposer.setHavingClause(complexFilter); PropertyValue[][] aStructuredHaving = oObj.getStructuredHavingClause(); xComposer.setHavingClause(""); xComposer.setStructuredHavingClause(aStructuredHaving); - tRes.tested("getStructuredHavingClause()", + tRes.tested("getStructuredHavingClause()", (oObj.getHavingClause().equals(complexFilter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getStructuredHavingClause()", false); } } - + /** * Object relation <code>xComposer</code> set an order. This order * must returned while calling <code>getOrder</code> @@ -268,13 +268,13 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { String order = "\"Identifier\""; xComposer.setOrder(order); tRes.tested("getOrder()", (oObj.getOrder().equals(order))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getOrder()", false); } } - + /** * Method <code>getGroupColumns</code> retunrs a <code>XIndexAccess</code> * Test has ok status if returned value is an useable <code>XIndexAccess</code> @@ -282,10 +282,10 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { public void _getOrderColumns() { try{ XIndexAccess xOrderColumns = oObj.getOrderColumns(); - tRes.tested("getOrderColumns()", (xOrderColumns != null && - xOrderColumns.getCount() == 1 && + tRes.tested("getOrderColumns()", (xOrderColumns != null && + xOrderColumns.getCount() == 1 && xOrderColumns.getByIndex(0) != null)); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("getOrderColumns()", false); @@ -294,6 +294,6 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { tRes.tested("getOrderColumns()", false); } } - + } // finish class _XSingleSelectQueryAnalyzer diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index fa987a09a227..12562abde2b9 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,13 +62,13 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public XSingleSelectQueryComposer oObj = null ; private String queryString = "SELECT * FROM \"biblio\""; - + private XSingleSelectQueryAnalyzer xQueryAna = null; - + private XPropertySet xProp = null; - + private String colName = null; - + /** * Retcieves the object relations: * <ul> @@ -88,9 +88,9 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { if (xQueryAna == null) { throw new StatusException(Status.failed( "Couldn't get object relation 'xQueryAna'. Test must be modified")); - + } - + xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, tEnv.getObjRelation("xProp")); @@ -98,9 +98,9 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { if (xProp == null) { throw new StatusException(Status.failed( "Couldn't get object relation 'xProp'. Test must be modified")); - + } - + try { colName = AnyConverter.toString(tEnv.getObjRelation("colName")); @@ -113,12 +113,12 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { if (colName == null) { throw new StatusException(Status.failed( "Couldn't get object relation 'colName'. Test must be modified")); - + } - + } - - + + /** * Object relation <code>xQueryAna</code> set a filter. This filter * must returned while calling <code>getFilter</code> @@ -128,13 +128,13 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { String filter = "\"Identifier\" = 'BOR02b'"; oObj.setFilter(filter); tRes.tested("setFilter()", (xQueryAna.getFilter().equals(filter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setFilter()", false); } } - + /** * Object relation <code>xQueryAna</code> set a complex filter with method . <code>setFilter</code>. Then <code>getStructuredFilter</code> returns a @@ -152,7 +152,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.setFilter(""); oObj.setStructuredFilter(aStructuredFilter); tRes.tested("setStructuredFilter()", (xQueryAna.getFilter().equals(complexFilter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setStructuredFilter()", false); @@ -161,10 +161,10 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { tRes.tested("setStructuredFilter()", false); } } - + /** - * At first the object relation <code>xProp</code> was set as parameter. - * Relation <code>xQueryAna</code> was used to chek if realtion + * At first the object relation <code>xProp</code> was set as parameter. + * Relation <code>xQueryAna</code> was used to chek if realtion * <code>colName</code> was found. * Second an empty <code>XPropertySet</code> was used as parameter. A * <code>com.sun.star.sdbc.SQLException</code> must be thrown. @@ -172,22 +172,22 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public void _appendFilterByColumn() { boolean ok = true; try{ - + oObj.appendFilterByColumn(xProp, true,SQLFilterOperator.EQUAL); log.println("appendFilterByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("appendFilterByColumn()", false); } try{ - + oObj.appendFilterByColumn(xProp, false,SQLFilterOperator.EQUAL); log.println("appendFilterByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("appendFilterByColumn()", false); @@ -198,7 +198,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.appendFilterByColumn(dummy, true,SQLFilterOperator.EQUAL); log.println("expected Exception was not thrown"); tRes.tested("appendFilterByColumn()", false); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("expected Exception"); ok = ok && true; @@ -216,11 +216,11 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public void _appendGroupByColumn() { boolean ok = true; try{ - + oObj.appendGroupByColumn(xProp); log.println("appendGroupByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("appendGroupByColumn()", false); @@ -230,17 +230,17 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.appendGroupByColumn(dummy); log.println("expected Exception was not thrown"); tRes.tested("appendGroupByColumn()", false); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("expected Exception"); ok = ok && true; } - tRes.tested("appendGroupByColumn()", ok); + tRes.tested("appendGroupByColumn()", ok); } /** * The group which was setted by <code>setGroup</code> must be returned - * while calling from object relation <code>XQueryAna</code> + * while calling from object relation <code>XQueryAna</code> * method <code>getGroup</code> */ public void _setGroup() { @@ -248,17 +248,17 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { String group = "\"Identifier\""; oObj.setGroup(group); tRes.tested("setGroup()", (xQueryAna.getGroup().equals(group))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setGroup()", false); } } - - + + /** * The cluase which was setted by <code>setHavingClause</code> must be returned - * while calling from object relation <code>XQueryAna</code> + * while calling from object relation <code>XQueryAna</code> * method <code>getHavingClause</code> */ public void _setHavingClause() { @@ -267,17 +267,17 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.setHavingClause(clause); tRes.tested("setHavingClause()", ( xQueryAna.getHavingClause().equals(clause))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setHavingClause()", false); } } - + /** * At first <code>setHavingClause</code> sets a complex clause. * Then method <code>getStructuredHavingClause</code> from object relation - * <code>xQueryAna</code> returns a valid <code>PropertyValue[][]</code> + * <code>xQueryAna</code> returns a valid <code>PropertyValue[][]</code> * Method <code>setHavingClause</code> was called with an empty sting to * reset filter. Now <code>setStructuredHavingClause</code> with the valid * <code>PropertyValue[][]</code> as parameter was called. @@ -294,16 +294,16 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { requiredMethod("setHavingClause()"); executeMethod("setStructuredFilter()"); String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; - + try{ oObj.setHavingClause(complexFilter); - PropertyValue[][] aStructuredHaving = + PropertyValue[][] aStructuredHaving = xQueryAna.getStructuredHavingClause(); oObj.setHavingClause(""); oObj.setStructuredHavingClause(aStructuredHaving); - tRes.tested("setStructuredHavingClause()", + tRes.tested("setStructuredHavingClause()", (xQueryAna.getHavingClause().equals(complexFilter))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setStructuredHavingClause()", false); @@ -320,11 +320,11 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public void _appendHavingClauseByColumn() { boolean ok = true; try{ - + oObj.appendHavingClauseByColumn(xProp, true,SQLFilterOperator.EQUAL); log.println("appendHavingClauseByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("appendHavingClauseByColumn()", false); @@ -334,7 +334,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.appendHavingClauseByColumn(dummy, true,SQLFilterOperator.EQUAL); log.println("expected Exception was not thrown"); tRes.tested("appendHavingClauseByColumn()", false); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("expected Exception"); ok = ok && true; @@ -352,11 +352,11 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public void _appendOrderByColumn() { boolean ok = true; try{ - + oObj.appendOrderByColumn(xProp, true); log.println("appendOrderByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("appendOrderByColumn()", false); @@ -366,7 +366,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.appendOrderByColumn(dummy, true); log.println("expected Exception was not thrown"); tRes.tested("appendOrderByColumn()", false); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("expected Exception"); ok = ok && true; @@ -384,13 +384,13 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { String order = "\"Identifier\""; oObj.setOrder(order); tRes.tested("setOrder()", (xQueryAna.getOrder().equals(order))); - + } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); tRes.tested("setOrder()", false); } } - - + + } // finish class _XSingleSelectQueryComposer diff --git a/qadevOOo/tests/java/ifc/sdbc/_ResultSet.java b/qadevOOo/tests/java/ifc/sdbc/_ResultSet.java index bbbee54f9427..c85adfb261e8 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_ResultSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_ResultSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_RowSet.java b/qadevOOo/tests/java/ifc/sdbc/_RowSet.java index 3a4fcecbadd8..2c8aaee986ab 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_RowSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_RowSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,9 +73,9 @@ public class _RowSet extends MultiPropertyTest { } catch(com.sun.star.beans.UnknownPropertyException e) { log.println("Exception " + e.getMessage()); } - + tRes.tested("TypeMap",result); - } + } } // finish class _RowSet diff --git a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java index 7877ad3742d9..ab4c0d936b18 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java b/qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java index d91c5c1ab2d0..bb391c18334a 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDataSource.java b/qadevOOo/tests/java/ifc/sdbc/_XDataSource.java index 6c1767887861..78c4cf317ff3 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XDataSource.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XDataSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java index 8c9085a96f51..51603b7edeaa 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,10 +110,10 @@ public class _XDriver extends MultiMethodTest { res &= (connection == null); log.println("Connected? " + !res); } catch(SQLException e) { - log.println("Unexpected exception"); + log.println("Unexpected exception"); res &= false; } - + if (nbu==null) { try { String badUrl = url + "bla"; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java index 6921aef8db7e..a4a01f2fbce6 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,7 +139,7 @@ public class _XDriverManager extends MultiMethodTest { * the method <code>getLoginTimeout()</code> are equal. */ public void _setLoginTimeout() { - requiredMethod("getLoginTimeout()"); + requiredMethod("getLoginTimeout()"); final int TO = 111; log.println("setLoginTimeout(" + TO + ")"); oObj.setLoginTimeout(TO); diff --git a/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java b/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java index 36ea27516c26..dd2500fdf9c9 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public class _XIsolatedConnection extends MultiMethodTest { pwd = userSettings[1].equals("")?"<empty>":userSettings[1]; else pwd = "<null>"; - + log.println("Testing \"getIsolatedConnection('user', 'password')\"\n" + "with user = '" + user + "'; password = '" + pwd + "'"); XConnection con = null ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index e462a9aecab2..a87562948ec1 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java index 69c7d1468b7a..0f62b6659a9f 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetMetaDataSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetMetaDataSupplier.java index 84844907f03a..7ffeb893d4d5 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetMetaDataSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetMetaDataSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java index db5b2d1599da..695a087acf86 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index 6c442d0255a5..7e7845344174 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java index 0bfa4cba2957..78099cee0826 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index c22246888441..619678af2f91 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java index cbca4c600a4a..9f49eec04eca 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ public class _XWarningsSupplier extends MultiMethodTest { // not sure what the below test was intended to test, but it actually fails with an SQLException (which is // correct for what is done there), and thus makes the complete interface test fail (which is not correct) // So, for the moment, just let the test succeed all the time - until issue #i84235# is fixed - + if ( false ) { int oldVal = 0, newVal = 0; @@ -95,7 +95,7 @@ public class _XWarningsSupplier extends MultiMethodTest { boolean res = false; - try + try { Object warns = oObj.getWarnings(); res = (!utils.isVoid(warns)); diff --git a/qadevOOo/tests/java/ifc/sdbcx/_ResultSet.java b/qadevOOo/tests/java/ifc/sdbcx/_ResultSet.java index 2e8cbaf4b006..4150ce3d4fc3 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_ResultSet.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_ResultSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,5 +41,5 @@ import lib.MultiPropertyTest; */ public class _ResultSet extends MultiPropertyTest { -} +} diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XColumnsSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XColumnsSupplier.java index 61fa1c2a145b..79d1eee422e6 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XColumnsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XColumnsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XCreateCatalog.java b/qadevOOo/tests/java/ifc/sdbcx/_XCreateCatalog.java index d657aac3f587..bda344bf26fb 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XCreateCatalog.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XCreateCatalog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java index 11f68d19ce86..e12d10ace540 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java index 230e513e1b2c..0c2712b236de 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDropCatalog.java b/qadevOOo/tests/java/ifc/sdbcx/_XDropCatalog.java index f3135c15e3bf..e6d59b16e376 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDropCatalog.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDropCatalog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java b/qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java index 6c8bca02ada1..0e11f9c59c3d 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ public class _XRowLocate extends MultiMethodTest { try { bookmark1 = oObj.getBookmark() ; } catch (SQLException e) { - log.println("Exception occured :" + e) ; + log.println("Exception occured :" + e) ; } tRes.tested("getBookmark()", bookmark1 != null) ; diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java index c3318d2f2fa4..c3747553ccda 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public class _XTablesSupplier extends MultiMethodTest { XNameAccess tabs = oObj.getTables() ; - + String[] tabNames = tabs.getElementNames() ; log.println("Table names:") ; @@ -71,7 +71,7 @@ public class _XTablesSupplier extends MultiMethodTest { log.println("Support : " + info.supportsService("com.sun.star.sdbcx.Table")) ; - + tRes.tested("getTables()", tabs != null) ; } diff --git a/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java b/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java index cef1fcd32153..55bc00bd0bd5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java +++ b/qadevOOo/tests/java/ifc/sheet/_CellAreaLink.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java index 272c49798d54..0f5bd210fada 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java +++ b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ import lib.MultiPropertyTest; * @see com.sun.star.sheet.DataPilotField */ public class _DataPilotField extends MultiPropertyTest { - + /** *This class is destined to custom test of property <code>SortInfo</code>. */ @@ -64,13 +64,13 @@ public class _DataPilotField extends MultiPropertyTest { */ public void _SortInfo() { testProperty("SortInfo", SortInfoTester); - } - + } + public void _HasSortInfo() { requiredMethod("SortInfo"); testProperty("HasSortInfo"); } - + /** *This class is destined to custom test of property <code>LayoutInfo</code>. */ @@ -89,13 +89,13 @@ public class _DataPilotField extends MultiPropertyTest { */ public void _LayoutInfo() { testProperty("LayoutInfo", LayoutInfoTester); - } - + } + public void _HasLayoutInfo() { requiredMethod("LayoutInfo"); testProperty("HasLayoutInfo"); - } - + } + /** *This class is destined to custom test of property <code>AutoShowInfo</code>. */ @@ -114,13 +114,13 @@ public class _DataPilotField extends MultiPropertyTest { */ public void _AutoShowInfo() { testProperty("AutoShowInfo", AutoShowInfoTester); - } - + } + public void _HasAutoShowInfo() { requiredMethod("AutoShowInfo"); testProperty("HasAutoShowInfo"); - } - + } + /** *This class is destined to custom test of property <code>Reference</code>. */ @@ -139,13 +139,13 @@ public class _DataPilotField extends MultiPropertyTest { */ public void _Reference() { testProperty("Reference", ReferenceTester); - } - + } + public void _HasReference() { requiredMethod("Reference"); testProperty("HasReference"); - } - + } + /* * this property can only set a true value to false, fo ungrouping purposes */ @@ -157,7 +157,7 @@ public class _DataPilotField extends MultiPropertyTest { oObj.setPropertyValue ("IsGroupField", Boolean.FALSE); Boolean propV = (Boolean) oObj.getPropertyValue ("IsGroupField"); result = !propV.booleanValue (); - } + } } catch (Exception e) { log.println ("Exception while getting Property 'IsGroupField'"+e); result = false; diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java index a83bd47543f4..368723761e58 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java +++ b/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java index bb819a0f43e7..688b77d2eed8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java index f32fe6c27c40..c4c1732e7a38 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_DocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_DocumentSettings.java index 6074e8e6cb3f..6bda7836fde1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DocumentSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_DocumentSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,6 +34,6 @@ import lib.MultiPropertyTest; */ public class _DocumentSettings extends MultiPropertyTest{ - - + + } diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java index 3fe0017ad6db..9a9e242086a1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java +++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings.java b/qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings.java index 514645be45b3..9a42db1d5eb8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_Scenario.java b/qadevOOo/tests/java/ifc/sheet/_Scenario.java index b7d206465d2a..4f9db71d140e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Scenario.java +++ b/qadevOOo/tests/java/ifc/sheet/_Scenario.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ import lib.MultiPropertyTest; public class _Scenario extends MultiPropertyTest { public void before() { - oObj = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, + oObj = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, tEnv.getObjRelation( "ScenarioSheet")); } diff --git a/qadevOOo/tests/java/ifc/sheet/_Shape.java b/qadevOOo/tests/java/ifc/sheet/_Shape.java index 0d1daca95b54..ad23b22b2239 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Shape.java +++ b/qadevOOo/tests/java/ifc/sheet/_Shape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import lib.MultiPropertyTest; public class _Shape extends MultiPropertyTest { public void _Anchor() { XSpreadsheetDocument xSheetDoc = (XSpreadsheetDocument) UnoRuntime.queryInterface( - XSpreadsheetDocument.class, + XSpreadsheetDocument.class, tEnv.getObjRelation( "DOCUMENT")); String[] sheetNames = xSheetDoc.getSheets().getElementNames(); @@ -46,7 +46,7 @@ public class _Shape extends MultiPropertyTest { try { xSheet = (XSpreadsheet) UnoRuntime.queryInterface( - XSpreadsheet.class, + XSpreadsheet.class, xSheetDoc.getSheets().getByName(sheetNames[0])); xCell = xSheet.getCellByPosition(0, 0); } catch (com.sun.star.container.NoSuchElementException e) { diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetCell.java b/qadevOOo/tests/java/ifc/sheet/_SheetCell.java index ebb943082792..b132f8c4b15d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetCell.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ import lib.MultiPropertyTest; public class _SheetCell extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java b/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java index d2db014584a0..d8f0a2bf1ddc 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetCellRanges.java b/qadevOOo/tests/java/ifc/sheet/_SheetCellRanges.java index 7e7ed35e092f..9da72fb53c80 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetCellRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetCellRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetFilterDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetFilterDescriptor.java index 423042bb8d3a..02b7616d0e7c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetFilterDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetFilterDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java index d4711f878716..0e2b8dd13b75 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java index cf63e30250d9..f4628605f912 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java index f1a78acc64aa..4d2058e1ec73 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java +++ b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument.java index 0fe1021d7155..f26759a5b08d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java index 6c4abe99f413..a622af71236d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { protected PropertyTester DateTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { Date date = (Date) oldValue; - Date newDate = new Date((short) (date.Day - 1), date.Month, + Date newDate = new Date((short) (date.Day - 1), date.Month, date.Year); return newDate; @@ -82,10 +82,10 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { protected boolean compare(Object obj1, Object obj2) { Locale loc = new Locale("ru", "RU", ""); XForbiddenCharacters fc1 = (XForbiddenCharacters) UnoRuntime.queryInterface( - XForbiddenCharacters.class, + XForbiddenCharacters.class, obj1); XForbiddenCharacters fc2 = (XForbiddenCharacters) UnoRuntime.queryInterface( - XForbiddenCharacters.class, + XForbiddenCharacters.class, obj2); boolean has1 = fc1.hasForbiddenCharacters(loc); boolean has2 = fc2.hasForbiddenCharacters(loc); @@ -121,8 +121,8 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { public ForbiddenCharacters getForbiddenCharacters(Locale rLocale) throws com.sun.star.container.NoSuchElementException { - if (rLocale.Country.equals(locale.Country) && - rLocale.Language.equals(locale.Language) && + if (rLocale.Country.equals(locale.Country) && + rLocale.Language.equals(locale.Language) && rLocale.Variant.equals(locale.Variant)) { return chrs; } @@ -130,7 +130,7 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { throw new com.sun.star.container.NoSuchElementException(); } - public void setForbiddenCharacters(Locale rLocale, + public void setForbiddenCharacters(Locale rLocale, ForbiddenCharacters rForbiddenCharacters) { } @@ -138,8 +138,8 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { } public boolean hasForbiddenCharacters(Locale rLocale) { - if (rLocale.Country.equals(locale.Country) && - rLocale.Language.equals(locale.Language) && + if (rLocale.Country.equals(locale.Country) && + rLocale.Language.equals(locale.Language) && rLocale.Variant.equals(locale.Variant)) { return true; } diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java index c857b2420020..9563db05ae08 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ import lib.MultiPropertyTest; */ public class _SpreadsheetViewSettings extends MultiPropertyTest { public void _ZoomType() { - testProperty("ZoomType", new Short(DocumentZoomType.PAGE_WIDTH), + testProperty("ZoomType", new Short(DocumentZoomType.PAGE_WIDTH), new Short(DocumentZoomType.BY_VALUE)); } diff --git a/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java index c478a0f54252..9e6e381be1b1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java index bb86aa8bc069..14428e6f71a8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java +++ b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java index 8b6f06acccd9..c7a6c82c178e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java +++ b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_TableValidation.java b/qadevOOo/tests/java/ifc/sheet/_TableValidation.java index 552664f71c68..0ba8b3606cfb 100644 --- a/qadevOOo/tests/java/ifc/sheet/_TableValidation.java +++ b/qadevOOo/tests/java/ifc/sheet/_TableValidation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java index c4d03c5abf5f..0348452c611a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ public class _XActivationBroadcaster extends MultiMethodTest { protected XSpreadsheet two = null; public void _addActivationEventListener() { - + log.println("trying to add an invalid listener"); oObj.addActivationEventListener(listener); log.println(".... OK"); - + log.println("adding a valid listener"); listener = new MyListener(); oObj.addActivationEventListener(listener); @@ -83,7 +83,7 @@ public class _XActivationBroadcaster extends MultiMethodTest { public void before() { xSpreadsheetView = (XSpreadsheetView) UnoRuntime.queryInterface( - XSpreadsheetView.class, + XSpreadsheetView.class, tEnv.getTestObject()); two = (XSpreadsheet) tEnv.getObjRelation("Sheet"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java b/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java index 74a95f3b2a94..bbefd7e4c642 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java +++ b/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java b/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java index 460bce6c3b84..04170976ba85 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java +++ b/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java index 7cb4d8aed12c..2c489e4c4f50 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -171,12 +171,12 @@ public class _XArrayFormulaRange extends MultiMethodTest { return p1 == s1.length() && p2 == s2.length() ; } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java index 36bb27423e25..712f74f7c596 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ public class _XCalculatable extends MultiMethodTest { public XCalculatable oObj = null; private boolean bIsAutomaticCalculationEnabled = false; private XCell[] xCells = null; - + /** * Get object relation: four cells with values and formulas. * @see mod._sc.ScModelObj @@ -50,7 +50,7 @@ public class _XCalculatable extends MultiMethodTest { throw new StatusException(Status.failed("Couldn't find correct object relation 'XCalculatable.Cells'")); } - + /** * Restore begin setting */ @@ -58,8 +58,8 @@ public class _XCalculatable extends MultiMethodTest { // reset to begin value oObj.enableAutomaticCalculation(bIsAutomaticCalculationEnabled); } - - + + public void _calculate() { requiredMethod("isAutomaticCalculationEnabled()"); boolean result = true; @@ -73,7 +73,7 @@ public class _XCalculatable extends MultiMethodTest { result &= ergValue1 != ergValue2; tRes.tested("calculate()", result); } - + public void _calculateAll() { requiredMethod("isAutomaticCalculationEnabled()"); boolean result = true; @@ -88,18 +88,18 @@ public class _XCalculatable extends MultiMethodTest { oObj.calculateAll(); tRes.tested("calculateAll()", result); } - + public void _enableAutomaticCalculation() { bIsAutomaticCalculationEnabled = oObj.isAutomaticCalculationEnabled(); oObj.enableAutomaticCalculation(!bIsAutomaticCalculationEnabled); tRes.tested("enableAutomaticCalculation()", true); } - + public void _isAutomaticCalculationEnabled() { requiredMethod("enableAutomaticCalculation()"); boolean result = oObj.isAutomaticCalculationEnabled(); oObj.enableAutomaticCalculation(false); tRes.tested("isAutomaticCalculationEnabled()", result != bIsAutomaticCalculationEnabled); } - + } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellAddressable.java b/qadevOOo/tests/java/ifc/sheet/_XCellAddressable.java index 777fe26b1e2e..d6d1d47b0e6a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellAddressable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellAddressable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java index 4bc93a7f613d..bf0c2a82bd5f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,15 +43,15 @@ import com.sun.star.sheet.XCellFormatRangesSupplier; */ public class _XCellFormatRangesSupplier extends MultiMethodTest { - + public XCellFormatRangesSupplier oObj = null; - + /** * call the method getCellFormatRanges and returns OK result if * the gained XIndexAccess isn't null and the method checkIndexAccess * returns true. */ - + public void _getCellFormatRanges() { boolean res = true; XIndexAccess xIA = oObj.getCellFormatRanges(); @@ -63,12 +63,12 @@ public class _XCellFormatRangesSupplier extends MultiMethodTest { } tRes.tested("getCellFormatRanges()",res); } - + /** * calls the method getCount at the IndexAccess, returns true is it is >0 * and getByIndex() doesn't throw an exception for Indexes between 0 and count */ - + protected boolean checkIndexAccess(XIndexAccess xIA) { boolean res = true; int count = xIA.getCount(); @@ -88,5 +88,5 @@ public class _XCellFormatRangesSupplier extends MultiMethodTest { } return res; } - + } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable.java index 300dcf30dca8..3c0a03f409e3 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java index 8127164568b1..61c4b315f3e1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ public class _XCellRangeData extends MultiMethodTest { public XCellRangeData oObj = null; private Object[][] maCRData = null; - + /** * Test calls the method * state is OK if the resulting Object array diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula.java index e408a3a2b1b0..4152a7d34ffd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,9 +32,9 @@ import com.sun.star.sheet.XCellRangeFormula; public class _XCellRangeFormula extends lib.MultiMethodTest { public XCellRangeFormula oObj = null; - + public String[][] orgValue = null; - + public void _getFormulaArray() { Object noArray = tEnv.getObjRelation("noArray"); if (noArray != null) { @@ -44,7 +44,7 @@ public class _XCellRangeFormula extends lib.MultiMethodTest { + " the whole sheet"); tRes.tested("getFormulaArray()", true); return; - } + } orgValue = oObj.getFormulaArray(); String[][] newValue = oObj.getFormulaArray(); newValue[0][0] = "inserted"; @@ -63,9 +63,9 @@ public class _XCellRangeFormula extends lib.MultiMethodTest { + " the whole sheet"); tRes.tested("setFormulaArray()", true); return; - } + } oObj.setFormulaArray(orgValue); boolean res = oObj.getFormulaArray()[0][0].equals(orgValue[0][0]); tRes.tested("setFormulaArray()",res); - } + } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java index 13468122b25e..ef95f1d5a423 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java index 320c7940d03e..013504395955 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java index eac4a5a31d10..082bcd42fb74 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ import com.sun.star.uno.UnoRuntime; * <ul> * <li>"SHEET": an XSpreadSheet object * </li> - * <li>"XCellRangesQuery.EXPECTEDRESULTS": the expected results for the test + * <li>"XCellRangesQuery.EXPECTEDRESULTS": the expected results for the test * methods as a String array.<br> * @see mod._sc.ScCellCurserObj or * @see mod._sc.ScCellObj for an example how this should look like. @@ -73,7 +73,7 @@ public class _XCellRangesQuery extends MultiMethodTest { public static final int QUERYINTERSECTION = 4; public static final int QUERYROWDIFFERENCES = 5; public static final int QUERYVISIBLECELLS = 6; - + protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); @@ -94,13 +94,13 @@ public class _XCellRangesQuery extends MultiMethodTest { "XCellRangesQuery.EXPECTEDRESULTS"); XColumnRowRange oColumnRowRange = (XColumnRowRange) UnoRuntime.queryInterface( - XColumnRowRange.class, + XColumnRowRange.class, oSheet); oRows = (XTableRows)oColumnRowRange.getRows(); oColumns = (XTableColumns) oColumnRowRange.getColumns(); - // set this in object if the interface has to make its own settings - // and the environment has to be disposed: this is necessary for objects + // set this in object if the interface has to make its own settings + // and the environment has to be disposed: this is necessary for objects // that do not make entries on the sheet themselves Object o = tEnv.getObjRelation("XCellRangesQuery.CREATEENTRIES"); if (o != null && o instanceof Boolean) { @@ -116,7 +116,7 @@ public class _XCellRangesQuery extends MultiMethodTest { oSheet.getCellByPosition(2, 1).setFormula("=B2+B3"); oSheet.getCellByPosition(1, 3).setFormula("=B2+B4"); oSheet.getCellByPosition(3, 2).setFormula(""); - oSheet.getCellByPosition(3, 3).setFormula(""); + oSheet.getCellByPosition(3, 3).setFormula(""); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't fill cells " + e.getLocalizedMessage()); } @@ -125,7 +125,7 @@ public class _XCellRangesQuery extends MultiMethodTest { } /** - * Tested method returns each cell of each column that is different to the + * Tested method returns each cell of each column that is different to the * cell in a given row */ public void _queryColumnDifferences() { @@ -145,7 +145,7 @@ public class _XCellRangesQuery extends MultiMethodTest { } /** - * Tested method returns all cells of a given type, defind in + * Tested method returns all cells of a given type, defind in * CellFlags * @see com.sun.star.sheet.CellFlags */ @@ -173,17 +173,17 @@ public class _XCellRangesQuery extends MultiMethodTest { XSheetCellRanges ranges = oObj.queryEmptyCells(); getting = ranges.getRangeAddressesAsString(); expected = mExpectedResults[QUERYEMPTYCELLS]; - + int startIndex = 0; int endIndex = -5; String checkString = null; - + while (endIndex != -1) { startIndex = endIndex + 5; endIndex = expected.indexOf(" ... ", startIndex); if (endIndex == -1) { checkString = expected.substring(startIndex); - } + } else { checkString = expected.substring(startIndex, endIndex); } @@ -199,7 +199,7 @@ public class _XCellRangesQuery extends MultiMethodTest { } /** - * Tested method returns all cells of a given type, defind in + * Tested method returns all cells of a given type, defind in * FormulaResult * @see com.sun.star.sheet.FormulaResult */ @@ -236,7 +236,7 @@ public class _XCellRangesQuery extends MultiMethodTest { } /** - * Tested method returns each cell of each row that is different to the + * Tested method returns each cell of each row that is different to the * cell in a given column */ public void _queryRowDifferences() { @@ -276,22 +276,22 @@ public class _XCellRangesQuery extends MultiMethodTest { protected void setRowVisible(boolean vis) { try { XPropertySet rowProp = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, + XPropertySet.class, oRows.getByIndex(0)); rowProp.setPropertyValue("IsVisible", new Boolean(vis)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("couldn't get Row " + e.getLocalizedMessage()); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("problems setting Property 'isVisible' " + + log.println("problems setting Property 'isVisible' " + e.getLocalizedMessage()); } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("problems setting Property 'isVisible' " + + log.println("problems setting Property 'isVisible' " + e.getLocalizedMessage()); } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("problems setting Property 'isVisible' " + + log.println("problems setting Property 'isVisible' " + e.getLocalizedMessage()); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("problems setting Property 'isVisible' " + + log.println("problems setting Property 'isVisible' " + e.getLocalizedMessage()); } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java index 7ed3b4e61761..fc9c595d20bf 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,16 +43,16 @@ public class _XCellSeries extends MultiMethodTest { protected boolean isSpreadSheet = false; protected boolean fillAuto = true; protected boolean forceFillAuto = false; - + protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); - + if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); oSheet = (XSpreadsheet) UnoRuntime.queryInterface( - XSpreadsheet.class, tEnv.getTestObject()); + XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { throw new StatusException(Status.failed( @@ -61,11 +61,11 @@ public class _XCellSeries extends MultiMethodTest { isSpreadSheet = true; } } - + Boolean myFillAuto = (Boolean) tEnv.getObjRelation("XCELLSERIES_FILLAUTO"); - + if (myFillAuto != null) fillAuto = myFillAuto.booleanValue(); - + if (tParam.containsKey("force_fillauto")){ fillAuto = tParam.getBool("force_fillauto"); forceFillAuto = tParam.getBool("force_fillauto"); @@ -73,14 +73,14 @@ public class _XCellSeries extends MultiMethodTest { } public void _fillAuto() { - + if ((isSpreadSheet && !forceFillAuto) || !fillAuto) { log.println("This method consumes to much time for a complete SpreadSheet"); log.println("Please use parameter '-force_fillauto true' to force this test"); tRes.tested("fillAuto()",Status.skipped(true)); return; } - + boolean res = true; try { @@ -125,13 +125,13 @@ public class _XCellSeries extends MultiMethodTest { } public void _fillSeries() { - + if (isSpreadSheet) { log.println("This method consumes to much time for a complete SpreadSheet"); tRes.tested("fillSeries()",Status.skipped(true)); return; } - + boolean res = true; try { @@ -142,16 +142,16 @@ public class _XCellSeries extends MultiMethodTest { log.println( "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8)"); - oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, - com.sun.star.sheet.FillMode.LINEAR, + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, + com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8); oSheet.getCellByPosition(0, 4).setFormula("=sum(A1:D1)"); double getting = oSheet.getCellByPosition(0, 4).getValue(); boolean locres = (getting == 20); - + logger.finish(); - + if (!locres) { log.println("Operation failed"); } else { @@ -159,22 +159,22 @@ public class _XCellSeries extends MultiMethodTest { } res &= locres; - + logger = new LoggingThread((LogWriter)log, tParam); logger.start(); - + log.println( "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, com.sun.star.sheet.FillMode.GROWTH, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16)"); - oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, - com.sun.star.sheet.FillMode.GROWTH, - com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, + com.sun.star.sheet.FillMode.GROWTH, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16); oSheet.getCellByPosition(0, 4).setFormula("=sum(A1:D1)"); getting = oSheet.getCellByPosition(0, 4).getValue(); locres = (getting == 30); - + logger.finish(); - + if (!locres) { log.println("Operation failed"); } else { @@ -185,11 +185,11 @@ public class _XCellSeries extends MultiMethodTest { logger = new LoggingThread((LogWriter)log, tParam); logger.start(); - + log.println( "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8)"); - oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, - com.sun.star.sheet.FillMode.LINEAR, + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, + com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8); oSheet.getCellByPosition(4, 0).setFormula("=sum(A1:A4)"); getting = oSheet.getCellByPosition(4, 0).getValue(); @@ -207,12 +207,12 @@ public class _XCellSeries extends MultiMethodTest { logger = new LoggingThread((LogWriter)log, tParam); logger.start(); - + log.println( "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, com.sun.star.sheet.FillMode.GROWTH, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16)"); - oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, - com.sun.star.sheet.FillMode.GROWTH, - com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, + com.sun.star.sheet.FillMode.GROWTH, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16); oSheet.getCellByPosition(4, 0).setFormula("=sum(A1:A4)"); getting = oSheet.getCellByPosition(4, 0).getValue(); @@ -234,11 +234,11 @@ public class _XCellSeries extends MultiMethodTest { tRes.tested("fillSeries()", res); } - + /** * Forces environment recreation. */ public void after() { disposeEnvironment(); - } + } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/sheet/_XConsolidatable.java b/qadevOOo/tests/java/ifc/sheet/_XConsolidatable.java index 08fc51dc3672..a65b7bdc1784 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XConsolidatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XConsolidatable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ import lib.MultiMethodTest; public class _XConsolidatable extends MultiMethodTest { public XConsolidatable oObj = null; XConsolidationDescriptor xDescriptor = null; - + /** * Check consolidation */ @@ -45,7 +45,7 @@ public class _XConsolidatable extends MultiMethodTest { oObj.consolidate(xDescriptor); tRes.tested("consolidate()", true); } - + /** * Check the creation of a ConsolidationDescriptor */ diff --git a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java index f7638dacf5b4..85f149d05a5e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDDELink.java b/qadevOOo/tests/java/ifc/sheet/_XDDELink.java index 5c475e3c0208..4d096e6c2a1b 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDDELink.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDDELink.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java index e95aa5870d38..515f77bfe689 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotField.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotField.java index 6e29ad3ceaa4..da332e034100 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotField.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ public class _XDataPilotField extends MultiMethodTest { Object element = xIA.getByIndex(k); log.println("Element " + k + " = " + element); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Unexpected Exception while getting by Index (" + k + + log.println("Unexpected Exception while getting by Index (" + k + ")" + e.getMessage()); res &= false; } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Unexpected Exception while getting by Index (" + k + + log.println("Unexpected Exception while getting by Index (" + k + ")" + e.getMessage()); res &= false; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java index 5f17837fdb0d..013abd362f92 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ import lib.MultiMethodTest; public class _XDataPilotFieldGrouping extends MultiMethodTest { public XDataPilotFieldGrouping oObj = null; - + public void _createNameGroup() { boolean result = true; try { @@ -56,7 +56,7 @@ public class _XDataPilotFieldGrouping extends MultiMethodTest } tRes.tested ("createNameGroup()",result); } - + public void _createDateGroup() { boolean result = true; try { @@ -69,5 +69,5 @@ public class _XDataPilotFieldGrouping extends MultiMethodTest result = false; } tRes.tested ("createDateGroup()",result); - } + } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java index a63617672ed8..4f7685b20e8f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index f3096efc12ab..d5ae775f90ab 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ import lib.MultiMethodTest; import lib.Status; import lib.StatusException; -/** +/** * Testing <code>com.sun.star.sheet.XDataPilotTable2</code> * interface methods : * <ul> @@ -56,12 +56,12 @@ import lib.StatusException; * <li><code> insertDrillDownSheet()</code></li> * <li><code> getOutputRangeByType</code></li> * </ul> - * + * * @see com.sun.star.sheet.XDataPilotTable2 * @see com.sun.star.table.CellAddress - * + * */ -public class _XDataPilotTable2 extends MultiMethodTest +public class _XDataPilotTable2 extends MultiMethodTest { private XSpreadsheetDocument xSheetDoc = null; private XDataPilotTable2 xDPTab2 = null; @@ -71,13 +71,13 @@ public class _XDataPilotTable2 extends MultiMethodTest private ArrayList mDataFieldDims = null; private ArrayList mResultCells = null; - /** + /** * exception to be thrown when obtaining a result data for a cell fails * (probably because the cell is not a result cell). */ private class ResultCellFailure extends com.sun.star.uno.Exception {} - protected void before() + protected void before() { Object o = tEnv.getObjRelation("DATAPILOTTABLE2"); xDPTab2 = (XDataPilotTable2)UnoRuntime.queryInterface( @@ -101,7 +101,7 @@ public class _XDataPilotTable2 extends MultiMethodTest } } - public void _getDrillDownData() + public void _getDrillDownData() { boolean testResult = true; int cellCount = mResultCells.size(); @@ -133,7 +133,7 @@ public class _XDataPilotTable2 extends MultiMethodTest tRes.tested("getDrillDownData()", testResult); } - public void _getPositionData() + public void _getPositionData() { boolean testResult = false; @@ -192,7 +192,7 @@ public class _XDataPilotTable2 extends MultiMethodTest tRes.tested("getPositionData()", testResult); } - public void _insertDrillDownSheet() + public void _insertDrillDownSheet() { boolean testResult = true; int cellCount = mResultCells.size(); @@ -251,7 +251,7 @@ public class _XDataPilotTable2 extends MultiMethodTest String name = xNamed.getName(); try { - xSheets.removeByName(name); + xSheets.removeByName(name); } catch (com.sun.star.uno.Exception e) { @@ -279,13 +279,13 @@ public class _XDataPilotTable2 extends MultiMethodTest tRes.tested("insertDrillDownSheet()", testResult); } - public void _getOutputRangeByType() + public void _getOutputRangeByType() { boolean testResult = false; do { - // Let's make sure this doesn't cause a crash. A range returned for an + // Let's make sure this doesn't cause a crash. A range returned for an // out-of-bound condition is undefined. try { @@ -310,7 +310,7 @@ public class _XDataPilotTable2 extends MultiMethodTest } // Check to make sure the whole range is not empty. - if (mRangeWhole.EndColumn - mRangeWhole.StartColumn <= 0 || + if (mRangeWhole.EndColumn - mRangeWhole.StartColumn <= 0 || mRangeWhole.EndRow - mRangeWhole.EndColumn <= 0) { log.println("whole range is empty"); @@ -359,8 +359,8 @@ public class _XDataPilotTable2 extends MultiMethodTest else if (posData.PositionType == DataPilotTablePositionType.ROW_HEADER) posType = "row header"; - log.println(posType + "; member name: " + header.MemberName + "; dimension: " + - header.Dimension + "; hierarchy: " + header.Hierarchy + + log.println(posType + "; member name: " + header.MemberName + "; dimension: " + + header.Dimension + "; hierarchy: " + header.Hierarchy + "; level: " + header.Level); } @@ -372,7 +372,7 @@ public class _XDataPilotTable2 extends MultiMethodTest double val = res.Value; int flags = res.Flags; int filterCount = resultData.FieldFilters.length; - log.println("result; data field index: " + dataId + "; value: " + val + "; flags: " + flags + + log.println("result; data field index: " + dataId + "; value: " + val + "; flags: " + flags + "; filter count: " + filterCount); for (int i = 0; i < filterCount; ++i) @@ -436,7 +436,7 @@ public class _XDataPilotTable2 extends MultiMethodTest Object field = xFields.getByIndex(i); XPropertySet propSet = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, field); - DataPilotFieldOrientation orient = + DataPilotFieldOrientation orient = (DataPilotFieldOrientation)propSet.getPropertyValue("Orientation"); if (orient == DataPilotFieldOrientation.DATA) { @@ -554,7 +554,7 @@ public class _XDataPilotTable2 extends MultiMethodTest { XCellRange xRng = xSheet.getCellRangeByPosition(nCol, nRow, nCol, nRow); XSheetCellRange xSCR = (XSheetCellRange)UnoRuntime.queryInterface( - XSheetCellRange.class, xRng); + XSheetCellRange.class, xRng); XSheetCellCursor xCursor = xSheet.createCursorByRange(xSCR); XCellCursor xCellCursor = (XCellCursor)UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java index 09ee1da76551..da7201829e7a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTablesSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTablesSupplier.java index a291d3513f8f..2bc14b2ce594 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTablesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java index 3b3d3713a5b2..32a1e96ea21a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java index c5f5307cda41..a1ef293541b0 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java index 084ce09934c7..076eaac66aeb 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ import lib.Status; import lib.StatusException; /** - * + * */ public class _XDocumentAuditing extends MultiMethodTest { public XDocumentAuditing oObj = null; @@ -58,7 +58,7 @@ public class _XDocumentAuditing extends MultiMethodTest { int elementCount = 0; String sheetName = null; Point pos = null; - + public void before() { Exception ex = null; // get two sheets @@ -100,16 +100,16 @@ public class _XDocumentAuditing extends MultiMethodTest { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { } // ignore exceptions, we'll run into next if statement anyway - catch(com.sun.star.lang.WrappedTargetException e) { + catch(com.sun.star.lang.WrappedTargetException e) { } } - if (xDrawPage == null) { + if (xDrawPage == null) { throw new StatusException(Status.failed("'XSheetAuditing.DrawPage' object relation not found.")); } if (xDrawPage.hasElements()) { elementCount = xDrawPage.getCount(); } - + // switch off the automatic refresh PropertyValue[] props = new PropertyValue[1]; props[0] = new PropertyValue(); @@ -136,7 +136,7 @@ public class _XDocumentAuditing extends MultiMethodTest { throw new StatusException("Could not set formulas on sheets.", e); } } - + public void after() { // switch the automatic refresh back on PropertyValue[] props = new PropertyValue[1]; @@ -146,10 +146,10 @@ public class _XDocumentAuditing extends MultiMethodTest { XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, oObj); dispatch(xModel.getCurrentController().getFrame(), (XMultiServiceFactory)tParam.getMSF(), ".uno:AutoRefreshArrows", props); } - + public void _refreshArrows() { boolean result = true; - + Point p0 = pos; try { @@ -160,7 +160,7 @@ public class _XDocumentAuditing extends MultiMethodTest { catch(com.sun.star.lang.IndexOutOfBoundsException e) { throw new StatusException("Could not set formulas on sheets.", e); } - + result &= hasRightAmountOfShapes(1); Point p1 = pos; @@ -169,18 +169,18 @@ public class _XDocumentAuditing extends MultiMethodTest { result &= res; if (!res) log.println("Arrow has been refreshed, but this should have been switched off."); - + oObj.refreshArrows(); result &= hasRightAmountOfShapes(1); Point p2 = pos; - + // points have to differ res = (p1.X != p2.X || p1.Y != p2.Y); result &= res; if (!res) log.println("Arrow has not been refreshed."); - + tRes.tested("refreshArrows()", result); } @@ -212,7 +212,7 @@ public class _XDocumentAuditing extends MultiMethodTest { } return true; } - + private void dispatch(Object oProvider, XMultiServiceFactory xMSF, String url, PropertyValue[] prop) { XDispatchProvider xDispatchProvider = (XDispatchProvider)UnoRuntime.queryInterface(XDispatchProvider.class, oProvider); Object dispatcher = null; @@ -221,7 +221,7 @@ public class _XDocumentAuditing extends MultiMethodTest { } catch(com.sun.star.uno.Exception e) { } - + XDispatchHelper xDispatchHelper = (XDispatchHelper)UnoRuntime.queryInterface(XDispatchHelper.class, dispatcher); xDispatchHelper.executeDispatch(xDispatchProvider, url, "", 0, prop); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index 2034bb892047..7277bed21313 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { protected boolean mouseReleased = false; protected XEnhancedMouseClickHandler listener = new MyListener(); private XModel docModel = null; - + public void before() { docModel = (XModel) UnoRuntime.queryInterface( XModel.class,tEnv.getObjRelation("FirstModel")); DesktopTools.bringWindowToFront(docModel); } - + public void _addEnhancedMouseClickHandler() { oObj.addEnhancedMouseClickHandler(listener); clickOnSheet(); @@ -92,19 +92,19 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { protected boolean clickOnSheet() { log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - + XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), docModel); - + XAccessible xRoot = at.getAccessibleObject(xWindow); - + XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); - + XAccessibleComponent window = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); - + Point point = window.getLocationOnScreen(); Rectangle rect = window.getBounds(); - + log.println("klick mouse button..."); try { Robot rob = new Robot(); @@ -122,11 +122,11 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { rob.mousePress(InputEvent.BUTTON1_MASK); System.out.println("Release Button"); rob.mouseRelease(InputEvent.BUTTON1_MASK); - System.out.println("done "+rob.getAutoDelay()); + System.out.println("done "+rob.getAutoDelay()); } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + return true; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java index 3e04690ac47b..4c0fe8e53d7b 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,16 +43,16 @@ import com.sun.star.uno.UnoRuntime; * @author sw93809 */ public class _XFormulaQuery extends MultiMethodTest { - + public XFormulaQuery oObj; - + protected XSpreadsheet oSheet = null; private XCell mxCell; private int miQueryThisDependentRange = 1; private int miQueryThisPrecedentRange = 1; private int[] miExpectedDependentValues; private int[] miExpectedPrecedentValues; - + protected void before() { oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET"); @@ -78,7 +78,7 @@ public class _XFormulaQuery extends MultiMethodTest { throw new StatusException( Status.failed("Couldn't get initial cell")); } - } + } o = tEnv.getObjRelation("RANGEINDICES"); if (o != null) { @@ -98,7 +98,7 @@ public class _XFormulaQuery extends MultiMethodTest { miExpectedDependentValues[2] = 15; miExpectedDependentValues[3] = 15; } - + o = tEnv.getObjRelation("EXPECTEDPRECEDENTVALUES"); if (o != null) { miExpectedPrecedentValues = (int[])o; @@ -111,7 +111,7 @@ public class _XFormulaQuery extends MultiMethodTest { miExpectedPrecedentValues[3] = 15; } } - + public void _queryDependents() { boolean res = true; @@ -121,15 +121,15 @@ public class _XFormulaQuery extends MultiMethodTest { oSheet.getCellByPosition(1, 0).setValue(1); oSheet.getCellByPosition(2, 0).setValue(1); oSheet.getCellByPosition(3, 0).setValue(1); - + log.println( "calling oObj.queryDependents(false)"); - XSheetCellRanges getting = oObj.queryDependents(false); + XSheetCellRanges getting = oObj.queryDependents(false); CellRangeAddress[] range = getting.getRangeAddresses(); - - res = ((range[miQueryThisDependentRange].StartColumn==miExpectedDependentValues[0]) && - (range[miQueryThisDependentRange].EndColumn==miExpectedDependentValues[1]) && - (range[miQueryThisDependentRange].StartRow==miExpectedDependentValues[2]) && + + res = ((range[miQueryThisDependentRange].StartColumn==miExpectedDependentValues[0]) && + (range[miQueryThisDependentRange].EndColumn==miExpectedDependentValues[1]) && + (range[miQueryThisDependentRange].StartRow==miExpectedDependentValues[2]) && (range[miQueryThisDependentRange].EndRow==miExpectedDependentValues[3])); if (!res) { @@ -148,9 +148,9 @@ public class _XFormulaQuery extends MultiMethodTest { res = false; } - tRes.tested("queryDependents()", res); + tRes.tested("queryDependents()", res); } - + public void _queryPrecedents() { boolean res = true; @@ -161,15 +161,15 @@ public class _XFormulaQuery extends MultiMethodTest { oSheet.getCellByPosition(2, 0).setValue(1); oSheet.getCellByPosition(3, 0).setValue(1); oSheet.getCellByPosition(1, 2).setFormula("=A16*2"); - + log.println( "calling oObj.queryPrecedents(false)"); XSheetCellRanges getting = oObj.queryPrecedents(false); CellRangeAddress[] range = getting.getRangeAddresses(); - - res = ((range[miQueryThisPrecedentRange].StartColumn==miExpectedPrecedentValues[0]) && - (range[miQueryThisPrecedentRange].EndColumn==miExpectedPrecedentValues[1]) && - (range[miQueryThisPrecedentRange].StartRow==miExpectedPrecedentValues[2]) && + + res = ((range[miQueryThisPrecedentRange].StartColumn==miExpectedPrecedentValues[0]) && + (range[miQueryThisPrecedentRange].EndColumn==miExpectedPrecedentValues[1]) && + (range[miQueryThisPrecedentRange].StartRow==miExpectedPrecedentValues[2]) && (range[miQueryThisPrecedentRange].EndRow==miExpectedPrecedentValues[3])); if (!res) { @@ -188,14 +188,14 @@ public class _XFormulaQuery extends MultiMethodTest { res = false; } - tRes.tested("queryPrecedents()", res); + tRes.tested("queryPrecedents()", res); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } - + } + } diff --git a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java b/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java index 5f16c7640fec..cb72d09bb32c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java +++ b/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java index 24dad9db4bda..b11a550e3ca3 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java +++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public class _XGoalSeek extends MultiMethodTest { if (ex != null) { throw new StatusException("Could not get a sheet.", ex); } - + // set value and formula try { xSheet.getCellByPosition(3, 4).setValue(9); @@ -82,7 +82,7 @@ public class _XGoalSeek extends MultiMethodTest { throw new StatusException("Could not get set formulas on the sheet.", e); } } - + public void _seekGoal() { boolean result = true; double divergence = 0.01; @@ -90,7 +90,7 @@ public class _XGoalSeek extends MultiMethodTest { log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence); result &= goal.Divergence < divergence; result &= goal.Result > 16 - divergence || goal.Result < 16 + divergence; - + goal = oObj.seekGoal(aFormula, aValue, "-4"); log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence); result &= goal.Divergence > 1/divergence; @@ -106,7 +106,7 @@ public class _XGoalSeek extends MultiMethodTest { log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence); result &= goal.Divergence < divergence; result &= goal.Result > 16 - divergence || goal.Result < 16 + divergence; - + tRes.tested("seekGoal()", result); } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent.java b/qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent.java index d3ee84f7cdc2..3e2561c6f268 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent.java +++ b/qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XLabelRange.java b/qadevOOo/tests/java/ifc/sheet/_XLabelRange.java index 3bc34fdef5bd..cb58d33dec91 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XLabelRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XLabelRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XLabelRanges.java b/qadevOOo/tests/java/ifc/sheet/_XLabelRanges.java index 9d4d28ff634c..292eb6d1209c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XLabelRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_XLabelRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java index e10ca8d55f2f..3ae800e78d38 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java +++ b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public class _XMultipleOperation extends MultiMethodTest { boolean res = true; XCellRange cellRange = oSheet.getCellRangeByName("$A$17:$A$17"); XCellRangeAddressable CRA = (XCellRangeAddressable) UnoRuntime.queryInterface( - XCellRangeAddressable.class, + XCellRangeAddressable.class, cellRange); XCell cell = null; XCell cell2 = null; @@ -88,7 +88,7 @@ public class _XMultipleOperation extends MultiMethodTest { log.println("filling cells"); fillCells(); log.println("setting TableOperation with parameter ROW"); - oObj.setTableOperation(CRA.getRangeAddress(), TableOperationMode.ROW, + oObj.setTableOperation(CRA.getRangeAddress(), TableOperationMode.ROW, CA.getCellAddress(), CA2.getCellAddress()); log.println("checking values"); cellCoords = new Point[] { @@ -100,8 +100,8 @@ public class _XMultipleOperation extends MultiMethodTest { log.println("filling cells"); fillCells(); log.println("setting TableOperation with parameter COLUMN"); - oObj.setTableOperation(CRA.getRangeAddress(), - TableOperationMode.COLUMN, CA.getCellAddress(), + oObj.setTableOperation(CRA.getRangeAddress(), + TableOperationMode.COLUMN, CA.getCellAddress(), CA2.getCellAddress()); log.println("checking values"); cellCoords = new Point[] { @@ -114,8 +114,8 @@ public class _XMultipleOperation extends MultiMethodTest { log.println("filling cells"); fillCells(); log.println("setting TableOperation with parameter BOTH"); - oObj.setTableOperation(CRA.getRangeAddress(), - TableOperationMode.BOTH, + oObj.setTableOperation(CRA.getRangeAddress(), + TableOperationMode.BOTH, CA.getCellAddress(), CA2.getCellAddress()); log.println("checking values"); cellCoords = new Point[] { @@ -148,23 +148,23 @@ public class _XMultipleOperation extends MultiMethodTest { for (int i = 0; i < cellValues.length; i++) { try { - boolean locres = oSheet.getCellByPosition(cellCoords[i].X, + boolean locres = oSheet.getCellByPosition(cellCoords[i].X, cellCoords[i].Y) .getValue() == cellValues[i]; res &= locres; if (!locres) { - log.println("Result differs for cell (" + - cellCoords[i].X + "," + cellCoords[i].Y + + log.println("Result differs for cell (" + + cellCoords[i].X + "," + cellCoords[i].Y + ")"); log.println("Expected: " + cellValues[i]); - log.println("Getting: " + - oSheet.getCellByPosition(cellCoords[i].X, + log.println("Getting: " + + oSheet.getCellByPosition(cellCoords[i].X, cellCoords[i].Y) .getValue()); } } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception while checking Values " + + log.println("Exception while checking Values " + e.getMessage()); res &= false; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java index 06c76956adff..909e84afa1be 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java index 6baffd4bfdfe..4151fdfbc387 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java index 9c4e865bd52a..1edcb825e692 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java +++ b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public class _XPrintAreas extends MultiMethodTest { CellRangeAddress subaddress = null; CellRangeAddress titleColumns; CellRangeAddress titleRows; - + public void before() { address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress"); subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress"); @@ -51,7 +51,7 @@ public class _XPrintAreas extends MultiMethodTest { if (subaddress == null) throw new StatusException(Status.failed("Object relation CellRangeSubAddress not found")); } - + public void _getPrintAreas() { requiredMethod("getPrintTitleColumns()"); requiredMethod("getPrintTitleRows()"); @@ -64,32 +64,32 @@ public class _XPrintAreas extends MultiMethodTest { oObj.setPrintAreas(null); printAreas = oObj.getPrintAreas(); ret &= printAreas.length == 0; - + tRes.tested("getPrintAreas()", ret); } - + public void _getPrintTitleColumns() { requiredMethod("setPrintTitleColumns()"); tRes.tested("getPrintTitleColumns()", !oObj.getPrintTitleColumns()); } - + public void _getPrintTitleRows() { requiredMethod("setPrintTitleRows()"); tRes.tested("getPrintTitleRows()", !oObj.getPrintTitleRows()); } - + public void _getTitleColumns() { requiredMethod("setTitleColumns()"); CellRangeAddress setValue = oObj.getTitleColumns(); tRes.tested("getTitleColumns()", ValueComparer.equalValue(setValue,titleColumns)); } - + public void _getTitleRows() { requiredMethod("setTitleRows()"); CellRangeAddress setValue = oObj.getTitleRows(); tRes.tested("getTitleRows()", ValueComparer.equalValue(setValue,titleRows)); } - + public void _setPrintAreas() { boolean ret = false; CellRangeAddress[]setValue = new CellRangeAddress[]{subaddress}; @@ -102,7 +102,7 @@ public class _XPrintAreas extends MultiMethodTest { ret &= ValueComparer.equalValue(newVal, setValue); tRes.tested("setPrintAreas()", ret); } - + public void _setPrintTitleColumns() { requiredMethod("setTitleColumns()"); boolean ret = false; @@ -112,7 +112,7 @@ public class _XPrintAreas extends MultiMethodTest { oObj.setPrintTitleColumns(false); tRes.tested("setPrintTitleColumns()", ret); } - + public void _setPrintTitleRows() { requiredMethod("setTitleRows()"); boolean ret = false; @@ -122,7 +122,7 @@ public class _XPrintAreas extends MultiMethodTest { oObj.setPrintTitleRows(false); tRes.tested("setPrintTitleRows()", ret); } - + public void _setTitleColumns() { requiredMethod("setPrintAreas()"); boolean ret = false; @@ -138,7 +138,7 @@ public class _XPrintAreas extends MultiMethodTest { oObj.setTitleColumns(titleColumns); tRes.tested("setTitleColumns()", ret); } - + public void _setTitleRows() { requiredMethod("setPrintAreas()"); boolean ret = false; diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index bb61dbe55049..9af63c12204c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ import util.AccessibilityTools; public class _XRangeSelection extends MultiMethodTest { public XRangeSelection oObj = null; MyRangeSelectionListener aListener = null; - + public void before() { aListener = new _XRangeSelection.MyRangeSelectionListener(log); // workaround for i34499 @@ -72,44 +72,44 @@ public class _XRangeSelection extends MultiMethodTest { xTopWindow.toFront(); util.utils.shortWait(500); } - - + + public void _abortRangeSelection() { requiredMethod("removeRangeSelectionChangeListener()"); requiredMethod("removeRangeSelectionListener()"); oObj.abortRangeSelection(); tRes.tested("abortRangeSelection()", true); } - + public void _addRangeSelectionChangeListener() { oObj.addRangeSelectionChangeListener(aListener); tRes.tested("addRangeSelectionChangeListener()", true); } - + public void _addRangeSelectionListener() { oObj.addRangeSelectionListener(aListener); tRes.tested("addRangeSelectionListener()", true); } - + public void _removeRangeSelectionChangeListener() { oObj.removeRangeSelectionChangeListener(aListener); tRes.tested("removeRangeSelectionChangeListener()", true); } - + public void _removeRangeSelectionListener() { oObj.removeRangeSelectionListener(aListener); tRes.tested("removeRangeSelectionListener()", true); } - + public void _startRangeSelection() { requiredMethod("addRangeSelectionChangeListener()"); requiredMethod("addRangeSelectionListener()"); - + // get the sheet center Point center = getSheetCenter();; if (center == null) throw new StatusException(Status.failed("Couldn't get the sheet center.")); - + PropertyValue[] props = new PropertyValue[3]; props[0] = new PropertyValue(); props[0].Name = "InitialValue"; @@ -138,7 +138,7 @@ public class _XRangeSelection extends MultiMethodTest { util.utils.shortWait(5000); // System.out.println("X: " + closer.X + " Y: " + closer.Y); - + // just check that we do not have the page instead of the range descriptor /* int childCount = xRoot.getAccessibleContext().getAccessibleChildCount(); if (childCount > 3) {// too many children: wrong type @@ -149,10 +149,10 @@ public class _XRangeSelection extends MultiMethodTest { xAcc = xRoot.getAccessibleContext().getAccessibleChild(1); } catch(com.sun.star.lang.IndexOutOfBoundsException e) { - + } accTools.printAccessibleTree(log, xAcc); -*/ +*/ // open a new range selection props[0].Value = "C4:E6"; oObj.startRangeSelection(props); @@ -160,16 +160,16 @@ public class _XRangeSelection extends MultiMethodTest { props[0].Value = "C2:E3"; oObj.startRangeSelection(props); util.utils.shortWait(1000); - + oObj.startRangeSelection(props); util.utils.shortWait(1000); oObj.abortRangeSelection(); aListener.reset(); System.out.println("Listener called: " + aListener.bAbortCalled); - + tRes.tested("startRangeSelection()", aListener.listenerCalled()); } - + /** * Determine the current top window center and return this as a point. * @ return a point representing the sheet center. @@ -178,11 +178,11 @@ public class _XRangeSelection extends MultiMethodTest { log.println("Trying to get AccessibleSpreadsheet"); AccessibilityTools at = new AccessibilityTools(); XComponent xSheetDoc = (XComponent) tEnv.getObjRelation("DOCUMENT"); - + XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xSheetDoc); System.out.println("Name: " + xModel.getCurrentController().getFrame().getName()); - + XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), xModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -190,10 +190,10 @@ public class _XRangeSelection extends MultiMethodTest { XAccessibleComponent AccessibleSpreadsheet = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class,AccessibilityTools.SearchedContext); - log.println("Got " + util.utils.getImplName(AccessibleSpreadsheet)); + log.println("Got " + util.utils.getImplName(AccessibleSpreadsheet)); Object toolkit = null; - + try { toolkit = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { @@ -203,14 +203,14 @@ public class _XRangeSelection extends MultiMethodTest { } XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); - + XExtendedToolkit.class, toolkit); + XTopWindow tw = null; - + int k = tk.getTopWindowCount(); for (int i=0;i<k;i++) { try { - XTopWindow tw_temp = tk.getTopWindow(i); + XTopWindow tw_temp = tk.getTopWindow(i); XAccessible xacc = (XAccessible) UnoRuntime.queryInterface(XAccessible.class, tw_temp); if (xacc != null) { if (xacc.getAccessibleContext().getAccessibleName().indexOf("d2")>0) { @@ -227,7 +227,7 @@ public class _XRangeSelection extends MultiMethodTest { System.out.println("No TopWindow :-("); return null; } - + Point point = AccessibleSpreadsheet.getLocationOnScreen(); Rectangle rect = AccessibleSpreadsheet.getBounds(); Point retPoint = new Point(); @@ -235,7 +235,7 @@ public class _XRangeSelection extends MultiMethodTest { retPoint.Y = point.Y + (rect.Height / 2); return retPoint; } - + /** * Get the closer button on the right top of the current window. * @return A point representing the closer button. @@ -251,12 +251,12 @@ public class _XRangeSelection extends MultiMethodTest { } XExtendedToolkit xExtendedToolkit = (XExtendedToolkit)UnoRuntime.queryInterface(XExtendedToolkit.class, aToolkit); XTopWindow tw = null; - + XAccessibleComponent xAccessibleComponent = null; int k = xExtendedToolkit.getTopWindowCount(); for (int i=0;i<k;i++) { try { - XTopWindow tw_temp = xExtendedToolkit.getTopWindow(i); + XTopWindow tw_temp = xExtendedToolkit.getTopWindow(i); XAccessible xacc = (XAccessible)UnoRuntime.queryInterface(XAccessible.class, tw_temp); if (xacc != null) { System.out.println("Name: " + xacc.getAccessibleContext().getAccessibleName()); @@ -269,7 +269,7 @@ public class _XRangeSelection extends MultiMethodTest { else System.out.println("########## KLAPPT ########## "); } - } + } else { log.println("\t unknown window"); } @@ -281,10 +281,10 @@ public class _XRangeSelection extends MultiMethodTest { System.out.println("No TopWindow :-("); return null; } - + XWindow xWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, tw); Rectangle posSize = xWindow.getPosSize(); - + // compare the center point with the dimensions of the current top window boolean windowOK = false; while(!windowOK) { @@ -302,7 +302,7 @@ public class _XRangeSelection extends MultiMethodTest { else { windowOK = true; } - + } Point p = xAccessibleComponent.getLocationOnScreen(); @@ -313,8 +313,8 @@ public class _XRangeSelection extends MultiMethodTest { closer.Y = p.Y + 5; System.out.println("Closer: " + closer.X + " " + closer.Y); return closer; - } - + } + protected boolean clickOnSheet(Point point) { log.println("Clicking in the center of the AccessibleSpreadsheet"); @@ -328,10 +328,10 @@ public class _XRangeSelection extends MultiMethodTest { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + return true; } - + /** * */ @@ -344,32 +344,32 @@ public class _XRangeSelection extends MultiMethodTest { public MyRangeSelectionListener(PrintWriter log) { this.log = log; } - + public void aborted(RangeSelectionEvent rangeSelectionEvent) { log.println("Called 'aborted' with: " + rangeSelectionEvent.RangeDescriptor); bAbortCalled = true; } - + public void descriptorChanged(RangeSelectionEvent rangeSelectionEvent) { log.println("Called 'descriptorChanged' with: " + rangeSelectionEvent.RangeDescriptor); bChangeCalled = true; } - + public void done(RangeSelectionEvent rangeSelectionEvent) { log.println("Called 'done' with: " + rangeSelectionEvent.RangeDescriptor); bDoneCalled = true; } - + public boolean listenerCalled() { return bAbortCalled & bChangeCalled & bDoneCalled; } - + public void reset() { bAbortCalled = false; bChangeCalled = false; bDoneCalled = false; } - + /** * ignore disposing * @param eventObject The event. diff --git a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java index 117e7607e1c0..87ac408e0249 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ public class _XRecentFunctions extends MultiMethodTest { requiredMethod("getMaxRecentFunctions()"); boolean bResult = true; - int[] IDs = new int[0]; + int[] IDs = new int[0]; XNameAccess functionList = null; log.println("First, get the set of available functions."); diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenario.java b/qadevOOo/tests/java/ifc/sheet/_XScenario.java index ea158b8a2cd1..cb00fb56dd8a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenario.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenario.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ public class _XScenario extends MultiMethodTest { CellRangeAddress address = null; String comment = null; boolean skipTest = false; - + public void before() { // testing a scenario containing the whole sheet does not make sense. // test is skipped until this interface is implemented somewhere else @@ -54,7 +54,7 @@ public class _XScenario extends MultiMethodTest { oObj.addRanges(new CellRangeAddress[] {address}); tRes.tested("addRanges()", true); } - + public void _apply() { requiredMethod("addRanges()"); if (skipTest) { @@ -64,7 +64,7 @@ public class _XScenario extends MultiMethodTest { oObj.apply(); tRes.tested("apply()", true); } - + public void _getIsScenario() { requiredMethod("apply()"); if (skipTest) { @@ -74,7 +74,7 @@ public class _XScenario extends MultiMethodTest { boolean getIs = oObj.getIsScenario(); tRes.tested("getIsScenario()", getIs); } - + public void _getScenarioComment() { if (skipTest) { tRes.tested("getScenarioComment()",Status.skipped(true)); @@ -83,7 +83,7 @@ public class _XScenario extends MultiMethodTest { comment = oObj.getScenarioComment(); tRes.tested("getScenarioComment()", true); } - + public void _setScenarioComment() { requiredMethod("getScenarioComment()"); if (skipTest) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java index 42fac78d7d81..cdaea811b686 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public class _XScenarioEnhanced extends MultiMethodTest { public void before() { oObj = (XScenarioEnhanced) UnoRuntime.queryInterface( - XScenarioEnhanced.class, + XScenarioEnhanced.class, tEnv.getObjRelation("ScenarioSheet")); } @@ -55,35 +55,35 @@ public class _XScenarioEnhanced extends MultiMethodTest { if (!(first.Sheet == 1)) { log.println( - "wrong RangeAddress is returned, expected Sheet=0 and got " + + "wrong RangeAddress is returned, expected Sheet=0 and got " + first.Sheet); res = false; } if (!(first.StartColumn == 0)) { log.println( - "wrong RangeAddress is returned, expected StartColumn=0 and got " + + "wrong RangeAddress is returned, expected StartColumn=0 and got " + first.StartColumn); res = false; } if (!(first.EndColumn == 10)) { log.println( - "wrong RangeAddress is returned, expected EndColumn=10 and got " + + "wrong RangeAddress is returned, expected EndColumn=10 and got " + first.EndColumn); res = false; } if (!(first.StartRow == 0)) { log.println( - "wrong RangeAddress is returned, expected StartRow=0 and got " + + "wrong RangeAddress is returned, expected StartRow=0 and got " + first.StartRow); res = false; } if (!(first.EndRow == 10)) { log.println( - "wrong RangeAddress is returned, expected EndRow=10 and got " + + "wrong RangeAddress is returned, expected EndRow=10 and got " + first.EndRow); res = false; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarios.java b/qadevOOo/tests/java/ifc/sheet/_XScenarios.java index efd4dcb458a0..0935e18b59f2 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenarios.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenarios.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier.java index f1766b82a7da..286bed8eebff 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java index a50d63f817f9..865a987458b8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java index 76a5b97b0aaf..74a0aa4fa42f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ import com.sun.star.uno.UnoRuntime; */ public class _XSheetAnnotationAnchor extends MultiMethodTest { - public XSheetAnnotationAnchor oObj = null; + public XSheetAnnotationAnchor oObj = null; protected XSheetAnnotation anno = null; public void _getAnnotation() { anno = oObj.getAnnotation(); tRes.tested("getAnnotation()",checkAnnotation()); } - + protected boolean checkAnnotation() { boolean res = true; res &= check_getAuthor(); @@ -62,7 +62,7 @@ public class _XSheetAnnotationAnchor extends MultiMethodTest { res &= check_setIsVisible(); return res; } - + /** * Gets the author of annotation. <p> * Returns <b>true</b> if not null value returned. @@ -127,6 +127,6 @@ public class _XSheetAnnotationAnchor extends MultiMethodTest { } return bResult; - } + } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationShapeSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationShapeSupplier.java index 9b0f3c193b73..9cd3e9823370 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationShapeSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationShapeSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ import lib.MultiMethodTest; public class _XSheetAnnotationShapeSupplier extends MultiMethodTest { public XSheetAnnotationShapeSupplier oObj = null; - + public void _getAnnotationShape() { XShape xShape = oObj.getAnnotationShape (); tRes.tested ("getAnnotationShape()",xShape!=null); } - + } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java index d24f2cbf9416..ce53a48b867a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java index 544d19c8f630..5946d646762d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java index a721275ed684..d3efe367b0f4 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public class _XSheetAuditing extends MultiMethodTest { XCell xDependentAddress = null; XDrawPage xDrawPage = null; int elementCount = 0; - + public void before() { address = (CellAddress)tEnv.getObjRelation("XSheetAuditing.CellAddress"); precedentAddress = (CellAddress)tEnv.getObjRelation("XSheetAuditing.PrecedentCellAddress"); @@ -62,7 +62,7 @@ public class _XSheetAuditing extends MultiMethodTest { if (address == null || precedentAddress == null || dependentAddress == null) { throw new StatusException(Status.failed("Necessary CellAddress object relations not found.")); } - + // get the draw page for checking the shapes xDrawPage = (XDrawPage)tEnv.getObjRelation("XSheetAuditing.DrawPage"); if (xDrawPage == null) { // get from object @@ -70,18 +70,18 @@ public class _XSheetAuditing extends MultiMethodTest { UnoRuntime.queryInterface(XDrawPageSupplier.class, oObj); xDrawPage = (XDrawPage) oDPS.getDrawPage(); } - if (xDrawPage == null) { + if (xDrawPage == null) { throw new StatusException(Status.failed("'XSheetAuditing.DrawPage' object relation not found.")); } if (xDrawPage.hasElements()) { elementCount = xDrawPage.getCount(); } - + // get a sheet for changing the cells XSpreadsheet xSheet = (XSpreadsheet)tEnv.getObjRelation("XSheetAuditing.Spreadsheet"); if (xSheet == null) // query on ther object xSheet = (XSpreadsheet)UnoRuntime.queryInterface(XSpreadsheet.class, oObj); - if (xSheet == null) + if (xSheet == null) throw new StatusException(Status.failed("'XSheetAuditing.Spreadsheet' object relation not found.")); try { xAddress = xSheet.getCellByPosition(address.Column, address.Row); @@ -103,26 +103,26 @@ public class _XSheetAuditing extends MultiMethodTest { erg &= hasRightAmountOfShapes(0); tRes.tested("clearArrows()", erg); } - + public void _hideDependents() { requiredMethod("showDependents()"); oObj.hideDependents(address); tRes.tested("hideDependents()", hasRightAmountOfShapes(0)); } - + public void _hidePrecedents() { requiredMethod("showPrecedents()"); // requiredMethod("showPrecedents()"); oObj.hidePrecedents(address); tRes.tested("hidePrecedents()", hasRightAmountOfShapes(0)); } - + public void _showDependents() { requiredMethod("hidePrecedents()"); oObj.showDependents(address); tRes.tested("showDependents()", hasRightAmountOfShapes(1)); } - + public void _showErrors() { requiredMethod("clearArrows()"); // construct an error: square root from -3 @@ -138,7 +138,7 @@ public class _XSheetAuditing extends MultiMethodTest { erg &= hasRightAmountOfShapes(2); tRes.tested("showErrors()", erg); } - + public void _showInvalid() { requiredMethod("showErrors()"); boolean result = true; @@ -167,15 +167,15 @@ public class _XSheetAuditing extends MultiMethodTest { e.printStackTrace((java.io.PrintWriter)log); result = false; } - + tRes.tested("showInvalid()", result); } - + public void _showPrecedents() { oObj.showPrecedents(address); tRes.tested("showPrecedents()", hasRightAmountOfShapes(2)); } - + /** * Check if the amount of shapes is the right one after displaying that stuff * 2do improve this: check taht the shapes are the correct ones -> convwatch diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java index ec484f9bf0d6..7c81f9dc7d29 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRange.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRange.java index 95688c660c91..58b0fa44bd32 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java index 230306b300cd..a877fcd16159 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -194,12 +194,12 @@ public class _XSheetCellRangeContainer extends MultiMethodTest { log.println("Elements after removing: " + cnt); tRes.tested("removeRangeAddresses()" ,result); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges.java index c64aeae807c4..cf5ca59929b3 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public class _XSheetCellRanges extends MultiMethodTest{ */ public void _getRangeAddressesAsString() { log.println("Testing getRangeAddressesAsString ..."); - String oRanges = oObj.getRangeAddressesAsString(); + String oRanges = oObj.getRangeAddressesAsString(); tRes.tested("getRangeAddressesAsString()",oRanges.indexOf("C1:D4")>0); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java index 05b0e0f4a3c0..0946511e7ad6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java index ba8448366bca..0365a6a5079a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java index efa3fcc44862..2d8c920b12a5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor.java index ebb6a0a6db57..306742181734 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java index 385b7a2e150d..bd5ca3fcaf4b 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,11 +92,11 @@ public class _XSheetFilterable extends MultiMethodTest { oObj.filter(desc); XColumnRowRange oColumnRowRange = (XColumnRowRange) UnoRuntime.queryInterface( - XColumnRowRange.class, + XColumnRowRange.class, oSheet); XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); XPropertySet rowProp = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, + XPropertySet.class, oRows.getByIndex(0)); boolean locRes = ((Boolean) rowProp.getPropertyValue("IsVisible")).booleanValue(); @@ -121,11 +121,11 @@ public class _XSheetFilterable extends MultiMethodTest { log.println("couldn't fill cells " + e.getLocalizedMessage()); res = false; } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("problems geting Property 'isVisible' " + + log.println("problems geting Property 'isVisible' " + e.getLocalizedMessage()); res = false; } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("problems geting Property 'isVisible' " + + log.println("problems geting Property 'isVisible' " + e.getLocalizedMessage()); res = false; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java index afb642290b67..eb02619490ad 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ import com.sun.star.uno.UnoRuntime; /** * Inteface test for XSheetFilterableEx * - * methods: + * methods: * * createFilterDescriptorByObject - * + * */ public class _XSheetFilterableEx extends MultiMethodTest { public XSheetFilterableEx oObj = null; @@ -51,7 +51,7 @@ public class _XSheetFilterableEx extends MultiMethodTest { * a XSheetFilterDescriptor with it. * Returns OK if the Descriptor isn't null and checkFilterDescriptor returns true */ - + public void _createFilterDescriptorByObject() { boolean res = true; Object parent = tEnv.getTestObject(); @@ -68,11 +68,11 @@ public class _XSheetFilterableEx extends MultiMethodTest { } tRes.tested("createFilterDescriptorByObject()",res); } - + /** * returns true if the Method getFilterFields() returns a non empty array * and all Fields can be gained without exception - */ + */ public boolean checkFilterDescriptor(XSheetFilterDescriptor desc) { TableFilterField[] fields = desc.getFilterFields(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java index 4972ef7bcc94..f76da13bdb58 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,61 +40,61 @@ public class _XSheetLinkable extends MultiMethodTest { String linkSheetName = null; String linkUrl = null; String linkUrl2 = null; - + public void before() { // get a document for linking. linkUrl = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet"); linkUrl = utils.getFullTestURL(linkUrl); - + // get a second sheet for changing the link url: if it's not set, // this part of the test is omitted. linkUrl2 = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet2"); if (linkUrl2 != null) linkUrl = utils.getFullTestURL(linkUrl); - + // set a name for the sheet. linkSheetName = "Sheet1"; } - - public void _getLinkMode() { + + public void _getLinkMode() { requiredMethod("link()"); slm = oObj.getLinkMode(); - tRes.tested("getLinkMode()", slm == SheetLinkMode.VALUE); + tRes.tested("getLinkMode()", slm == SheetLinkMode.VALUE); } - - public void _getLinkSheetName() { + + public void _getLinkSheetName() { requiredMethod("link()"); String lSheetName = oObj.getLinkSheetName(); - tRes.tested("getLinkSheetName()", linkSheetName.equals(lSheetName)); + tRes.tested("getLinkSheetName()", linkSheetName.equals(lSheetName)); } - - public void _getLinkUrl() { + + public void _getLinkUrl() { requiredMethod("link()"); String lUrl = oObj.getLinkUrl(); System.out.println("URL: " + lUrl); - tRes.tested("getLinkUrl()", lUrl.equals(linkUrl)); + tRes.tested("getLinkUrl()", lUrl.equals(linkUrl)); } - - public void _link() { + + public void _link() { oObj.link(linkUrl, linkSheetName, "", "", SheetLinkMode.VALUE); - tRes.tested("link()", true); + tRes.tested("link()", true); } - + public void _setLinkMode() { requiredMethod("getLinkMode()"); oObj.setLinkMode(SheetLinkMode.NONE); slm = oObj.getLinkMode(); - tRes.tested("setLinkMode()", slm == SheetLinkMode.NONE); + tRes.tested("setLinkMode()", slm == SheetLinkMode.NONE); } - - public void _setLinkSheetName() { + + public void _setLinkSheetName() { requiredMethod("getLinkSheetName()"); oObj.setLinkSheetName("Sheet2"); linkSheetName = oObj.getLinkSheetName(); - tRes.tested("setLinkSheetName()", linkSheetName.equals("Sheet2")); + tRes.tested("setLinkSheetName()", linkSheetName.equals("Sheet2")); } - - public void _setLinkUrl() { + + public void _setLinkUrl() { requiredMethod("getLinkUrl()"); boolean result = false; if (linkUrl2 == null) { @@ -107,6 +107,6 @@ public class _XSheetLinkable extends MultiMethodTest { linkUrl = oObj.getLinkUrl(); result = linkUrl.equals(linkUrl2); } - tRes.tested("setLinkUrl()", result); + tRes.tested("setLinkUrl()", result); } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java index e57c50c00714..1eb75f9a3b92 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java index 2a69cb7e0404..b48e55d414d1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ public class _XSheetOutline extends MultiMethodTest { public XSheetOutline oObj = null; CellRangeAddress address = null; CellRangeAddress subaddress = null; - + public void before() { address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress"); subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress"); @@ -53,7 +53,7 @@ public class _XSheetOutline extends MultiMethodTest { if (subaddress == null) throw new StatusException(Status.failed("Object relation CellRangeSubAddress not found")); } - + public void _autoOutline() { executeMethod("ungroup()"); boolean result = false; @@ -65,7 +65,7 @@ public class _XSheetOutline extends MultiMethodTest { result &= !isCellShown(subaddress); tRes.tested("autoOutline()", result); } - + public void _clearOutline() { executeMethod("autoOutline()"); boolean result = false; @@ -75,13 +75,13 @@ public class _XSheetOutline extends MultiMethodTest { result &= isCellShown(subaddress); tRes.tested("clearOutline()", result); } - + public void _group() { oObj.group(address, TableOrientation.COLUMNS); oObj.group(address, TableOrientation.ROWS); tRes.tested("group()", true); } - + public void _ungroup() { executeMethod("showDetail()"); oObj.ungroup(address, TableOrientation.COLUMNS); @@ -95,13 +95,13 @@ public class _XSheetOutline extends MultiMethodTest { oObj.hideDetail(address); tRes.tested("hideDetail()", !isCellShown(address)); } - + public void _showDetail() { executeMethod("showLevel()"); oObj.showDetail(address); tRes.tested("showDetail()", isCellShown(address)); } - + public void _showLevel() { executeMethod("hideDetail()"); boolean result = false; @@ -110,11 +110,11 @@ public class _XSheetOutline extends MultiMethodTest { result = isCellShown(address); oObj.showLevel((short)0, TableOrientation.COLUMNS); oObj.showLevel((short)0, TableOrientation.ROWS); - + result &= !isCellShown(address); tRes.tested("showLevel()", result); } - + private boolean isCellShown(CellRangeAddress range) { boolean isNotShown = true; XCellRangesQuery xCellRangesQuery = (XCellRangesQuery)UnoRuntime.queryInterface(XCellRangesQuery.class, oObj); @@ -131,9 +131,9 @@ public class _XSheetOutline extends MultiMethodTest { } return !isNotShown; } - + private boolean dotIsOutsideRange(int dotRow, int dotColumn, CellRangeAddress range) { - log.println("Checking dot(" + dotRow + "," + dotColumn + ") against row[" + log.println("Checking dot(" + dotRow + "," + dotColumn + ") against row[" + range.StartRow + ":" + range.EndRow + "] column[" + range.StartColumn + ":" + range.EndColumn + "]"); boolean isInside = true; diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak.java b/qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak.java index bcd47dbc861f..bdecb52e2be1 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java index 8e1f6c044513..e2e47e42a12f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetDocument.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetDocument.java index c3d667deccf8..a534138fb912 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetDocument.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java index a016214d0cdf..979aa7e5d68d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java index 1b3682586778..a377c1c0dd9e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java index 6d68b74919af..a00a1fdfabb2 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java index 19c3eefd721a..7b632532631b 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java index 000239e84117..58c8acd3d9f5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java index 43bd1f3d5adf..69e0e48a9546 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java +++ b/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,15 +33,15 @@ import com.sun.star.container.XIndexAccess; import com.sun.star.sheet.XUniqueCellFormatRangesSupplier; public class _XUniqueCellFormatRangesSupplier extends MultiMethodTest { - + public XUniqueCellFormatRangesSupplier oObj; - + /** * call the method getUniqueCellFormatRanges and returns OK result if * the gained XIndexAccess isn't null and the method checkIndexAccess * returns true. - */ - + */ + public void _getUniqueCellFormatRanges() { boolean res = true; XIndexAccess xIA = oObj.getUniqueCellFormatRanges(); @@ -51,14 +51,14 @@ public class _XUniqueCellFormatRangesSupplier extends MultiMethodTest { log.println("The gained IndexAccess is null"); res = false; } - tRes.tested("getUniqueCellFormatRanges()",res); + tRes.tested("getUniqueCellFormatRanges()",res); } - + /** * calls the method getCount at the IndexAccess, returns true is it is >0 * and getByIndex() doesn't throw an exception for Indexes between 0 and count */ - + protected boolean checkIndexAccess(XIndexAccess xIA) { boolean res = true; int count = xIA.getCount(); @@ -78,6 +78,6 @@ public class _XUniqueCellFormatRangesSupplier extends MultiMethodTest { } return res; } - - + + } diff --git a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java index 6812704fd80f..e592734fbfe8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ public class _XUsedAreaCursor extends MultiMethodTest { result &= (sAddr.StartRow == 1); result &= (sAddr.EndColumn == 4); result &= (sAddr.EndRow == 5); - + // now testing with false parameter oObj.gotoStartOfUsedArea(false); sAddr = oAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewFreezable.java b/qadevOOo/tests/java/ifc/sheet/_XViewFreezable.java index ded696dcd0d1..72e323858fd0 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XViewFreezable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XViewFreezable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewPane.java b/qadevOOo/tests/java/ifc/sheet/_XViewPane.java index 6fa46876022e..5b24f447c4ba 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XViewPane.java +++ b/qadevOOo/tests/java/ifc/sheet/_XViewPane.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java index 5fbdce6c7cb8..dccee2bb78db 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index d6e6977222a4..5235bc2fd676 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ import com.sun.star.xml.AttributeData; import java.util.Enumeration; import java.util.Hashtable; import lib.MultiPropertyTest; - + import util.ValueChanger; import util.utils; @@ -160,7 +160,7 @@ public class _CharacterProperties extends MultiPropertyTest { /** * Custom tester for style name properties. If object relations "STYLENAME1" - * and "STYLENAME2" exists, then testing with these strings, else switches + * and "STYLENAME2" exists, then testing with these strings, else switches * between 'Citation' and 'Emphasis' names. */ protected PropertyTester StyleTester = new PropertyTester() { @@ -311,9 +311,9 @@ public class _CharacterProperties extends MultiPropertyTest { "RubyIsAbove",new Boolean(true)); } } - + /** - * This property only takes values between 0..100 + * This property only takes values between 0..100 * so ist must be treated special */ public void _CharEscapementHeight() { @@ -321,7 +321,7 @@ public class _CharacterProperties extends MultiPropertyTest { Byte max = new Byte((byte)100); testProperty("CharEscapementHeight", aByte, max) ; } - + /** * This property can be void, so if old value is <code> null </code> @@ -434,7 +434,7 @@ public class _CharacterProperties extends MultiPropertyTest { tRes.tested(name, false); } }// end of changeProp - + public void _TextUserDefinedAttributes() { XNameContainer uda = null; boolean res = false; @@ -457,7 +457,7 @@ public class _CharacterProperties extends MultiPropertyTest { String[] els = uda.getElementNames(); oObj.setPropertyValue("TextUserDefinedAttributes", uda); uda = (XNameContainer) AnyConverter.toObject( - new Type(XNameContainer.class), + new Type(XNameContainer.class), oObj.getPropertyValue("TextUserDefinedAttributes")); els = uda.getElementNames(); @@ -488,19 +488,19 @@ public class _CharacterProperties extends MultiPropertyTest { tRes.tested("TextUserDefinedAttributes", res); } - + private class OwnUserDefinedAttributes implements XNameContainer{ Hashtable members = null; - - + + public OwnUserDefinedAttributes() { members = new Hashtable(); } - + public Object getByName(String str) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { return members.get(str); } - + public String[] getElementNames() { Enumeration oEnum = members.keys(); int count = members.size(); @@ -510,34 +510,34 @@ public class _CharacterProperties extends MultiPropertyTest { res[i] = (String)oEnum.nextElement(); return res; } - + public com.sun.star.uno.Type getElementType() { Enumeration oEnum = members.keys(); String key = (String)oEnum.nextElement(); Object o = members.get(key); return new Type(o.getClass()); } - + public boolean hasByName(String str) { return members.get(str) != null; } - + public boolean hasElements() { return members.size() > 0; } - + public void insertByName(String str, Object obj) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.ElementExistException, com.sun.star.lang.WrappedTargetException { members.put(str, obj); } - + public void removeByName(String str) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { members.remove(str); } - + public void replaceByName(String str, Object obj) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { members.put(str, obj); } - + } } //finish class _CharacterProperties diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java index a5709503f602..364cc3ac446f 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java index 0bf69d68e7e9..d7df0fca3b71 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ import lib.MultiPropertyTest; * @see com.sun.star.style.CharacterPropertiesComplex */ public class _CharacterPropertiesComplex extends MultiPropertyTest { - + public void _CharWeightComplex() { testProperty("CharWeightComplex", new Float(com.sun.star.awt.FontWeight.BOLD), new Float(com.sun.star.awt.FontWeight.THIN)) ; @@ -56,14 +56,14 @@ public class _CharacterPropertiesComplex extends MultiPropertyTest { public void _CharPostureComplex() { testProperty("CharPostureComplex", com.sun.star.awt.FontSlant.ITALIC, com.sun.star.awt.FontSlant.NONE) ; - } + } /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } //finish class _CharacterPropertiesComplex diff --git a/qadevOOo/tests/java/ifc/style/_CharacterStyle.java b/qadevOOo/tests/java/ifc/style/_CharacterStyle.java index fb6acc14a42e..2efaeedb391b 100755 --- a/qadevOOo/tests/java/ifc/style/_CharacterStyle.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ package ifc.style; import lib.MultiPropertyTest; - + /** * Testing <code>com.sun.star.style.CharacterStyle</code> diff --git a/qadevOOo/tests/java/ifc/style/_PageProperties.java b/qadevOOo/tests/java/ifc/style/_PageProperties.java index c53f86b4aa41..cca2c9074667 100755 --- a/qadevOOo/tests/java/ifc/style/_PageProperties.java +++ b/qadevOOo/tests/java/ifc/style/_PageProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public class _PageProperties extends MultiPropertyTest { /** * Switch on Header and Footer properties * so all props can be tested. - */ + */ protected void before() { try { oObj.setPropertyValue("HeaderIsOn", Boolean.TRUE); @@ -59,9 +59,9 @@ public class _PageProperties extends MultiPropertyTest { log.println("IllegalArgumentException while setting Property 'HeaderIsOn' or 'FooterIsOn'"); } catch (com.sun.star.beans.PropertyVetoException pve) { log.println("PropertyVetoException while setting Property 'HeaderIsOn' or 'FooterIsOn'"); - } + } } - + /** * This property is system dependent and printer dependent. * So only reading it does make sense, since it cannot be determined, if @@ -73,19 +73,19 @@ public class _PageProperties extends MultiPropertyTest { try { setting = (String)oObj.getPropertyValue("PrinterPaperTray"); log.println("Property 'PrinterPaperTray' is set to '" + setting + "'."); - res = setting != null; + res = setting != null; } catch(com.sun.star.beans.UnknownPropertyException e) { log.println("Don't know the Property 'PrinterPaperTray'"); } catch (com.sun.star.lang.WrappedTargetException wte) { log.println("WrappedTargetException while getting Property 'PrinterPaperTray'"); - } + } tRes.tested("PrinterPaperTray", res); } - + /** * Create some valid user defined attributes - */ + */ public void _UserDefinedAttributes() { XNameContainer uda = null; boolean res = false; @@ -97,8 +97,8 @@ public class _PageProperties extends MultiPropertyTest { attr.Namespace = "http://www.sun.com/staroffice/apitest/Cellprop"; attr.Type="CDATA"; attr.Value="true"; - uda.insertByName("Cellprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.insertByName("Cellprop:has-first-alien-attribute",attr); + String[] els = uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), @@ -118,7 +118,7 @@ public class _PageProperties extends MultiPropertyTest { log.println("PropertyVetoException while getting Property 'UserDefinedAttributes'"); } catch (com.sun.star.container.ElementExistException eee) { log.println("ElementExistException while getting Property 'UserDefinedAttributes'"); - } + } tRes.tested("UserDefinedAttributes",res); } diff --git a/qadevOOo/tests/java/ifc/style/_PageStyle.java b/qadevOOo/tests/java/ifc/style/_PageStyle.java index d8a6e5f7d344..0c29e1591f86 100755 --- a/qadevOOo/tests/java/ifc/style/_PageStyle.java +++ b/qadevOOo/tests/java/ifc/style/_PageStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,11 +31,11 @@ import ifc.style._PageProperties; /** * Test page style properties. - * These properties are a subset of the PageProperties. So just use the + * These properties are a subset of the PageProperties. So just use the * PageProperties test */ public class _PageStyle extends _PageProperties { - + /** * This property is system dependent and printer dependent. * Test is used from _PageProperties @@ -44,13 +44,13 @@ public class _PageStyle extends _PageProperties { public void _PrinterPaperTray() { super._PrinterPaperTray(); } - + /** * Create some valid user defined attributes * Test is used from _PageProperties * @see ifc.style._PageProperties - */ + */ public void _UserDefinedAttributes() { super._UserDefinedAttributes(); - } + } } diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index d412b93531da..64c22912fea1 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import java.util.Hashtable; import lib.MultiPropertyTest; import lib.Status; import share.LogWriter; - + import util.utils; @@ -159,7 +159,7 @@ public class _ParagraphProperties extends MultiPropertyTest { */ protected PropertyTester PageDescTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - if (!util.utils.isVoid(oldValue) && + if (!util.utils.isVoid(oldValue) && (oldValue.equals("Default"))) { return "HTML"; } else { @@ -175,7 +175,7 @@ public class _ParagraphProperties extends MultiPropertyTest { */ protected PropertyTester ShortTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - if ((oldValue != null) && + if ((oldValue != null) && (oldValue.equals(new Short((short) 0)))) { return new Short((short) 2); } else { @@ -191,7 +191,7 @@ public class _ParagraphProperties extends MultiPropertyTest { */ protected PropertyTester BooleanTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - if ((oldValue != null) && + if ((oldValue != null) && (oldValue.equals(new Boolean((boolean) false)))) { return new Boolean((boolean) true); } else { @@ -297,7 +297,7 @@ public class _ParagraphProperties extends MultiPropertyTest { log.println("Testing with custom Property tester"); try { - oObj.setPropertyValue("ParaAdjust", + oObj.setPropertyValue("ParaAdjust", com.sun.star.style.ParagraphAdjust.BLOCK); } catch (com.sun.star.lang.WrappedTargetException e) { log.println("Exception occured setting property 'ParagraphAdjust'" + e); @@ -338,7 +338,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * Tested with custom property tester. <p> */ public void _ParaIsConnectBorder() { - + log.println("Testing with custom Property tester"); testProperty("ParaIsConnectBorder", BooleanTester); } @@ -366,7 +366,7 @@ public class _ParagraphProperties extends MultiPropertyTest { */ public void _NumberingRules() { requiredMethod("NumberingStyleName"); - + XIndexReplace NumberingRules = null; PropertyValue[] propertyValues = null; try { @@ -392,12 +392,12 @@ public class _ParagraphProperties extends MultiPropertyTest { Status.failed( "could not get NumberlingLevel-Array from NumberingRuels: "+ ex.toString() ); return; } - + _NumberingLevel numb = new _NumberingLevel((LogWriter)log, tParam, propertyValues); boolean result = numb.testPropertieArray(); - - tRes.tested("NumberingRules", result); + + tRes.tested("NumberingRules", result); } public void _ParaUserDefinedAttributes() { @@ -422,7 +422,7 @@ public class _ParagraphProperties extends MultiPropertyTest { String[] els = uda.getElementNames(); oObj.setPropertyValue("ParaUserDefinedAttributes", uda); uda = (XNameContainer) AnyConverter.toObject( - new Type(XNameContainer.class), + new Type(XNameContainer.class), oObj.getPropertyValue("ParaUserDefinedAttributes")); els = uda.getElementNames(); @@ -453,19 +453,19 @@ public class _ParagraphProperties extends MultiPropertyTest { tRes.tested("ParaUserDefinedAttributes", res); } - + private class OwnUserDefinedAttributes implements XNameContainer{ Hashtable members = null; - - + + public OwnUserDefinedAttributes() { members = new Hashtable(); } - + public Object getByName(String str) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { return members.get(str); } - + public String[] getElementNames() { Enumeration oEnum = members.keys(); int count = members.size(); @@ -475,33 +475,33 @@ public class _ParagraphProperties extends MultiPropertyTest { res[i] = (String)oEnum.nextElement(); return res; } - + public com.sun.star.uno.Type getElementType() { Enumeration oEnum = members.keys(); String key = (String)oEnum.nextElement(); Object o = members.get(key); return new Type(o.getClass()); } - + public boolean hasByName(String str) { return members.get(str) != null; } - + public boolean hasElements() { return members.size() > 0; } - + public void insertByName(String str, Object obj) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.ElementExistException, com.sun.star.lang.WrappedTargetException { members.put(str, obj); } - + public void removeByName(String str) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { members.remove(str); } - + public void replaceByName(String str, Object obj) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { members.put(str, obj); } - + } } // finish class _ParagraphProperties diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java index 6c3730d3bb5c..d5aa514f3631 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public class _ParagraphPropertiesAsian extends MultiPropertyTest { */ protected PropertyTester BooleanTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - if ((oldValue != null) && + if ((oldValue != null) && (oldValue.equals(new Boolean((boolean) false)))) { return new Boolean((boolean) true); } else { diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java index 932bec5b3ead..a0c061271684 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,19 +37,19 @@ import lib.MultiPropertyTest; */ public class _ParagraphPropertiesComplex extends MultiPropertyTest { - + protected PropertyTester WritingModeTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB)))) return new Short(com.sun.star.text.WritingMode2.PAGE); else return new Short(com.sun.star.text.WritingMode2.LR_TB); } - } ; - + } ; + public void _WritingMode() { log.println("Testing with custom Property tester") ; testProperty("WritingMode", WritingModeTester) ; - } + } } // finish class _ParagraphPropertiesComplex diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphStyle.java b/qadevOOo/tests/java/ifc/style/_ParagraphStyle.java index 8dcdb56dc988..73fac8699bdf 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphStyle.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,5 +32,5 @@ import lib.MultiPropertyTest; /** */ public class _ParagraphStyle extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/style/_Style.java b/qadevOOo/tests/java/ifc/style/_Style.java index 16dbf570c301..4174ecaeaf1e 100644 --- a/qadevOOo/tests/java/ifc/style/_Style.java +++ b/qadevOOo/tests/java/ifc/style/_Style.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public class _Style extends MultiPropertyTest { if (style == null) style = "Heading 1"; testProperty("FollowStyle", style, "Heading 2"); } - + } // finish class _Style diff --git a/qadevOOo/tests/java/ifc/style/_XStyle.java b/qadevOOo/tests/java/ifc/style/_XStyle.java index bf0bb6bea2c8..5f6a5e38b0e4 100644 --- a/qadevOOo/tests/java/ifc/style/_XStyle.java +++ b/qadevOOo/tests/java/ifc/style/_XStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/style/_XStyleFamiliesSupplier.java b/qadevOOo/tests/java/ifc/style/_XStyleFamiliesSupplier.java index 037f4eab829b..dda7b109da3c 100644 --- a/qadevOOo/tests/java/ifc/style/_XStyleFamiliesSupplier.java +++ b/qadevOOo/tests/java/ifc/style/_XStyleFamiliesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/system/_XProxySettings.java b/qadevOOo/tests/java/ifc/system/_XProxySettings.java index 864349d194cd..7dd8ebb53ca9 100644 --- a/qadevOOo/tests/java/ifc/system/_XProxySettings.java +++ b/qadevOOo/tests/java/ifc/system/_XProxySettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java index edf1061408b3..56a15ec2d963 100644 --- a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java +++ b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java index 3ced5eb9c52f..ace839c0f5d3 100644 --- a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java +++ b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_CellProperties.java b/qadevOOo/tests/java/ifc/table/_CellProperties.java index 99990e5b0339..fb50ba9eaac9 100644 --- a/qadevOOo/tests/java/ifc/table/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/table/_CellProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ import com.sun.star.xml.AttributeData; * @see com.sun.star.table.CellProperties */ public class _CellProperties extends MultiPropertyTest { - + /** * This property is tested with custom property tester which @@ -69,7 +69,7 @@ public class _CellProperties extends MultiPropertyTest { } }) ; } - + public void _UserDefinedAttributes() { XNameContainer uda = null; boolean res = false; @@ -81,8 +81,8 @@ public class _CellProperties extends MultiPropertyTest { attr.Namespace = "http://www.sun.com/staroffice/apitest/Cellprop"; attr.Type="CDATA"; attr.Value="true"; - uda.insertByName("Cellprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.insertByName("Cellprop:has-first-alien-attribute",attr); + String[] els = uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), @@ -102,7 +102,7 @@ public class _CellProperties extends MultiPropertyTest { log.println("PropertyVetoException while getting Property 'UserDefinedAttributes'"); } catch (com.sun.star.container.ElementExistException eee) { log.println("ElementExistException while getting Property 'UserDefinedAttributes'"); - } + } tRes.tested("UserDefinedAttributes",res); } diff --git a/qadevOOo/tests/java/ifc/table/_TableColumn.java b/qadevOOo/tests/java/ifc/table/_TableColumn.java index edb2606b87a4..417365414a2e 100644 --- a/qadevOOo/tests/java/ifc/table/_TableColumn.java +++ b/qadevOOo/tests/java/ifc/table/_TableColumn.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_TableRow.java b/qadevOOo/tests/java/ifc/table/_TableRow.java index e5021f22dc55..f06fa6b80bac 100644 --- a/qadevOOo/tests/java/ifc/table/_TableRow.java +++ b/qadevOOo/tests/java/ifc/table/_TableRow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java index 4843d25f93fc..edb2ccab1ceb 100644 --- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java +++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,12 +75,12 @@ public class _XAutoFormattable extends MultiMethodTest { XCell oCell = cellRange.getCellByPosition(0, 0); XPropertySet PS = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oCell); - + Integer bkgrnd1; try { bkgrnd1 = (Integer) PS.getPropertyValue("CellBackColor"); } catch (com.sun.star.beans.UnknownPropertyException e) { - bkgrnd1 = (Integer) PS.getPropertyValue("BackColor"); + bkgrnd1 = (Integer) PS.getPropertyValue("BackColor"); } // getting formats names. @@ -112,8 +112,8 @@ public class _XAutoFormattable extends MultiMethodTest { try { bkgrnd2 = (Integer) PS.getPropertyValue("CellBackColor"); } catch (com.sun.star.beans.UnknownPropertyException e) { - bkgrnd2 = (Integer) PS.getPropertyValue("BackColor"); - } + bkgrnd2 = (Integer) PS.getPropertyValue("BackColor"); + } bResult &= !bkgrnd1.equals(bkgrnd2); } catch (com.sun.star.uno.Exception e) { @@ -124,11 +124,11 @@ public class _XAutoFormattable extends MultiMethodTest { tRes.tested("autoFormat()", bResult); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/table/_XCell.java b/qadevOOo/tests/java/ifc/table/_XCell.java index 0e29e2cbc644..2860ac3ac307 100644 --- a/qadevOOo/tests/java/ifc/table/_XCell.java +++ b/qadevOOo/tests/java/ifc/table/_XCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java b/qadevOOo/tests/java/ifc/table/_XCellCursor.java index 9f3aea9b4354..aeb52faa6aec 100644 --- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java +++ b/qadevOOo/tests/java/ifc/table/_XCellCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XCellRange.java b/qadevOOo/tests/java/ifc/table/_XCellRange.java index cb35b2137e6d..53c0a061741d 100644 --- a/qadevOOo/tests/java/ifc/table/_XCellRange.java +++ b/qadevOOo/tests/java/ifc/table/_XCellRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,13 +139,13 @@ public class _XCellRange extends MultiMethodTest { } // end getCellRangeByPosition() - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } // finish class _XCellRange diff --git a/qadevOOo/tests/java/ifc/table/_XColumnRowRange.java b/qadevOOo/tests/java/ifc/table/_XColumnRowRange.java index f56899891353..14aa660a5d39 100644 --- a/qadevOOo/tests/java/ifc/table/_XColumnRowRange.java +++ b/qadevOOo/tests/java/ifc/table/_XColumnRowRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XTableChart.java b/qadevOOo/tests/java/ifc/table/_XTableChart.java index 230c0f5b0949..5bd42039a3d8 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableChart.java +++ b/qadevOOo/tests/java/ifc/table/_XTableChart.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XTableCharts.java b/qadevOOo/tests/java/ifc/table/_XTableCharts.java index 737a120f91a8..9df026ddb7d2 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableCharts.java +++ b/qadevOOo/tests/java/ifc/table/_XTableCharts.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java b/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java index ba0308da29f2..19d310da232e 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java +++ b/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/table/_XTableColumns.java b/qadevOOo/tests/java/ifc/table/_XTableColumns.java index d46ae6dae70e..cf3c36baba8f 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableColumns.java +++ b/qadevOOo/tests/java/ifc/table/_XTableColumns.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -180,8 +180,8 @@ public class _XTableColumns extends MultiMethodTest { log.println("Inserting column at Index " + cnt + " ... OK"); result &= true; } - - if (tEnv.getTestCase().getObjectName().equals("ScTableColumnsObj")) { + + if (tEnv.getTestCase().getObjectName().equals("ScTableColumnsObj")) { try { oObj.insertByIndex(0,0); @@ -191,7 +191,7 @@ public class _XTableColumns extends MultiMethodTest { log.println("Inserting 0 columns ... OK"); result &= true; } - + } tRes.tested( "insertByIndex()", result ); diff --git a/qadevOOo/tests/java/ifc/table/_XTableRows.java b/qadevOOo/tests/java/ifc/table/_XTableRows.java index 71cd35ab5de9..ce12e3760ada 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableRows.java +++ b/qadevOOo/tests/java/ifc/table/_XTableRows.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public class _XTableRows extends MultiMethodTest { public XTableRows oObj = null; public XCellRange range = null; - + public void before() { range = (XCellRange) tEnv.getObjRelation("XTableRows.XCellRange"); if (range==null) { @@ -68,14 +68,14 @@ public class _XTableRows extends MultiMethodTest { public void _insertByIndex() { boolean result = true; - + requiredMethod("removeByIndex()"); int origCnt = oObj.getCount(); log.println("Inserting row before first row"); oObj.insertByIndex(0,1); result &= checkCell(1,15); - if (checkCell(1,15)) log.println("... successful"); + if (checkCell(1,15)) log.println("... successful"); try { oObj.insertByIndex(-1,1); @@ -98,12 +98,12 @@ public class _XTableRows extends MultiMethodTest { */ public void _removeByIndex() { - boolean result = true; + boolean result = true; oObj.removeByIndex(0,1); log.println("Removing first row"); result &= checkCell(0,15); - if (checkCell(0,15)) log.println("... successful"); + if (checkCell(0,15)) log.println("... successful"); try { oObj.removeByIndex(-1,1); @@ -116,15 +116,15 @@ public class _XTableRows extends MultiMethodTest { tRes.tested( "removeByIndex()", result ); } // end removeByIndex() - + public boolean checkCell(int row,double expected) { double getting=0; try { getting = range.getCellByPosition(0,row).getValue(); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't set value for Cell A1"); - } - + } + boolean res = (getting==expected); if (!res) { log.println("Expected for row "+row+" was "+expected); diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java index 3aed88c8994a..b6cd29840d43 100644 --- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java +++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/task/_XJob.java b/qadevOOo/tests/java/ifc/task/_XJob.java index e4cc567b5b4f..bfeaf5fe0154 100644 --- a/qadevOOo/tests/java/ifc/task/_XJob.java +++ b/qadevOOo/tests/java/ifc/task/_XJob.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ public class _XJob extends MultiMethodTest { public static XJob oObj = null; /** - * Tries to query the tested component for object relation - * <code>XJobArgs</code> [<code>Object[]</code>] which contains + * Tries to query the tested component for object relation + * <code>XJobArgs</code> [<code>Object[]</code>] which contains * <code>executeArgs</code> [<code>NamedValue[]</code>] * @throw StatusException If relations are not found */ @@ -68,7 +68,7 @@ public class _XJob extends MultiMethodTest { ("'XJobArgs' relation not found ")) ; } - + /** * Gets the number of Job calls before and after triggering event. diff --git a/qadevOOo/tests/java/ifc/task/_XJobExecutor.java b/qadevOOo/tests/java/ifc/task/_XJobExecutor.java index 55aaf43c3c68..03ab82016e20 100644 --- a/qadevOOo/tests/java/ifc/task/_XJobExecutor.java +++ b/qadevOOo/tests/java/ifc/task/_XJobExecutor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/task/_XStatusIndicatorFactory.java b/qadevOOo/tests/java/ifc/task/_XStatusIndicatorFactory.java index 3660d5c53acd..6f762f96dbee 100644 --- a/qadevOOo/tests/java/ifc/task/_XStatusIndicatorFactory.java +++ b/qadevOOo/tests/java/ifc/task/_XStatusIndicatorFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrame.java b/qadevOOo/tests/java/ifc/text/_BaseFrame.java index 258a57ef84ca..b676ba7a29e6 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseFrame.java +++ b/qadevOOo/tests/java/ifc/text/_BaseFrame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java index be4c027b014d..749f7f37147c 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java +++ b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_BaseIndex.java b/qadevOOo/tests/java/ifc/text/_BaseIndex.java index fb19f6d97888..8054893585ba 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseIndex.java +++ b/qadevOOo/tests/java/ifc/text/_BaseIndex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ public class _BaseIndex extends MultiPropertyTest { public void _LevelFormat() { log.println( "Testing property 'LevelFormat' with custom property tester"); - testProperty("LevelFormat", + testProperty("LevelFormat", new PropertyTester() { PropertyValue[][] newVal = null; PropertyValue[][] oldVal = null; @@ -147,18 +147,18 @@ public class _BaseIndex extends MultiPropertyTest { return indProp; } - protected void checkResult(String propName, Object oldValue, - Object newValue, Object resValue, + protected void checkResult(String propName, Object oldValue, + Object newValue, Object resValue, Exception exception) throws Exception { PropertyValue[][] res = (PropertyValue[][]) ((XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, resValue)).getByIndex(0); log.println("Result:"); printLevelFormatProperty(resValue); - boolean result = (res.length != oldVal.length) || + boolean result = (res.length != oldVal.length) || !util.ValueComparer.equalValue(res, oldVal); tRes.tested(propName, result); @@ -176,7 +176,7 @@ public class _BaseIndex extends MultiPropertyTest { PropertyValue[][] val = null; try { - log.println(" \u0421ollection has " + indProp.getCount() + + log.println(" \u0421ollection has " + indProp.getCount() + " elements : "); for (int i = 0; i < indProp.getCount(); i++) { @@ -188,7 +188,7 @@ public class _BaseIndex extends MultiPropertyTest { log.println(" " + j + " level :"); for (int k = 0; k < val[j].length; k++) { - log.println(" " + val[j][k].Name + "=" + + log.println(" " + val[j][k].Name + "=" + val[j][k].Value); } } diff --git a/qadevOOo/tests/java/ifc/text/_BaseIndexMark.java b/qadevOOo/tests/java/ifc/text/_BaseIndexMark.java index 4ac67721b601..fdebf10f5aff 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseIndexMark.java +++ b/qadevOOo/tests/java/ifc/text/_BaseIndexMark.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_CellProperties.java b/qadevOOo/tests/java/ifc/text/_CellProperties.java index e13a2da7d38e..525173019e3e 100644 --- a/qadevOOo/tests/java/ifc/text/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/text/_CellProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ public class _CellProperties extends MultiPropertyTest { protected Object getNewValue(String propName, Object oldValue) { XNameContainer NC = null; try { - NC = (XNameContainer) + NC = (XNameContainer) AnyConverter.toObject(new Type(XNameContainer.class),oldValue); NC.insertByName("MyAttribute", new AttributeData("","CDATA","Value")); diff --git a/qadevOOo/tests/java/ifc/text/_CellRange.java b/qadevOOo/tests/java/ifc/text/_CellRange.java index adcb2a5baf0e..a0fa2fc8c6de 100644 --- a/qadevOOo/tests/java/ifc/text/_CellRange.java +++ b/qadevOOo/tests/java/ifc/text/_CellRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_Defaults.java b/qadevOOo/tests/java/ifc/text/_Defaults.java index 9950ad67797e..3e5375b5142a 100644 --- a/qadevOOo/tests/java/ifc/text/_Defaults.java +++ b/qadevOOo/tests/java/ifc/text/_Defaults.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_DocumentIndex.java b/qadevOOo/tests/java/ifc/text/_DocumentIndex.java index e22f56b11964..985c340ab674 100644 --- a/qadevOOo/tests/java/ifc/text/_DocumentIndex.java +++ b/qadevOOo/tests/java/ifc/text/_DocumentIndex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_DocumentIndexMark.java b/qadevOOo/tests/java/ifc/text/_DocumentIndexMark.java index b44ca5bd775c..d0b878d7d84b 100644 --- a/qadevOOo/tests/java/ifc/text/_DocumentIndexMark.java +++ b/qadevOOo/tests/java/ifc/text/_DocumentIndexMark.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_DocumentSettings.java b/qadevOOo/tests/java/ifc/text/_DocumentSettings.java index 699fe5195672..76c20431dac8 100644 --- a/qadevOOo/tests/java/ifc/text/_DocumentSettings.java +++ b/qadevOOo/tests/java/ifc/text/_DocumentSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,5 +31,5 @@ import lib.MultiPropertyTest; public class _DocumentSettings extends MultiPropertyTest { - + } diff --git a/qadevOOo/tests/java/ifc/text/_Footnote.java b/qadevOOo/tests/java/ifc/text/_Footnote.java index dd93a3d8f40b..de555015bc38 100644 --- a/qadevOOo/tests/java/ifc/text/_Footnote.java +++ b/qadevOOo/tests/java/ifc/text/_Footnote.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java b/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java index 5795575b6f9a..9c911d171520 100644 --- a/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java +++ b/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_GenericTextDocument.java b/qadevOOo/tests/java/ifc/text/_GenericTextDocument.java index feb148e1b5a5..7a06b7dd3180 100644 --- a/qadevOOo/tests/java/ifc/text/_GenericTextDocument.java +++ b/qadevOOo/tests/java/ifc/text/_GenericTextDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_LineNumberingProperties.java b/qadevOOo/tests/java/ifc/text/_LineNumberingProperties.java index 1c1c7d79dfef..57b1e21a23d3 100644 --- a/qadevOOo/tests/java/ifc/text/_LineNumberingProperties.java +++ b/qadevOOo/tests/java/ifc/text/_LineNumberingProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java index f16eaefd12db..66b01a04189c 100644 --- a/qadevOOo/tests/java/ifc/text/_MailMerge.java +++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class _MailMerge extends MultiPropertyTest { log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); - + log.println("get the new value..."); XResultSet getValue = (XResultSet) UnoRuntime.queryInterface(XResultSet.class,oObj.getPropertyValue(propName)); @@ -91,7 +91,7 @@ public class _MailMerge extends MultiPropertyTest { log.println("Property '" + propName + "' is optional and not supported"); tRes.tested(propName,true); - + } else { log.println("could not get property '"+ propName +"' from XPropertySet!"); tRes.tested(propName, false); @@ -118,7 +118,7 @@ public class _MailMerge extends MultiPropertyTest { log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); - + log.println("get the new value..."); XConnection getValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); @@ -135,7 +135,7 @@ public class _MailMerge extends MultiPropertyTest { log.println("Property '" + propName + "' is optional and not supported"); tRes.tested(propName,true); - + } else { log.println("could not get property '"+ propName +"' from XPropertySet!"); tRes.tested(propName, false); @@ -145,7 +145,7 @@ public class _MailMerge extends MultiPropertyTest { tRes.tested(propName, false); } } - + /** * Tested with custom property tester. */ diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java index c4255065dfa1..ff7b6b06b8a5 100644 --- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java +++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import share.LogWriter; /** * Testing <code>com.sun.star.text.NumberingLevel</code><p> -* This service is currently konwn as property value of +* This service is currently konwn as property value of * com.sun.star.text.ParagraphProperties.NumberingRules * This test checks only for completnes of implemented properties. * service properties : @@ -70,13 +70,13 @@ import share.LogWriter; * @see ifc.text._ParagraphProperties */ public class _NumberingLevel { - + private static TestParameters tParam = null; private static Hashtable NumberingLevel = new Hashtable(); private static PropertyValue[] PropertyArray = null; private static LogWriter log = null; - - + + /** * returns an instance of _NumberingLevel * @param log the log writer @@ -84,12 +84,12 @@ public class _NumberingLevel { * @param propertyValues a PropertyValue[] which should contain all properties of com.sun.star.text.NumberingLevel */ public _NumberingLevel(LogWriter log, TestParameters tParam, PropertyValue[] propertyValues){ - + this.tParam = tParam; this.PropertyArray = propertyValues; - + this.log = log; - + //key = PropertyName, value = Ooptional NumberingLevel.put("Adjust", new Boolean(false)); NumberingLevel.put("ParentNumbering", new Boolean(true)); @@ -112,23 +112,23 @@ public class _NumberingLevel { NumberingLevel.put("HeadingStyleName", new Boolean(false)); NumberingLevel.put("BulletColor", new Boolean(true)); NumberingLevel.put("BulletRelSize", new Boolean(true)); - + } - + /** - * This methods checks the PropertyValue for completnes. If one or more properties + * This methods checks the PropertyValue for completnes. If one or more properties * are missing the return value is FALSE, else TRUE * @return returns TRUE if PropertyValue[] is complete, else FALSE */ public boolean testPropertieArray(){ - + boolean status = true; try{ - + // iterate over the given property array and remove it from the must list for (int i = 0; i < PropertyArray.length; i++){ String propertyName=PropertyArray[i].Name; - + if ( NumberingLevel.containsKey(propertyName) ) { NumberingLevel.remove(propertyName); } else { @@ -141,17 +141,17 @@ public class _NumberingLevel { status = false; log.println("-> '" + propertyName + "'"); } - + } - + // get rest of properties and check if they are optional if (! NumberingLevel.isEmpty()){ for (Enumeration e = NumberingLevel.keys() ; e.hasMoreElements() ;) { String property = (String) e.nextElement(); - + // if some elements are not optional -> failed if ( ! ((Boolean)NumberingLevel.get(property)).booleanValue() ){ - + if ( status ) { log.println("FAILED: com.sun.star.text.NumberingLevel -> " + "could not find not optional property:"); @@ -166,9 +166,9 @@ public class _NumberingLevel { }catch( Exception e ){ throw new StatusException("ERROR: could not test all properties of com.sun.star.text.NumberingLevel",e); } - + return status; } - - + + } // finish class _NumberingLevel diff --git a/qadevOOo/tests/java/ifc/text/_NumberingRules.java b/qadevOOo/tests/java/ifc/text/_NumberingRules.java index 7b053921eefc..0ae5832bfcd6 100644 --- a/qadevOOo/tests/java/ifc/text/_NumberingRules.java +++ b/qadevOOo/tests/java/ifc/text/_NumberingRules.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java b/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java index 38d512536d36..2cf890d5756a 100644 --- a/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java +++ b/qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,6 +30,6 @@ package ifc.text; import lib.MultiPropertyTest; public class _PrintPreviewSettings extends MultiPropertyTest -{ - +{ + } diff --git a/qadevOOo/tests/java/ifc/text/_PrintSettings.java b/qadevOOo/tests/java/ifc/text/_PrintSettings.java index 301d0e5ed179..d87a617ebce0 100644 --- a/qadevOOo/tests/java/ifc/text/_PrintSettings.java +++ b/qadevOOo/tests/java/ifc/text/_PrintSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_Text.java b/qadevOOo/tests/java/ifc/text/_Text.java index eade97485e4a..0b0c289a2286 100644 --- a/qadevOOo/tests/java/ifc/text/_Text.java +++ b/qadevOOo/tests/java/ifc/text/_Text.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextColumns.java b/qadevOOo/tests/java/ifc/text/_TextColumns.java index 4c0c09df5249..6ccb1a17b1a2 100644 --- a/qadevOOo/tests/java/ifc/text/_TextColumns.java +++ b/qadevOOo/tests/java/ifc/text/_TextColumns.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextContent.java b/qadevOOo/tests/java/ifc/text/_TextContent.java index af4ec84f10b8..93bc22476c38 100644 --- a/qadevOOo/tests/java/ifc/text/_TextContent.java +++ b/qadevOOo/tests/java/ifc/text/_TextContent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextDocument.java b/qadevOOo/tests/java/ifc/text/_TextDocument.java index 89535fdc4995..ad8b1cdfc213 100644 --- a/qadevOOo/tests/java/ifc/text/_TextDocument.java +++ b/qadevOOo/tests/java/ifc/text/_TextDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextEmbeddedObject.java b/qadevOOo/tests/java/ifc/text/_TextEmbeddedObject.java index 0d1323507c56..fa8d3b9dc9db 100644 --- a/qadevOOo/tests/java/ifc/text/_TextEmbeddedObject.java +++ b/qadevOOo/tests/java/ifc/text/_TextEmbeddedObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,10 +56,10 @@ public class _TextEmbeddedObject extends MultiPropertyTest { "According to the idl-description this property can't be set as soon as the Object is inserted in the document, so setting will be skipped"); result=true; } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception while getting Property 'CLSID' " + + log.println("Exception while getting Property 'CLSID' " + e.getMessage()); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception while getting Property 'CLSID' " + + log.println("Exception while getting Property 'CLSID' " + e.getMessage()); } diff --git a/qadevOOo/tests/java/ifc/text/_TextFieldMaster.java b/qadevOOo/tests/java/ifc/text/_TextFieldMaster.java index a37359621f6d..23561bf7d2ca 100644 --- a/qadevOOo/tests/java/ifc/text/_TextFieldMaster.java +++ b/qadevOOo/tests/java/ifc/text/_TextFieldMaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextFrame.java b/qadevOOo/tests/java/ifc/text/_TextFrame.java index fc8240a98acc..6e4b176fce77 100644 --- a/qadevOOo/tests/java/ifc/text/_TextFrame.java +++ b/qadevOOo/tests/java/ifc/text/_TextFrame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java index c73fd3c4a643..43f2b2edc2c9 100644 --- a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java +++ b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,7 +113,7 @@ public class _TextGraphicObject extends MultiPropertyTest { try { XIndexContainer imgMap = (XIndexContainer) UnoRuntime.queryInterface( - XIndexContainer.class, + XIndexContainer.class, oObj.getPropertyValue("ImageMap")); int previous = imgMap.getCount(); log.println("Count (previous) " + previous); @@ -122,7 +122,7 @@ public class _TextGraphicObject extends MultiPropertyTest { imgMap.insertByIndex(0, im); oObj.setPropertyValue("ImageMap", imgMap); imgMap = (XIndexContainer) UnoRuntime.queryInterface( - XIndexContainer.class, + XIndexContainer.class, oObj.getPropertyValue("ImageMap")); int after = imgMap.getCount(); diff --git a/qadevOOo/tests/java/ifc/text/_TextPortion.java b/qadevOOo/tests/java/ifc/text/_TextPortion.java index 828609c158a2..d229de57294a 100644 --- a/qadevOOo/tests/java/ifc/text/_TextPortion.java +++ b/qadevOOo/tests/java/ifc/text/_TextPortion.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextSection.java b/qadevOOo/tests/java/ifc/text/_TextSection.java index 10c5aef9ca54..f706e55b823e 100644 --- a/qadevOOo/tests/java/ifc/text/_TextSection.java +++ b/qadevOOo/tests/java/ifc/text/_TextSection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_TextTable.java b/qadevOOo/tests/java/ifc/text/_TextTable.java index af99d25c6fbd..675ca24e617f 100644 --- a/qadevOOo/tests/java/ifc/text/_TextTable.java +++ b/qadevOOo/tests/java/ifc/text/_TextTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,13 +106,13 @@ public class _TextTable extends MultiPropertyTest { testProperty("RelativeWidth"); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } + } } // finish class _TextTable diff --git a/qadevOOo/tests/java/ifc/text/_TextTableRow.java b/qadevOOo/tests/java/ifc/text/_TextTableRow.java index 0da5ba823453..79f5ae3f0d63 100644 --- a/qadevOOo/tests/java/ifc/text/_TextTableRow.java +++ b/qadevOOo/tests/java/ifc/text/_TextTableRow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_ViewSettings.java b/qadevOOo/tests/java/ifc/text/_ViewSettings.java index dbb721832742..ced902f007da 100644 --- a/qadevOOo/tests/java/ifc/text/_ViewSettings.java +++ b/qadevOOo/tests/java/ifc/text/_ViewSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextContainer.java b/qadevOOo/tests/java/ifc/text/_XAutoTextContainer.java index 5d1ff15a5c4a..01ea59ba5aa1 100644 --- a/qadevOOo/tests/java/ifc/text/_XAutoTextContainer.java +++ b/qadevOOo/tests/java/ifc/text/_XAutoTextContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextEntry.java b/qadevOOo/tests/java/ifc/text/_XAutoTextEntry.java index 379c80e507d1..7526fad9fb06 100644 --- a/qadevOOo/tests/java/ifc/text/_XAutoTextEntry.java +++ b/qadevOOo/tests/java/ifc/text/_XAutoTextEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java index f5b465012f70..cc260f2092cf 100644 --- a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java +++ b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XBookmarksSupplier.java b/qadevOOo/tests/java/ifc/text/_XBookmarksSupplier.java index 11e7f7940e6d..4deca55537b5 100644 --- a/qadevOOo/tests/java/ifc/text/_XBookmarksSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XBookmarksSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XChapterNumberingSupplier.java b/qadevOOo/tests/java/ifc/text/_XChapterNumberingSupplier.java index 0c582f849fc6..c2c33ed440d9 100644 --- a/qadevOOo/tests/java/ifc/text/_XChapterNumberingSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XChapterNumberingSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java b/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java index f8ffc74e9abc..ae120dd8c889 100644 --- a/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java +++ b/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java b/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java index 704750511e56..ffb3a1dd46a1 100644 --- a/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java +++ b/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XDocumentIndexesSupplier.java b/qadevOOo/tests/java/ifc/text/_XDocumentIndexesSupplier.java index d1198c87c3e0..5284613c3faf 100644 --- a/qadevOOo/tests/java/ifc/text/_XDocumentIndexesSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XDocumentIndexesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XEndnotesSupplier.java b/qadevOOo/tests/java/ifc/text/_XEndnotesSupplier.java index a892a54b2cfb..aa93f31f6c82 100644 --- a/qadevOOo/tests/java/ifc/text/_XEndnotesSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XEndnotesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java index 00dca02a62f2..d76dad39529f 100644 --- a/qadevOOo/tests/java/ifc/text/_XFootnote.java +++ b/qadevOOo/tests/java/ifc/text/_XFootnote.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier.java b/qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier.java index 117209de4ded..b0100d541cb9 100644 --- a/qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XFootnotesSupplier.java b/qadevOOo/tests/java/ifc/text/_XFootnotesSupplier.java index 3263e2b78cfe..68f0b023a581 100644 --- a/qadevOOo/tests/java/ifc/text/_XFootnotesSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XFootnotesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XLineNumberingProperties.java b/qadevOOo/tests/java/ifc/text/_XLineNumberingProperties.java index 0f743cc44396..bd69345c015d 100644 --- a/qadevOOo/tests/java/ifc/text/_XLineNumberingProperties.java +++ b/qadevOOo/tests/java/ifc/text/_XLineNumberingProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java b/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java index 54ed72cb3c15..14dd6f17589f 100644 --- a/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java index 07908c2ed628..6c761217a4cd 100644 --- a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public class _XMailMergeBroadcaster extends MultiMethodTest { protected XMailMergeListener listener = new MyMailMergeEventListener(); /** - * Tries to query the tested component for object relation + * Tries to query the tested component for object relation * <code>executeArgs</code> [<code>NamedValue</code>] and <code>Job</code> * [<code>XJob</code>] * @throw StatusException If relations are not found @@ -95,12 +95,12 @@ public class _XMailMergeBroadcaster extends MultiMethodTest { */ public void _addMailMergeEventListener() { log.println("Testing addMailMergeEventListener ..."); - + oObj.addMailMergeEventListener( listener ); - + NamedValue[] executeArgs = (NamedValue[]) tEnv.getObjRelation("executeArgs"); XJob Job = (XJob) tEnv.getObjRelation("Job"); - + try { Job.execute(executeArgs); } catch ( com.sun.star.lang.IllegalArgumentException e) { @@ -110,7 +110,7 @@ public class _XMailMergeBroadcaster extends MultiMethodTest { throw new StatusException(Status.failed ("'could not fire event: " + e)) ; } - + shortWait(); tRes.tested("addMailMergeEventListener()", changed); @@ -124,12 +124,12 @@ public class _XMailMergeBroadcaster extends MultiMethodTest { log.println("Testing removeMailMergeEventListener ..."); requiredMethod("addMailMergeEventListener()"); changed = false; - + oObj.removeMailMergeEventListener( listener ); - + NamedValue[] executeArgs = (NamedValue[]) tEnv.getObjRelation("executeArgs"); XJob Job = (XJob) tEnv.getObjRelation("Job"); - + try { Job.execute(executeArgs); } catch ( com.sun.star.lang.IllegalArgumentException e) { diff --git a/qadevOOo/tests/java/ifc/text/_XPageCursor.java b/qadevOOo/tests/java/ifc/text/_XPageCursor.java index ff45e2b2fc45..a2dafb6a8ebd 100644 --- a/qadevOOo/tests/java/ifc/text/_XPageCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XPageCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java index 32868a4c5db1..fcd2c768f1e3 100644 --- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java +++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ public class _XPagePrintable extends MultiMethodTest { try { XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); - + String printFile = utils.getOfficeTemp(xMSF) + "XPagePrintable.prt"; log.println("Printing to : "+ printFile); @@ -133,21 +133,21 @@ public class _XPagePrintable extends MultiMethodTest { firstProp.Value = printFile; firstProp.State = com.sun.star.beans.PropertyState.DEFAULT_VALUE; PrintOptions[0] = firstProp; - + if (! util.utils.deleteFile(xMSF, printFile)){ log.println("ERROR: could not remove '" + printFile + "'"); res = false; } - + oObj.printPages(PrintOptions); - + util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT)); - + if (! util.utils.fileExists(xMSF, printFile)){ log.println("ERROR: could not find '" + printFile + "'"); res = false; } - + } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("Exception while checking 'printPages'"); res = false; diff --git a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java index 1ac572fa5097..5ec5a139a59b 100644 --- a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XReferenceMarksSupplier.java b/qadevOOo/tests/java/ifc/text/_XReferenceMarksSupplier.java index 9791b127cf1f..3718d8aa7637 100644 --- a/qadevOOo/tests/java/ifc/text/_XReferenceMarksSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XReferenceMarksSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java b/qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java index 76d94a618a69..5de2391035ff 100644 --- a/qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java +++ b/qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XSentenceCursor.java b/qadevOOo/tests/java/ifc/text/_XSentenceCursor.java index 95e3a852837e..359b13dd0641 100644 --- a/qadevOOo/tests/java/ifc/text/_XSentenceCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XSentenceCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XSimpleText.java b/qadevOOo/tests/java/ifc/text/_XSimpleText.java index 553aa7bbff96..ebe61831d474 100644 --- a/qadevOOo/tests/java/ifc/text/_XSimpleText.java +++ b/qadevOOo/tests/java/ifc/text/_XSimpleText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XText.java b/qadevOOo/tests/java/ifc/text/_XText.java index 41d3f6a91db6..e436ce3b2be9 100644 --- a/qadevOOo/tests/java/ifc/text/_XText.java +++ b/qadevOOo/tests/java/ifc/text/_XText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextColumns.java b/qadevOOo/tests/java/ifc/text/_XTextColumns.java index bc9bc59c814b..64222bb1444d 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextColumns.java +++ b/qadevOOo/tests/java/ifc/text/_XTextColumns.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextContent.java b/qadevOOo/tests/java/ifc/text/_XTextContent.java index 52ca11ab9f8d..d93c95c1fa24 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextContent.java +++ b/qadevOOo/tests/java/ifc/text/_XTextContent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,14 +79,14 @@ public class _XTextContent extends MultiMethodTest { * @see #_getAnchor() */ public void _attach() { - requiredMethod("getAnchor()"); + requiredMethod("getAnchor()"); try { - XTextContent aContent = (XTextContent) tEnv.getObjRelation("CONTENT"); + XTextContent aContent = (XTextContent) tEnv.getObjRelation("CONTENT"); XTextRange aRange = (XTextRange) tEnv.getObjRelation("RANGE"); - if ( aContent !=null) { + if ( aContent !=null) { aContent.attach(aRange); - } else { + } else { oObj.attach(aRange); } tRes.tested("attach()", true ) ; @@ -100,7 +100,7 @@ public class _XTextContent extends MultiMethodTest { } else { ex.printStackTrace(log); tRes.tested("attach()",false); - } + } } catch (com.sun.star.uno.RuntimeException re) { String noAttach = (String) tEnv.getObjRelation("NoAttach"); if (noAttach != null) { @@ -110,7 +110,7 @@ public class _XTextContent extends MultiMethodTest { } else { re.printStackTrace(log); tRes.tested("attach()",false); - } + } } } } diff --git a/qadevOOo/tests/java/ifc/text/_XTextCursor.java b/qadevOOo/tests/java/ifc/text/_XTextCursor.java index cc91e0d9f8f7..145224d7817c 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -217,7 +217,7 @@ public class _XTextCursor extends MultiMethodTest { * and in the second <code>false</code> */ public void _isCollapsed(){ - boolean bCol = false; + boolean bCol = false; oObj.gotoStart(false); bCol = oObj.isCollapsed(); diff --git a/qadevOOo/tests/java/ifc/text/_XTextDocument.java b/qadevOOo/tests/java/ifc/text/_XTextDocument.java index 5022aba6aecd..b29e786bdc57 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextDocument.java +++ b/qadevOOo/tests/java/ifc/text/_XTextDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java index 7918235a20a5..981a916418d2 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java +++ b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier.java index cea9db145382..b54c9f60856c 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextField.java b/qadevOOo/tests/java/ifc/text/_XTextField.java index 8cdfc3ce1fa3..2a45604eea38 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextField.java +++ b/qadevOOo/tests/java/ifc/text/_XTextField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java index eaacd4a5966a..e9a0700780f8 100755 --- a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ public class _XTextFieldsSupplier extends MultiMethodTest { public XTextFieldsSupplier oObj = null; // oObj filled by MultiMethodTest private boolean mDispose = false; private boolean mbCreateFieldMaster = true; - + /** - * Insert some text fields into a cell on the sheet, so this interface test + * Insert some text fields into a cell on the sheet, so this interface test * makes sense. */ protected void before() { @@ -139,10 +139,10 @@ public class _XTextFieldsSupplier extends MultiMethodTest { e.printStackTrace(log); throw new StatusException("Couldn't insert textField.URL", e); } - + } } - + public void _getTextFields() { XEnumerationAccess xEnumAccess = oObj.getTextFields(); XEnumeration xEnum = xEnumAccess.createEnumeration(); @@ -151,15 +151,15 @@ public class _XTextFieldsSupplier extends MultiMethodTest { Object o = xEnum.nextElement(); } catch(com.sun.star.container.NoSuchElementException e) { - setMethodFalse("getTextFields()", e); + setMethodFalse("getTextFields()", e); } catch(com.sun.star.lang.WrappedTargetException e) { - setMethodFalse("getTextFields()", e); + setMethodFalse("getTextFields()", e); } } tRes.tested("getTextFields()", xEnum != null); } - + public void _getTextFieldMasters() { if (mbCreateFieldMaster) { XNameAccess xName = oObj.getTextFieldMasters(); @@ -171,7 +171,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { tRes.tested("getTextFieldMasters()", true); } } - + /** * Just for convenience: log the exception and set the method false. * @param method The name of the method to set to false. @@ -182,10 +182,10 @@ public class _XTextFieldsSupplier extends MultiMethodTest { e.printStackTrace((PrintWriter)log); tRes.tested(method, false); } - + protected void after() { if (mDispose) disposeEnvironment(); } - + } diff --git a/qadevOOo/tests/java/ifc/text/_XTextFrame.java b/qadevOOo/tests/java/ifc/text/_XTextFrame.java index 99cc4307604a..4a4c916c4a29 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextFrame.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFrame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextFramesSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFramesSupplier.java index 342190f9381f..1cb192bf35be 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextFramesSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFramesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextGraphicObjectsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextGraphicObjectsSupplier.java index adb93480ff04..1f3c20571951 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextGraphicObjectsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextGraphicObjectsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextRange.java b/qadevOOo/tests/java/ifc/text/_XTextRange.java index 304bc065e7ab..af95c69edd09 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRange.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,8 +91,8 @@ public class _XTextRange extends MultiMethodTest { tRes.tested( "getStart()", oStartRange != null && exp.startsWith("Start")); - - + + oStartRange.setString(""); } @@ -128,7 +128,7 @@ public class _XTextRange extends MultiMethodTest { tRes.tested( "getEnd()", oEndRange != null && exp.endsWith("End")); - + oEndRange.setString(""); } diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java index da7f7c98c0ba..744d993c831d 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,9 +109,9 @@ public class _XTextRangeCompare extends MultiMethodTest { /** * One cursor is created and to its position a paragraph * inserted, then the fist five characters was selected. - * A second cursor was created and the last 7 characteres + * A second cursor was created and the last 7 characteres * was selected.<p> - * + * * Has <b>OK</b> status if the compare returns 1, i.e. * the second cursor end is before the first. */ @@ -124,7 +124,7 @@ public class _XTextRangeCompare extends MultiMethodTest { cursor1 = oText.createTextCursor(); oText.insertString(cursor1, nameStr, false); - cursor1.gotoStart(false); + cursor1.gotoStart(false); cursor1.goRight((short)5, true); cursor2 = oText.createTextCursor(); cursor2.gotoEnd(false); @@ -136,7 +136,7 @@ public class _XTextRangeCompare extends MultiMethodTest { log.println("check: oObj.compareRegionStarts(cursor1, cursor2)"); n = oObj.compareRegionEnds(cursor1, cursor2); - + log.println( "Result (short) : " + n ); }catch(com.sun.star.lang.IllegalArgumentException e){ log.println( "Exception: " + e); @@ -150,9 +150,9 @@ public class _XTextRangeCompare extends MultiMethodTest { /** * One cursor is created and to its position a paragraph * inserted, then the fist five characters was selected. - * A second cursor was created and the last 7 characters + * A second cursor was created and the last 7 characters * was selected.<p> - * + * * Has <b>OK</b> status if the compare returns 1, i.e. * the second cursor start is before the first. */ @@ -164,7 +164,7 @@ public class _XTextRangeCompare extends MultiMethodTest { cursor1 = oText.createTextCursor(); oText.insertString(cursor1, nameStr, false); - cursor1.gotoStart(false); + cursor1.gotoStart(false); cursor1.goRight((short)5, true); cursor2 = oText.createTextCursor(); cursor2.gotoEnd(false); @@ -175,7 +175,7 @@ public class _XTextRangeCompare extends MultiMethodTest { log.println("cursor2: '"+cursor2.getString() + "'"); log.println("check: oObj.compareRegionStarts(cursor1, cursor2)"); n = oObj.compareRegionStarts(cursor1, cursor2); - + log.println( "Result (short) : " + n ); }catch(com.sun.star.lang.IllegalArgumentException e){ log.println( "Exception: " + e); diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeMover.java b/qadevOOo/tests/java/ifc/text/_XTextRangeMover.java index b6320fb19582..d6bcd9c8e7b3 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRangeMover.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRangeMover.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextSection.java b/qadevOOo/tests/java/ifc/text/_XTextSection.java index 030764bd2205..fd7e2e15a6e0 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextSection.java +++ b/qadevOOo/tests/java/ifc/text/_XTextSection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextSectionsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextSectionsSupplier.java index 0146e3c2d5ac..e4f9584d75c9 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextSectionsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextSectionsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextTable.java b/qadevOOo/tests/java/ifc/text/_XTextTable.java index 4dfa9e10e410..bd3dc73567c7 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextTable.java +++ b/qadevOOo/tests/java/ifc/text/_XTextTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java index 993406a821f4..8e013f5de13c 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextTablesSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextTablesSupplier.java index 1a0e4a686ae6..101e1cb0b935 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextTablesSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XTextViewCursorSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextViewCursorSupplier.java index 05792f041086..53de699ae12c 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextViewCursorSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextViewCursorSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/text/_XWordCursor.java b/qadevOOo/tests/java/ifc/text/_XWordCursor.java index 91ed4fadd3d2..72dfc901af5c 100644 --- a/qadevOOo/tests/java/ifc/text/_XWordCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XWordCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java index 806c3c8c9962..316cd863ea4e 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java index 86cc310eab02..2ba2274bf756 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java index bc3c02d6d69a..0aa4d9675523 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java index a5c927cb620d..4da4491b5b19 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java index 44bf27e99bea..2217c0c0d6b2 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java index d4e16e052e27..ffa4ff0977aa 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor2.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java index 071f99ebf640..a6a7c383a670 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java index 62d6832ef965..c9e110143bcd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderFactory.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderFactory.java index 36586ddf250e..756ea9905688 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java index 075e157e57ad..bffa1a6c73e0 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java index 7cfa8462fbda..f89f02b46f43 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java +++ b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java index 70fe7deeb8ac..0b4fd8505cd1 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java +++ b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XParameterizedContentProvider.java b/qadevOOo/tests/java/ifc/ucb/_XParameterizedContentProvider.java index bd38c1751b6a..618373929ed2 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XParameterizedContentProvider.java +++ b/qadevOOo/tests/java/ifc/ucb/_XParameterizedContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XPropertyMatcherFactory.java b/qadevOOo/tests/java/ifc/ucb/_XPropertyMatcherFactory.java index d5d00c1d2229..c886d1d160d1 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XPropertyMatcherFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XPropertyMatcherFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XPropertySetRegistryFactory.java b/qadevOOo/tests/java/ifc/ucb/_XPropertySetRegistryFactory.java index 39e9fd49f2cd..5d19ea02c9e7 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XPropertySetRegistryFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XPropertySetRegistryFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java index 960becd92c89..613b045eb901 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java index 758d6eba698f..22ae108607cd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java +++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java index 5eb811570515..377ed99547c2 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java index 589bf6ef931d..21c7f7827f53 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java index f14dafba9d0c..90ea861f9f34 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index 3e5361e9f2e0..b86bd1cd9e1a 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,37 +54,37 @@ import util.DesktopTools; import util.utils; public class _XContextMenuInterception extends MultiMethodTest { - + private XModel docModel = null; private XContextMenuInterceptor xCI = null; public XContextMenuInterception oObj = null; private XWindow xWindow = null; private XMultiServiceFactory xMSF = null; private Point point = null; - + public void before() { docModel = (XModel) UnoRuntime.queryInterface( XModel.class,tEnv.getObjRelation("FirstModel")); - + xCI = (XContextMenuInterceptor) UnoRuntime.queryInterface( XContextMenuInterceptor.class, new ContextMenuInterceptor()); - + xMSF = (XMultiServiceFactory)tParam.getMSF(); - + //ensure that the first model is focused log.println("ensure that the first model is focused"); DesktopTools.bringWindowToFront(docModel); - + utils.shortWait(3000); } - + public void after() { if (xCI != null) { oObj.releaseContextMenuInterceptor(xCI); } } - + public void _registerContextMenuInterceptor() { oObj.registerContextMenuInterceptor(xCI); openContextMenu(docModel); @@ -92,7 +92,7 @@ public class _XContextMenuInterception extends MultiMethodTest { releasePopUp(); tRes.tested("registerContextMenuInterceptor()",res); } - + public void _releaseContextMenuInterceptor() { requiredMethod("registerContextMenuInterceptor()"); oObj.releaseContextMenuInterceptor(xCI); @@ -101,11 +101,11 @@ public class _XContextMenuInterception extends MultiMethodTest { releasePopUp(); tRes.tested("releaseContextMenuInterceptor()",!res); } - + private boolean checkHelpEntry(){ XInterface toolkit = null; boolean res = true; - + log.println("get accesibility..."); try{ toolkit = (XInterface) xMSF.createInstance("com.sun.star.awt.Toolkit"); @@ -114,69 +114,69 @@ public class _XContextMenuInterception extends MultiMethodTest { } XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, toolkit); - + XAccessible xRoot = null; - + AccessibilityTools at = new AccessibilityTools(); - + try { xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); - + xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get Window"); } - + XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU,true); - + log.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); - + XAccessible xHelp = null; try{ log.println("Try to get second entry of context menu..."); xHelp = oPopMenu.getAccessibleChild(1); - + } catch (IndexOutOfBoundsException e){ throw new StatusException("Not possible to get second entry of context menu",e); } - + if (xHelp == null) throw new StatusException(new Status("second entry of context menu is NULL", false)); - + XAccessibleContext xHelpCont = xHelp.getAccessibleContext(); - + if ( xHelpCont == null ) throw new StatusException(new Status("No able to retrieve accessible context from first entry of context menu",false)); - + String aAccessibleName = xHelpCont.getAccessibleName(); if ( !aAccessibleName.equals( "Help" )) { log.println("Accessible name found = "+aAccessibleName ); log.println("Second entry of context menu is not from context menu interceptor"); res=false; } - + return res; - + } - + private void openContextMenu(XModel xModel){ - + log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - + xWindow = at.getCurrentWindow(xMSF, xModel); - + XAccessible xRoot = at.getAccessibleObject(xWindow); - + XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); - + XAccessibleComponent window = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); - + point = window.getLocationOnScreen(); Rectangle rect = window.getBounds(); - + log.println("klick mouse button..."); try { Robot rob = new Robot(); @@ -191,11 +191,11 @@ public class _XContextMenuInterception extends MultiMethodTest { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + utils.shortWait(1000); - + } - + private void releasePopUp() { log.println("release the popup menu"); try { diff --git a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java index 024f72d07259..9d5dd4859e94 100755 --- a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ import com.sun.star.ui.XModuleUIConfigurationManager; import lib.MultiMethodTest; public class _XModuleUIConfigurationManager extends MultiMethodTest { - + public XModuleUIConfigurationManager oObj = null; private String resourceUrl = null; - + public void before() { resourceUrl = (String)tEnv.getObjRelation("XModuleUIConfigurationManager.ResourceURL"); } - + public void _isDefaultSettings() { boolean result; try { @@ -57,10 +57,10 @@ public class _XModuleUIConfigurationManager extends MultiMethodTest { log.println("'" + notPossibleUrl + "' is an illegal resource."); result = false; } - + tRes.tested("isDefaultSettings()", result); } - + public void _getDefaultSettings() { boolean result; try { @@ -77,5 +77,5 @@ public class _XModuleUIConfigurationManager extends MultiMethodTest { } tRes.tested("getDefaultSettings()", result); } - + } diff --git a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java index f2c87692d7bc..7f4015e7dc2f 100755 --- a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java +++ b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,23 +33,23 @@ import com.sun.star.ui.XModuleUIConfigurationManagerSupplier; import lib.MultiMethodTest; public class _XModuleUIConfigurationManagerSupplier extends MultiMethodTest { - + public XModuleUIConfigurationManagerSupplier oObj; - + public void _getUIConfigurationManager() { String configManagerName = null; String implementationName = null; try { configManagerName = (String)tEnv.getObjRelation("XModuleUIConfigurationManagerSupplier.ConfigurationManager"); implementationName = (String)tEnv.getObjRelation("XModuleUIConfigurationManagerSupplier.ConfigManagerImplementationName"); - + // get a config manager for the StartModule Object o = oObj.getUIConfigurationManager(configManagerName); XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, o); String impName = xServiceInfo.getImplementationName(); boolean result = impName.equals(implementationName); if (!result) { - log.println("Returned implementation was '" + impName + + log.println("Returned implementation was '" + impName + "' but should have been '" + implementationName + "'"); } tRes.tested("getUIConfigurationManager()", result); diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java index 9b0fea0096c5..cc3b7f207d4c 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,20 +47,20 @@ public class _XUIConfiguration extends MultiMethodTest { public XUIConfiguration oObj; XUIConfigurationListenerImpl xListener = null; - + /** * Interface for the Listener of the object relation * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE> * @see com.sun.star.ui.XUIConfigurationListener */ - public static interface XUIConfigurationListenerImpl + public static interface XUIConfigurationListenerImpl extends XUIConfigurationListener { - public void reset(); - public void fireEvent(); + public void reset(); + public void fireEvent(); public boolean actionWasTriggered(); } - - + + /** * try to get a listener out of the object relation * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE> @@ -70,7 +70,7 @@ public class _XUIConfiguration extends MultiMethodTest { "XUIConfiguration.XUIConfigurationListenerImpl"); XUIConfigurationListener l; } - + /** * adds a listener an fire an event * Has <B>OK</B> status if listener was called @@ -80,7 +80,7 @@ public class _XUIConfiguration extends MultiMethodTest { xListener.fireEvent(); tRes.tested("addConfigurationListener()", xListener.actionWasTriggered()); } - + /** * removes the listener and calls an event. * Has <B>OK</B> status if listener is not called. @@ -92,7 +92,7 @@ public class _XUIConfiguration extends MultiMethodTest { xListener.fireEvent(); tRes.tested("removeConfigurationListener()", !xListener.actionWasTriggered()); } - + /** * Dispose because the UIConfigurationManager has to be recreated */ diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationListener.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationListener.java index cd24140d988e..efc46f8d6063 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationListener.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ import com.sun.star.ui.XUIConfigurationListener; import lib.MultiMethodTest; public class _XUIConfigurationListener extends MultiMethodTest { - + public XUIConfigurationListener oObj = null; public void _elementInserted() { diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index 53ddc59e6ce9..f14e70403f2d 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ import java.io.PrintWriter; import lib.MultiMethodTest; public class _XUIConfigurationManager extends MultiMethodTest { - + public XUIConfigurationManager oObj; private String msResourceUrl = "private:resource/menubar/menubar"; private String msMyResourceUrl = "private:resource/menubar/mymenubar"; @@ -50,8 +50,8 @@ public class _XUIConfigurationManager extends MultiMethodTest { private XIndexAccess mxMenuBarSettings = null; private XMultiServiceFactory mxMSF = null; private String sShortCutManagerServiceName = null; - - + + /** * Some stuff before the tests: * extract the multi service factory. @@ -61,7 +61,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { sShortCutManagerServiceName = (String)tEnv.getObjRelation("XConfigurationManager.ShortCutManager"); } - + /** * reset all changes: do at the end. */ @@ -70,7 +70,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { oObj.reset(); tRes.tested("reset()", true); } - + public void _getUIElementsInfo() { boolean result = true; try { @@ -85,13 +85,13 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("getUIElementsInfo()", result); } - + public void _createSettings() { mxSettings = oObj.createSettings(); util.dbg.printInterfaces(mxSettings); tRes.tested("createSettings()", mxSettings != null); } - + public void _hasSettings() { boolean result = false; try { @@ -103,7 +103,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("hasSettings()", result); } - + public void _getSettings() { requiredMethod("hasSettings()"); boolean result = true; @@ -137,7 +137,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("getSettings()", result); } - + public void _replaceSettings() { requiredMethod("getSettings()"); boolean result = true; @@ -149,7 +149,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { createMenuBarItem("Click for Macro", (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, prop[3].Value), log); - + XIndexContainer x = (XIndexContainer)UnoRuntime.queryInterface(XIndexContainer.class, mxMenuBarSettings); try { x.insertByIndex(x.getCount(), prop); @@ -185,7 +185,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { _getSettings(); tRes.tested("replaceSettings()", result); } - + public void _removeSettings() { requiredMethod("insertSettings()"); boolean result = true; @@ -206,7 +206,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("removeSettings()", result); } - + public void _insertSettings() { requiredMethod("createSettings()"); requiredMethod("replaceSettings()"); @@ -220,7 +220,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { createMenuBarItem("A new sub entry", (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, prop[3].Value), log); - + XIndexContainer x = (XIndexContainer)UnoRuntime.queryInterface(XIndexContainer.class,mxSettings); try { int count = x.getCount(); @@ -256,10 +256,10 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("insertSettings()", result); } - + /** * Only a short test. - * See complex.imageManager.CheckImageManager for a more extensive test of + * See complex.imageManager.CheckImageManager for a more extensive test of * this implementation. */ public void _getImageManager() { @@ -268,8 +268,8 @@ public class _XUIConfigurationManager extends MultiMethodTest { XImageManager xImageManager = (XImageManager)UnoRuntime.queryInterface(XImageManager.class, o); tRes.tested("getImageManager()", xImageManager != null); } - - + + /** * get a shortcut manager */ @@ -286,12 +286,12 @@ public class _XUIConfigurationManager extends MultiMethodTest { } tRes.tested("getShortCutManager()", bSupportedServiceFound); } - + public void _getEventsManager() { Object o = oObj.getEventsManager(); tRes.tested("getEventsManager()", o == null); } - + /** * Create a menu bar entry for adding to the menu bar of the Office. * @param sLabelName The name of the new entry. @@ -311,7 +311,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { prop[2].Value = new Short((short)0); prop[3] = new PropertyValue(); prop[3].Name = "ItemDescriptorContainer"; - + XSingleComponentFactory xFactory = (XSingleComponentFactory)UnoRuntime.queryInterface( XSingleComponentFactory.class, xMenuBarSettings); try { @@ -327,11 +327,11 @@ public class _XUIConfigurationManager extends MultiMethodTest { } return prop; } - + /** * Create a sub entry to the menu bar. * @param sLabelName The name of the entry in the UI. - * @param xDescriptionContainer The parent entry in the menu bar where + * @param xDescriptionContainer The parent entry in the menu bar where * this entry is added. */ public static void createMenuBarItem(String sLabelName, XIndexContainer xDescriptionContainer, PrintWriter log) { diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java index 96067661bb26..5d0103524834 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ import com.sun.star.ui.XUIConfigurationPersistence; import lib.MultiMethodTest; public class _XUIConfigurationPersistence extends MultiMethodTest { - + public XUIConfigurationPersistence oObj; private XStorage xStore = null; - + public void before() { xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage"); } - + public void _reload() { try { oObj.reload(); @@ -49,7 +49,7 @@ public class _XUIConfigurationPersistence extends MultiMethodTest { } tRes.tested("reload()", true); } - + public void _store() { try { oObj.store(); @@ -59,7 +59,7 @@ public class _XUIConfigurationPersistence extends MultiMethodTest { } tRes.tested("store()", true); } - + public void _storeToStorage() { boolean result = true; try { @@ -71,13 +71,13 @@ public class _XUIConfigurationPersistence extends MultiMethodTest { } tRes.tested("storeToStorage()", result); } - + public void _isModified() { tRes.tested("isModified()", !oObj.isModified()); } - + public void _isReadOnly() { tRes.tested("isReadOnly()", !oObj.isReadOnly()); } - + } diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java index 8acdde914422..7a29c023f1c4 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,17 +42,17 @@ import lib.MultiMethodTest; */ public class _XUIConfigurationStorage extends MultiMethodTest { - + public XUIConfigurationStorage oObj; private XStorage xStore = null; - + public void before() { xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage"); } /** * Set the object relation <code>XUIConfigurationStorage.Storage</code> - * as storage. + * as storage. * Has <b>OK</b> status if no exception is thrown. */ public void _setStorage() { @@ -62,7 +62,7 @@ public class _XUIConfigurationStorage extends MultiMethodTest { log.println("For initializing this object, the setStorage() method was already called at the object."); tRes.tested("setStorage()", true); } - + /** * Queries object for a storage. * Has <b>OK</b> status if <code>hasStorage</code> returns <code>OK</code> @@ -72,5 +72,5 @@ public class _XUIConfigurationStorage extends MultiMethodTest { boolean has = oObj.hasStorage(); tRes.tested("hasStorage()", has); } - + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/ui/_XUIElementFactory.java b/qadevOOo/tests/java/ifc/ui/_XUIElementFactory.java index 5e590054e1f4..796f08a0a204 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIElementFactory.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIElementFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ import lib.MultiMethodTest; public class _XUIElementFactory extends MultiMethodTest { public XUIElementFactory oObj; - + public void _createUIElement() { boolean result = true; PropertyValue[] prop = new PropertyValue[0]; diff --git a/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java b/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java index 089b42aef0c1..48a8b8629b36 100755 --- a/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIElementFactoryRegistration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class _XUIElementFactoryRegistration extends MultiMethodTest { } tRes.tested("registerFactory()", result); } - + public void _getRegisteredFactories() { requiredMethod("registerFactory()"); PropertyValue[][]props = oObj.getRegisteredFactories(); @@ -55,18 +55,18 @@ public class _XUIElementFactoryRegistration extends MultiMethodTest { log.println("Null was returned as PropertyValue[][]"); props = new PropertyValue[0][0]; } - for(int i=0; i<props.length; i++) + for(int i=0; i<props.length; i++) for(int j=0; j<props[i].length; j++) log.println("Factory: " + props[i][j].Name + " - " + props[i][j].Value); tRes.tested("getRegisteredFactories()", props.length != 0); } - + public void _getFactory() { requiredMethod("registerFactory()"); XUIElementFactory xFactory = oObj.getFactory("private:resource/menubar/menubar", ""); tRes.tested("getFactory()", xFactory != null); } - + public void _deregisterFactory() { executeMethod("getRegisteredFactory()"); executeMethod("getFactory()"); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_FilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_FilePicker.java index a3f681277d41..23f2f463b2b6 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_FilePicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_FilePicker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java index a1a9197cd4a6..716d35d43715 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public class _XControlAccess extends MultiMethodTest { } } } - + log.println(error); tRes.tested("setControlProperty()", result) ; diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java index ad7c8d782d7d..22bce193c5bf 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlInformation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java index 95e2c27d9895..2d67bedc2d55 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,10 +49,10 @@ import com.sun.star.util.XCancellable; * @see com.sun.star.ui.dialogs.XExecutableDialog */ public class _XExecutableDialog extends MultiMethodTest { - + public XExecutableDialog oObj = null; private ExecThread eThread = null; - + /** * Test calls the method. <p> * Has <b> OK </b> status if the method successfully returns @@ -62,7 +62,7 @@ public class _XExecutableDialog extends MultiMethodTest { oObj.setTitle("The Title"); tRes.tested("setTitle()",true); } - + /** * This method is excluded from automated test since * we can't close the dialog. <p> @@ -94,25 +94,25 @@ public class _XExecutableDialog extends MultiMethodTest { log.println("XCancellable isn't supported and the "+ "environment is killed hard"); } - - + + } tRes.tested("execute()",result); } - + /** * Calls <code>execute()</code> method in a separate thread. * Necessary to check if this method works */ protected class ExecThread extends Thread { - + public short execRes = (short) 17 ; private XExecutableDialog Diag = null ; - + public ExecThread(XExecutableDialog Diag) { this.Diag = Diag ; } - + public void run() { try { execRes = Diag.execute(); @@ -122,7 +122,7 @@ public class _XExecutableDialog extends MultiMethodTest { } } } - + /** * Sleeps for 5 sec. to allow StarOffice to react on <code> * reset</code> call. @@ -134,14 +134,14 @@ public class _XExecutableDialog extends MultiMethodTest { log.println("While waiting :" + e) ; } } - + public void after() { if (eThread.isAlive()) { log.println("Thread didn't die ... cleaning up"); disposeEnvironment(); } } - + private void closeDialog() { XCancellable canc = (XCancellable) UnoRuntime.queryInterface( XCancellable.class, tEnv.getTestObject()); @@ -151,19 +151,19 @@ public class _XExecutableDialog extends MultiMethodTest { } else { this.disposeEnvironment(); } - + long st = System.currentTimeMillis(); boolean toLong = false; - + log.println("waiting for dialog to close"); - + while (eThread.isAlive() && !toLong) { //wait for dialog to close toLong = (System.currentTimeMillis()-st > 10000); } - + log.println("done"); - + try { if (eThread.isAlive()) { log.println("Interrupting Thread"); @@ -173,23 +173,23 @@ public class _XExecutableDialog extends MultiMethodTest { } catch (Exception e) { // who cares ;-) } - + st = System.currentTimeMillis(); toLong = false; - + log.println("waiting for interruption to work"); - + while (eThread.isAlive() && !toLong) { //wait for dialog to close toLong = (System.currentTimeMillis()-st > 10000); } - + log.println("DialogThread alive: "+eThread.isAlive()); - + log.println("done"); - + } - + } diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java index 45ceec2db964..732861a23590 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java index 07c5c3b93f6d..e09fd399f588 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java index f39ec63ee80d..7018260ca382 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,48 +55,48 @@ import com.sun.star.util.XCancellable; * @see com.sun.star.ui.XFilePickerNotifier */ public class _XFilePickerNotifier extends MultiMethodTest { - + public XFilePickerNotifier oObj = null; private XFilePicker fps = null ; private String dir1 = null, dir2 = null ; ExecThread eThread = null; - - + + /** * Listener implementation which sets a flag if some of its * methods was called. */ protected class TestListener implements XFilePickerListener { public boolean called = false ; - + public void dialogSizeChanged() { called = true; } - + public void fileSelectionChanged(FilePickerEvent e) { called = true; } - + public void directoryChanged(FilePickerEvent e) { log.println("***** Directory Changed *****"); called = true; } - + public String helpRequested(FilePickerEvent e) { called = true; return "help"; } - + public void controlStateChanged(FilePickerEvent e) { called = true; } - + public void disposing(EventObject e) {} } - + TestListener listener = new TestListener() ; - + /** * Tries to query object for <code>XFilePicker</code> interface, and * initializes two different URLs for changing file picker directory. <p> @@ -106,21 +106,21 @@ public class _XFilePickerNotifier extends MultiMethodTest { public void before() { fps = (XFilePicker) UnoRuntime.queryInterface (XFilePicker.class, oObj) ; - + if (fps == null) { log.println("The object doesnt implement XFilePicker") ; throw new StatusException(Status.failed ("The object doesnt implement XFilePicker")); } - + XExecutableDialog exD = (XExecutableDialog) UnoRuntime.queryInterface( XExecutableDialog.class, tEnv.getTestObject()); - + dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); dir2 = util.utils.getFullTestURL(""); eThread = new ExecThread(exD); } - + /** * Adds a listener, then tries to change display directory and * checks if the listener was called. <p> @@ -128,7 +128,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { */ public void _addFilePickerListener() { oObj.addFilePickerListener(listener) ; - + try { log.println("***** Setting DisplayDirectory to " + dir1); fps.setDisplayDirectory(dir1) ; @@ -137,23 +137,23 @@ public class _XFilePickerNotifier extends MultiMethodTest { log.println("***** Setting DisplayDirectory to " + dir2); fps.setDisplayDirectory(dir2) ; log.println("***** Getting: " + fps.getDisplayDirectory()); - + } catch(com.sun.star.lang.IllegalArgumentException e) { log.println("!!! Exception changing dir !!!") ; e.printStackTrace(log) ; } - + shortWait(); - + if (!listener.called) { log.println("Listener wasn't called :-("); } - + closeDialog(); - + tRes.tested("addFilePickerListener()", listener.called) ; } - + /** * Removes the listener and changes display directory. <p> * Has <b>OK</b> status if the listener wasn't called. <p> @@ -164,11 +164,11 @@ public class _XFilePickerNotifier extends MultiMethodTest { */ public void _removeFilePickerListener() { requiredMethod("addFilePickerListener()") ; - + oObj.removeFilePickerListener(listener) ; - + listener.called = false ; - + try { fps.setDisplayDirectory(dir1) ; openDialog(); @@ -177,27 +177,27 @@ public class _XFilePickerNotifier extends MultiMethodTest { log.println("!!! Exception changing dir !!!") ; e.printStackTrace(log) ; } - + shortWait(); - + closeDialog(); - + tRes.tested("removeFilePickerListener()", !listener.called) ; } - + /** * Calls <code>execute()</code> method in a separate thread. * Necessary to check if this method works */ protected class ExecThread extends Thread { - + public short execRes = (short) 17 ; private XExecutableDialog Diag = null ; - + public ExecThread(XExecutableDialog Diag) { this.Diag = Diag ; } - + public void run() { try { execRes = Diag.execute(); @@ -207,7 +207,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { } } } - + /** * Sleeps for 0.5 sec. to allow StarOffice to react on <code> * reset</code> call. @@ -219,7 +219,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { log.println("While waiting :" + e) ; } } - + private void closeDialog() { XCancellable canc = (XCancellable) UnoRuntime.queryInterface( XCancellable.class, tEnv.getTestObject()); @@ -229,19 +229,19 @@ public class _XFilePickerNotifier extends MultiMethodTest { } else { this.disposeEnvironment(); } - + long st = System.currentTimeMillis(); boolean toLong = false; - + log.println("waiting for dialog to close"); - + while (eThread.isAlive() && !toLong) { //wait for dialog to close toLong = (System.currentTimeMillis()-st > 10000); } - + log.println("done"); - + try { if (eThread.isAlive()) { log.println("Interrupting Thread"); @@ -251,38 +251,38 @@ public class _XFilePickerNotifier extends MultiMethodTest { } catch (Exception e) { // who cares ;-) } - + st = System.currentTimeMillis(); toLong = false; - + log.println("waiting for interruption to work"); - + while (eThread.isAlive() && !toLong) { //wait for dialog to close toLong = (System.currentTimeMillis()-st > 10000); } - + log.println("DialogThread alive: "+eThread.isAlive()); - - log.println("done"); - + + log.println("done"); + } - - private void openDialog() { + + private void openDialog() { log.println("Starting Dialog"); if (eThread.isAlive()) { log.println("second interrupt"); eThread.interrupt(); eThread.yield(); } - + XExecutableDialog exD = (XExecutableDialog) UnoRuntime.queryInterface( XExecutableDialog.class, tEnv.getTestObject()); - + dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); dir2 = util.utils.getFullTestURL(""); - eThread = new ExecThread(exD); - + eThread = new ExecThread(exD); + eThread.start(); } } diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePreview.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePreview.java index 1a6565e38d96..b5701a504322 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePreview.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePreview.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterGroupManager.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterGroupManager.java index 3ef3df73aa64..fc199b4089f7 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterGroupManager.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterGroupManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterManager.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterManager.java index cc960d2b191b..38541aaed35d 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterManager.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilterManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java index 4b761e6dea65..502d6f2f750d 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/uno/_XComponentContext.java b/qadevOOo/tests/java/ifc/uno/_XComponentContext.java index 5942b69fd63f..776a91d47f26 100644 --- a/qadevOOo/tests/java/ifc/uno/_XComponentContext.java +++ b/qadevOOo/tests/java/ifc/uno/_XComponentContext.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,8 +50,8 @@ public class _XComponentContext extends MultiMethodTest { try { if (names[i].equals("com.sun.star.i18n.ConversionDictionary_ko")) continue; if (names[i].equals("com.sun.star.i18n.TextConversion_ko")) continue; - log.println("try to instanciate found servicename " + - names[i]); + log.println("try to instanciate found servicename " + + names[i]); directly.createInstanceWithContext(names[i], oObj); log.println("worked .... ok"); res &= true; @@ -71,7 +71,7 @@ public class _XComponentContext extends MultiMethodTest { "/singletons/com.sun.star.lang.theServiceManager"); byValue = (XMultiComponentFactory) UnoRuntime.queryInterface( XMultiComponentFactory.class, value); - + String[] vNames = byValue.getAvailableServiceNames(); String[] dNames = directly.getAvailableServiceNames(); diff --git a/qadevOOo/tests/java/ifc/uno/_XNamingService.java b/qadevOOo/tests/java/ifc/uno/_XNamingService.java index f60f8a6ce6b5..8020cc6ce0df 100644 --- a/qadevOOo/tests/java/ifc/uno/_XNamingService.java +++ b/qadevOOo/tests/java/ifc/uno/_XNamingService.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java index b9411a2ccfb3..32016d8e2711 100644 --- a/qadevOOo/tests/java/ifc/util/_PathSettings.java +++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_SearchDescriptor.java b/qadevOOo/tests/java/ifc/util/_SearchDescriptor.java index e24913e933bd..26215a0f8c54 100644 --- a/qadevOOo/tests/java/ifc/util/_SearchDescriptor.java +++ b/qadevOOo/tests/java/ifc/util/_SearchDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XCancellable.java b/qadevOOo/tests/java/ifc/util/_XCancellable.java index cd7ffc0840b5..bf8b2df73e27 100644 --- a/qadevOOo/tests/java/ifc/util/_XCancellable.java +++ b/qadevOOo/tests/java/ifc/util/_XCancellable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java index 397ac79e3922..f78838bcc687 100644 --- a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java +++ b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ import lib.Status; import lib.StatusException; public class _XChangesBatch extends MultiMethodTest { - - public XChangesBatch oObj; + + public XChangesBatch oObj; private Object changeElement = null; private Object originalElement = null; private String elementName = null; private XPropertySet xProp = null; private XNameReplace xNameReplace = null; - + /** * add a change that can be committed */ @@ -72,7 +72,7 @@ public class _XChangesBatch extends MultiMethodTest { catch(com.sun.star.uno.Exception e) { throw new StatusException("Could not get element by name '" + elementName + "'.", e); } - + if (changeElement == null || originalElement == null || elementName == null || (xProp == null && xNameReplace == null)) { log.println( changeElement == null?"Missing property 'XChangesBatch.ChangeElement'\n":"" + @@ -84,7 +84,7 @@ public class _XChangesBatch extends MultiMethodTest { throw new StatusException("Some needed object relations are missing.", new Exception()); } } - + public void _commitChanges() { requiredMethod("getPendingChanges()"); try { @@ -113,7 +113,7 @@ public class _XChangesBatch extends MultiMethodTest { } tRes.tested("commitChanges()", true); } - + public void _getPendingChanges() { requiredMethod("hasPendingChanges()"); ElementChange[]changes = oObj.getPendingChanges(); @@ -126,9 +126,9 @@ public class _XChangesBatch extends MultiMethodTest { log.println("Found not the right number of changes: " + amount); log.println("It should have been 1 change."); for (int i=0; i<amount; i++) { - System.out.println("Detailed Change " + i + " -> new Element: '" + - changes[i].Element.toString() + "' ReplacedElement: '" + - changes[i].ReplacedElement.toString() + "'"); + System.out.println("Detailed Change " + i + " -> new Element: '" + + changes[i].Element.toString() + "' ReplacedElement: '" + + changes[i].ReplacedElement.toString() + "'"); } tRes.tested("getPendingChanges()", false); } @@ -138,7 +138,7 @@ public class _XChangesBatch extends MultiMethodTest { tRes.tested("getPendingChanges()", result); } } - + public void _hasPendingChanges() { try { executeChange(changeElement); @@ -150,7 +150,7 @@ public class _XChangesBatch extends MultiMethodTest { boolean hasPendingChanges = oObj.hasPendingChanges(); tRes.tested("hasPendingChanges()", hasPendingChanges); } - + private void executeChange(Object element) throws StatusException { if (xProp != null) { try { diff --git a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java index 6899f13d8ae2..8abe0e5b1442 100644 --- a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java +++ b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,16 +43,16 @@ import lib.MultiMethodTest; * @see com.sun.star.util.XChangesBatch */ public class _XChangesNotifier extends MultiMethodTest { - + public XChangesNotifier oObj = null; - private XChangesBatch xBatch = null; + private XChangesBatch xBatch = null; private Object changeElement = null; private Object originalElement = null; private String elementName = null; private XPropertySet xProp = null; private XNameReplace xNameReplace = null; - private _XChangesNotifier.MyChangesListener xListener = null; - + private _XChangesNotifier.MyChangesListener xListener = null; + /** * Own implementation of the XChangesListener interface * @see com.sun.star.util.XChangesListener @@ -60,28 +60,28 @@ public class _XChangesNotifier extends MultiMethodTest { private static class MyChangesListener implements XChangesListener { /** Just lo a call of the listener **/ boolean bChangesOccured = false; - - /** A change did occur + + /** A change did occur * @param changesEvent The event. **/ public void changesOccurred(com.sun.star.util.ChangesEvent changesEvent) { bChangesOccured = true; } - + /** Disposing of the listener * @param eventObject The event. **/ public void disposing(com.sun.star.lang.EventObject eventObject) { bChangesOccured = true; } - + /** * Reset the listener */ public void reset() { bChangesOccured = false; } - + /** * Has the listener been called? * @return True, if the listener has been called. @@ -100,7 +100,7 @@ public class _XChangesNotifier extends MultiMethodTest { changeElement = tEnv.getObjRelation("XChangesNotifier.ChangeElement"); originalElement = tEnv.getObjRelation("XChangesNotifier.OriginalElement"); elementName = (String)tEnv.getObjRelation("XChangesNotifier.PropertyName"); - + xProp = (XPropertySet)tEnv.getObjRelation("XChangesNotifier.PropertySet"); try { if (originalElement == null && xProp != null) @@ -131,7 +131,7 @@ public class _XChangesNotifier extends MultiMethodTest { ); throw new StatusException("Some needed object relations are missing.", new Exception()); } - + xListener = new _XChangesNotifier.MyChangesListener(); } @@ -140,7 +140,7 @@ public class _XChangesNotifier extends MultiMethodTest { oObj.addChangesListener(xListener); tRes.tested("addChangesListener()", true); } - + /** test removeChangesListener **/ public void _removeChangesListener() { requiredMethod("addChangesListener()"); @@ -155,10 +155,10 @@ public class _XChangesNotifier extends MultiMethodTest { boolean result2 = xListener.didChangesOccur(); if (result2) log.println("Removed listener has been called."); - + tRes.tested("removeChangesListener()", result && !result2); } - + /** * Commit a change, using an implementation of the XChangesBatch interface. * @return true, if changing worked. @@ -192,9 +192,9 @@ public class _XChangesNotifier extends MultiMethodTest { } return true; } - + /** - * Execute the change, use XPropertySet or XNameReplace + * Execute the change, use XPropertySet or XNameReplace * @return False, if changing did throw an exception. */ private boolean executeChange(Object element) throws StatusException { diff --git a/qadevOOo/tests/java/ifc/util/_XCloneable.java b/qadevOOo/tests/java/ifc/util/_XCloneable.java index 4591be5cfc2e..85ffe637237c 100644 --- a/qadevOOo/tests/java/ifc/util/_XCloneable.java +++ b/qadevOOo/tests/java/ifc/util/_XCloneable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public class _XCloneable extends MultiMethodTest { // oObj filled by MultiMethodTest public XCloneable oObj = null ; protected XCloneable clone = null; - + /** * calls the method. <p> * Has <b>OK</b> status if no exception has occured. <p> @@ -59,23 +59,23 @@ public class _XCloneable extends MultiMethodTest { //check if the implementaionname equals result &= checkImplementationName(oObj,clone); - + //check ImplementationID result &= checkImplementationID(oObj, clone); - + tRes.tested("createClone()", result) ; } - + protected byte[] getImplementationID(XInterface ifc) { byte[] res = new byte[0]; - XTypeProvider provider = (XTypeProvider) + XTypeProvider provider = (XTypeProvider) UnoRuntime.queryInterface(XTypeProvider.class, ifc); if (provider != null) { res = provider.getImplementationId(); } return res; - } - + } + protected boolean checkImplementationID(XInterface org, XInterface clone) { boolean res = getImplementationID(org).equals( getImplementationID(clone)); @@ -84,18 +84,18 @@ public class _XCloneable extends MultiMethodTest { log.println("------------------------------------------------------------------------"); } return !res; - } - + } + protected String getImplementationName(XInterface ifc) { String res = ""; - XServiceInfo info = (XServiceInfo) + XServiceInfo info = (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, ifc); if (info != null) { res = info.getImplementationName(); } return res; } - + protected boolean checkImplementationName(XInterface org, XInterface clone) { boolean res = getImplementationName(org).equals( getImplementationName(clone)); diff --git a/qadevOOo/tests/java/ifc/util/_XFlushable.java b/qadevOOo/tests/java/ifc/util/_XFlushable.java index c18d84e5d5f6..0cf4df3ef1c9 100644 --- a/qadevOOo/tests/java/ifc/util/_XFlushable.java +++ b/qadevOOo/tests/java/ifc/util/_XFlushable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java index 164f8e4aaa3e..a35d6290bc24 100644 --- a/qadevOOo/tests/java/ifc/util/_XImportable.java +++ b/qadevOOo/tests/java/ifc/util/_XImportable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ public class _XImportable extends MultiMethodTest { "DatabaseName", "SourceType", "SourceObject", "IsNative" }; protected Type[] types = new Type[] { - new Type(String.class), new Type(com.sun.star.sheet.DataImportMode.class), + new Type(String.class), new Type(com.sun.star.sheet.DataImportMode.class), new Type(String.class), new Type(Boolean.class) }; @@ -54,7 +54,7 @@ public class _XImportable extends MultiMethodTest { * in com.sun.star.sheet.DatabaseImportDescriptor.<br> * Returns OK state is all propertynames and types are the specified. */ - + public void _createImportDescriptor() { boolean res = true; boolean locResult = false; @@ -99,33 +99,33 @@ public class _XImportable extends MultiMethodTest { public void _doImport() { requiredMethod("createImportDescriptor()"); boolean res = true; - + log.print("Setting the ImportDescriptor (Bibliograpy, Table, biblio) -- "); descriptor[0].Value = "Bibliography"; descriptor[1].Value = com.sun.star.sheet.DataImportMode.TABLE; descriptor[2].Value = "biblio"; log.println("done"); - + log.print("Importing data (Bibliograpy, Table, biblio) -- "); oObj.doImport(descriptor); log.println("done"); - + log.println("Checking data"); res &= checkA1("Identifier"); - + log.print("Setting the ImportDescriptor (Bibliograpy, SQL, select Author from biblio) -- "); descriptor[0].Value = "Bibliography"; descriptor[1].Value = com.sun.star.sheet.DataImportMode.SQL; descriptor[2].Value = "select Author from biblio"; log.println("done"); - + log.print("Importing data (Bibliograpy, SQL, select Author from biblio) -- "); oObj.doImport(descriptor); log.println("done"); - + log.println("Checking data"); - res &= checkA1("Author"); - + res &= checkA1("Author"); + tRes.tested("doImport()",res); } @@ -172,7 +172,7 @@ public class _XImportable extends MultiMethodTest { return res; } - + protected boolean checkA1(String expected) { XCellRange range = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, tEnv.getTestObject()); boolean res = false; @@ -198,5 +198,5 @@ public class _XImportable extends MultiMethodTest { protected void after() { disposeEnvironment(); } - + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/ifc/util/_XIndent.java b/qadevOOo/tests/java/ifc/util/_XIndent.java index a02897b0e3c1..0900e8c3dfcd 100644 --- a/qadevOOo/tests/java/ifc/util/_XIndent.java +++ b/qadevOOo/tests/java/ifc/util/_XIndent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,9 @@ public class _XIndent extends MultiMethodTest { // oObj filled by MultiMethodTest public XIndent oObj = null ; - + protected XPropertySet PropSet = null; - + /** * Ensures that the ObjRelation PropSet is given. */ @@ -58,7 +58,7 @@ public class _XIndent extends MultiMethodTest { if (PropSet == null) { throw new StatusException(Status.failed("No PropertySet given")); } - } + } /** * Calls the method. <p> @@ -70,7 +70,7 @@ public class _XIndent extends MultiMethodTest { int newValue = getIndent(); tRes.tested("incrementIndent()", oldValue < newValue) ; } - + /** * Calls the method. <p> * Has <b>OK</b> status if the property 'ParaIndent' is decremented afterwards<p> @@ -82,7 +82,7 @@ public class _XIndent extends MultiMethodTest { oObj.decrementIndent(); int newValue = getIndent(); tRes.tested("decrementIndent()", oldValue > newValue) ; - } + } public short getIndent() { short ret = 0; diff --git a/qadevOOo/tests/java/ifc/util/_XMergeable.java b/qadevOOo/tests/java/ifc/util/_XMergeable.java index 860811246727..556fd5dd74f9 100644 --- a/qadevOOo/tests/java/ifc/util/_XMergeable.java +++ b/qadevOOo/tests/java/ifc/util/_XMergeable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XModeSelector.java b/qadevOOo/tests/java/ifc/util/_XModeSelector.java index fddf9850ca02..cc0525e1c281 100644 --- a/qadevOOo/tests/java/ifc/util/_XModeSelector.java +++ b/qadevOOo/tests/java/ifc/util/_XModeSelector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XModifiable.java b/qadevOOo/tests/java/ifc/util/_XModifiable.java index 86f8f8d4b086..0516aa58a50b 100644 --- a/qadevOOo/tests/java/ifc/util/_XModifiable.java +++ b/qadevOOo/tests/java/ifc/util/_XModifiable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java b/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java index 34ca57c63cfe..f9d314e71991 100644 --- a/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java +++ b/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XNumberFormatsSupplier.java b/qadevOOo/tests/java/ifc/util/_XNumberFormatsSupplier.java index 02595f886b8e..468f7f6b13cf 100644 --- a/qadevOOo/tests/java/ifc/util/_XNumberFormatsSupplier.java +++ b/qadevOOo/tests/java/ifc/util/_XNumberFormatsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XNumberFormatter.java b/qadevOOo/tests/java/ifc/util/_XNumberFormatter.java index 4dab4f5c5b2b..c1d3380d7352 100644 --- a/qadevOOo/tests/java/ifc/util/_XNumberFormatter.java +++ b/qadevOOo/tests/java/ifc/util/_XNumberFormatter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XProtectable.java b/qadevOOo/tests/java/ifc/util/_XProtectable.java index 1e61ee4fa840..5879d76a0b95 100644 --- a/qadevOOo/tests/java/ifc/util/_XProtectable.java +++ b/qadevOOo/tests/java/ifc/util/_XProtectable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ import lib.MultiMethodTest; public class _XProtectable extends MultiMethodTest { public XProtectable oObj = null; String sPassWord = "TopSecret"; - + /** * Check, if the sheet is protected. * Has OK status, if this is the case. @@ -45,7 +45,7 @@ public class _XProtectable extends MultiMethodTest { boolean result = oObj.isProtected(); tRes.tested("isProtected()", result); } - + /** * Protect the sheet */ @@ -53,7 +53,7 @@ public class _XProtectable extends MultiMethodTest { oObj.protect(sPassWord); tRes.tested("protect()", true); } - + /** * Unprotect with wrong password, see if it's still protected. * Unprotect with correct password, see if it's unprotected. @@ -80,5 +80,5 @@ public class _XProtectable extends MultiMethodTest { result &= !oObj.isProtected(); tRes.tested("unprotect()", result); } - + } diff --git a/qadevOOo/tests/java/ifc/util/_XRefreshable.java b/qadevOOo/tests/java/ifc/util/_XRefreshable.java index 7b1eb0ad0db5..73b95bbcb85f 100644 --- a/qadevOOo/tests/java/ifc/util/_XRefreshable.java +++ b/qadevOOo/tests/java/ifc/util/_XRefreshable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java index e4a3a5c2ba56..c5a6e00324f4 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java index 9f2a801cfcbf..c58d66b10468 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,11 +57,11 @@ public class _XReplaceable extends MultiMethodTest { private String mReplaceString = "** xTextDoc"; private boolean mDispose = false; - /** - * Creates an entry to search for, if the current object does not provide - * one. In this case, the environment is disposed after the test, since + /** + * Creates an entry to search for, if the current object does not provide + * one. In this case, the environment is disposed after the test, since * the inserted object may influence following tests. - * + * */ protected void before() { Object o = tEnv.getObjRelation("SEARCHSTRING"); @@ -80,7 +80,7 @@ public class _XReplaceable extends MultiMethodTest { } else { log.println("Needed object relation 'XSearchable.MAKEENTRYINCELL' is there, but is of type '" - + o.getClass().getName() + "'. Should be 'XCell' or 'XCell[]' instead."); + + o.getClass().getName() + "'. Should be 'XCell' or 'XCell[]' instead."); } for (int i=0; i<cells.length; i++) { cells[i].setFormula(mSearchString); @@ -88,7 +88,7 @@ public class _XReplaceable extends MultiMethodTest { mDispose = true; } } - + /** * Creates the descriptor for replacing string 'xTextDoc' * with string '** xTextDoc'. <p> @@ -130,7 +130,7 @@ public class _XReplaceable extends MultiMethodTest { Rdesc.setReplaceString(mSearchString); oObj.replaceAll(Rdesc); res &= (oObj.findFirst(SDesc) == null); - + tRes.tested("replaceAll()",res); } diff --git a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java index 4b9b8e14abee..ee17a6de0847 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XSearchable.java b/qadevOOo/tests/java/ifc/util/_XSearchable.java index 91c3014387df..eefff1b560a9 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchable.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,11 +60,11 @@ public class _XSearchable extends MultiMethodTest { private boolean mDispose = false; private boolean mExcludeFindNext = false; - /** - * Creates an entry to search for, if the current object does not provide - * one. In this case, the environment is disposed after the test, since + /** + * Creates an entry to search for, if the current object does not provide + * one. In this case, the environment is disposed after the test, since * the inserted object may influence following tests. - * + * */ protected void before() { Object o = tEnv.getObjRelation("SEARCHSTRING"); @@ -82,7 +82,7 @@ public class _XSearchable extends MultiMethodTest { } else { log.println("Needed object relation 'XSearchable.MAKEENTRYINCELL' is there, but is of type '" - + o.getClass().getName() + "'. Should be 'XCell' or 'XCell[]' instead."); + + o.getClass().getName() + "'. Should be 'XCell' or 'XCell[]' instead."); } for (int i=0; i<cells.length; i++) { cells[i].setFormula(mSearchString); @@ -91,7 +91,7 @@ public class _XSearchable extends MultiMethodTest { } mExcludeFindNext = (tEnv.getObjRelation("EXCLUDEFINDNEXT")==null)?false:true; } - + /** * Creates the search descriptor which searches for * 'xTextDoc' string. <p> @@ -158,7 +158,7 @@ public class _XSearchable extends MultiMethodTest { */ public void _findNext() { if (mExcludeFindNext) { - log.println("Testing findNext() excluded, because only one" + + log.println("Testing findNext() excluded, because only one" + " search result is available."); tRes.tested("findNext()", true); } diff --git a/qadevOOo/tests/java/ifc/util/_XSortable.java b/qadevOOo/tests/java/ifc/util/_XSortable.java index f0d78305420d..f6b951b2f4e9 100644 --- a/qadevOOo/tests/java/ifc/util/_XSortable.java +++ b/qadevOOo/tests/java/ifc/util/_XSortable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,18 +85,18 @@ public class _XSortable extends MultiMethodTest { bResult = true; for (int k = 0; k < oPV.length; k++) { - log.println("DescriptorProperty " + k + ": Name=" + + log.println("DescriptorProperty " + k + ": Name=" + oPV[k].Name + "; Value=" + oPV[k].Value); if (oPV[k].Name.equals("SortFields")) { TableSortField[] tsf = (TableSortField[]) oPV[k].Value; for (int l = 0; l < tsf.length; l++) { - log.println("\t isAscending: " + + log.println("\t isAscending: " + tsf[l].IsAscending); - log.println("\t IsCaseSensitive: " + + log.println("\t IsCaseSensitive: " + tsf[l].IsCaseSensitive); - log.println("\t CollatorAlgorithm: " + + log.println("\t CollatorAlgorithm: " + tsf[l].CollatorAlgorithm); } } @@ -158,7 +158,7 @@ public class _XSortable extends MultiMethodTest { tRes.tested("sort()", res); } - protected void modifyDescriptor(boolean isSortNumeric, + protected void modifyDescriptor(boolean isSortNumeric, boolean isSortAscending) { for (int i = 0; i < oPV.length; i++) { if (oPV[i].Name.equals("SortFields")) { @@ -197,18 +197,18 @@ public class _XSortable extends MultiMethodTest { if (oPV.length > 0) { for (int k = 0; k < oPV.length; k++) { - log.println("DescriptorProperty " + k + ": Name=" + + log.println("DescriptorProperty " + k + ": Name=" + oPV[k].Name + "; Value=" + oPV[k].Value); if (oPV[k].Name.equals("SortFields")) { TableSortField[] tsf = (TableSortField[]) oPV[k].Value; for (int l = 0; l < tsf.length; l++) { - log.println("\t isAscending: " + + log.println("\t isAscending: " + tsf[l].IsAscending); - log.println("\t IsCaseSensitive: " + + log.println("\t IsCaseSensitive: " + tsf[l].IsCaseSensitive); - log.println("\t CollatorAlgorithm: " + + log.println("\t CollatorAlgorithm: " + tsf[l].CollatorAlgorithm); } } @@ -222,17 +222,17 @@ public class _XSortable extends MultiMethodTest { public static interface XSortChecker { public void prepareToSort(); - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending); public void setPrintWriter(PrintWriter log); } - + /** * Forces environment recreation. */ protected void after() { disposeEnvironment(); - } - + } + } // finish class _XSortable diff --git a/qadevOOo/tests/java/ifc/util/_XStringEscape.java b/qadevOOo/tests/java/ifc/util/_XStringEscape.java index 4673526fc243..22bf326f1cd6 100644 --- a/qadevOOo/tests/java/ifc/util/_XStringEscape.java +++ b/qadevOOo/tests/java/ifc/util/_XStringEscape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ import lib.MultiMethodTest; import com.sun.star.util.XStringEscape; public class _XStringEscape extends MultiMethodTest { - + public XStringEscape oObj; - + public void _escapeString() { log.println("The Implementation of this Interface doesn't really do anything"); boolean res = true; try { - String toCheck = ";:<>/*"; + String toCheck = ";:<>/*"; String eString = oObj.escapeString(toCheck); res = toCheck.equals(eString); } catch (com.sun.star.lang.IllegalArgumentException e) { @@ -47,18 +47,18 @@ public class _XStringEscape extends MultiMethodTest { } tRes.tested("escapeString()",res); } - + public void _unescapeString() { log.println("The Implementation of this Interface doesn't really do anything"); boolean res = true; try { - String toCheck = ";:<>/*"; + String toCheck = ";:<>/*"; String ueString = oObj.unescapeString(toCheck); res = toCheck.equals(ueString); } catch (com.sun.star.lang.IllegalArgumentException e) { System.out.println("IllegalArgument"); } - tRes.tested("unescapeString()",res); + tRes.tested("unescapeString()",res); } - + } diff --git a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java index aed62619f41e..56d7165c3824 100644 --- a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java +++ b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,14 +31,14 @@ import com.sun.star.util.XStringSubstitution; import lib.MultiMethodTest; public class _XStringSubstitution extends MultiMethodTest { - + public XStringSubstitution oObj; - + public void _getSubstituteVariableValue() { boolean res = true; try { log.println("try to get the valid variable $(user) ..."); - String toCheck = "$(user)"; + String toCheck = "$(user)"; String eString = oObj.getSubstituteVariableValue(toCheck); res = eString.startsWith("file:///"); } catch (com.sun.star.container.NoSuchElementException e) { @@ -47,24 +47,24 @@ public class _XStringSubstitution extends MultiMethodTest { } try { log.println("try to get a invalid variable..."); - String toCheck = "$(ThisVariableShouldNoExist)"; + String toCheck = "$(ThisVariableShouldNoExist)"; String eString = oObj.getSubstituteVariableValue(toCheck); log.println("$(ThisVariableShouldNoExist) should not exist"); tRes.tested("getSubstituteVariableValue()",false); - + } catch (com.sun.star.container.NoSuchElementException e) { log.println("expected exception was thrown."); res &= true; } - + tRes.tested("getSubstituteVariableValue()",res); } - + public void _substituteVariables() { boolean res = true; try { log.println("try to get a valid variable..."); - String toCheck = "$(user)"; + String toCheck = "$(user)"; String eString = oObj.substituteVariables(toCheck, false); log.println(eString); res = eString.startsWith("file:///"); @@ -74,28 +74,28 @@ public class _XStringSubstitution extends MultiMethodTest { } try { log.println("try to get a invalid variable..."); - String toCheck = "$(ThisVariableShouldNoExist)"; + String toCheck = "$(ThisVariableShouldNoExist)"; String eString = oObj.substituteVariables(toCheck,true); log.println("$(ThisVariableShouldNoExist) should not exist"); tRes.tested("substituteVariables()",false); - + } catch (com.sun.star.container.NoSuchElementException e) { log.println("expected exception was thrown."); res &= true; } - + tRes.tested("substituteVariables()",res); } public void _reSubstituteVariables() { boolean res = true; log.println("try to get a valid variable..."); - String toCheck = "file:///"; + String toCheck = "file:///"; String eString = oObj.reSubstituteVariables(toCheck); log.println(eString); res = eString.startsWith("file:///"); - + tRes.tested("reSubstituteVariables()",res); } - + } diff --git a/qadevOOo/tests/java/ifc/util/_XTextSearch.java b/qadevOOo/tests/java/ifc/util/_XTextSearch.java index 4f701c087f71..44be16079846 100644 --- a/qadevOOo/tests/java/ifc/util/_XTextSearch.java +++ b/qadevOOo/tests/java/ifc/util/_XTextSearch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java index e847a9d3132c..548f151c26b7 100644 --- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java +++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -436,7 +436,7 @@ public class _XURLTransformer extends MultiMethodTest { } asterix = "<" + asterix.substring(1,asterix.length()); asterix = asterix.substring(0,asterix.length()-1) + ">"; - + presentation = oObj.getPresentation(url, false); String expectedPresentation = "ftp://" + user + ":" + asterix + "@" + server + ":" + port + path + "/" + name; diff --git a/qadevOOo/tests/java/ifc/view/_XControlAccess.java b/qadevOOo/tests/java/ifc/view/_XControlAccess.java index 2eea43aa726d..7d8d2b377952 100644 --- a/qadevOOo/tests/java/ifc/view/_XControlAccess.java +++ b/qadevOOo/tests/java/ifc/view/_XControlAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public class _XControlAccess extends MultiMethodTest { UnoRuntime.queryInterface(XDrawPagesSupplier.class, oDoc); oDP = (XDrawPage) UnoRuntime.queryInterface(XDrawPage.class, oDPS.getDrawPages().getByIndex(0)); } else { - + XDrawPageSupplier oDPS = (XDrawPageSupplier) UnoRuntime.queryInterface(XDrawPageSupplier.class, oDoc); diff --git a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java index 60f284ff2ef2..0d91ab49a190 100644 --- a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java +++ b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ import lib.StatusException; * @see com.sun.star.view.XFormLayerAccess */ public class _XFormLayerAccess extends MultiMethodTest { - + // oObj filled by MultiMethodTest - + public XFormLayerAccess oObj = null; - + private XForm xForm = null; - + /** * checks if the object relation <CODE>XFormLayerAccess.XForm</CODE> * is available @@ -66,7 +66,7 @@ public class _XFormLayerAccess extends MultiMethodTest { throw new StatusException(Status.failed("Object raltion 'XFormLayerAccess.XForm' is null")); } } - + /** * Test disables the FormDesignMode and calls the mthod. <p> * Has <b> OK </b> status if the method returns @@ -79,26 +79,26 @@ public class _XFormLayerAccess extends MultiMethodTest { */ public void _getFromController(){ requiredMethod("setFormDesignMode()") ; - + log.println("try to get current DesignMode..."); boolean currentMode = oObj.isFormDesignMode(); log.println("DesignMode is " + currentMode); - + log.println("enable DesignMode"); oObj.setFormDesignMode(false); - + log.println("test for getFromController() "); XFormController xFormCont = oObj.getFormController(xForm); - + if (xFormCont == null) log.println("ERROR: Could not get FromContoller"); - + log.println("set back DesignMode to previouse state"); oObj.setFormDesignMode(currentMode); - + tRes.tested("getFromController()", xFormCont != null ); } - + /** * This test calls the test for <code>setFormDesignMode()</CODE>. * Has <b> OK </b> status if the test for setFormDesignMode() returns @@ -110,49 +110,49 @@ public class _XFormLayerAccess extends MultiMethodTest { */ public void _isFormDesignMode(){ requiredMethod("setFormDesignMode()") ; - + log.println("test for isFormDesignMode() is ok since test for 'setFormDesingMode()' use it"); tRes.tested("isFormDesignMode()", true); } - + /** * This test gets the current FormDesignMode, change it to the opposite and checks if the expected value of * method isFormDesignmode() was given. Then the FormDesignmode was set back to the original value.<P> * Has <B> OK </B> if expected values are returned. * */ - + public void _setFormDesignMode(){ log.println("test for setFormDesignMode() and isFormDesignMode() "); - + log.println("try to get current DesignMode..."); boolean currentMode = oObj.isFormDesignMode(); log.println("DesignMode is " + currentMode); - + log.println("try to change to " + !currentMode + "..."); oObj.setFormDesignMode(!currentMode); log.println("try to get new DesignMode..."); boolean newMode = oObj.isFormDesignMode(); log.println("DesignMode is " + newMode); - + boolean bOK = (newMode != currentMode); - + if ( !bOK) log.println("ERROR: both modes are equal"); - + log.println("set back DesignMode to " + currentMode); oObj.setFormDesignMode(currentMode); - + log.println("try to get DesignMode..."); boolean oldMode = oObj.isFormDesignMode(); - + bOK &= (bOK &(currentMode == oldMode)); - + if (currentMode != oldMode) log.println("ERROR: could not change back"); - + tRes.tested("setFormDesignMode()", bOK ); } - + } // finish class _XFormLayerAccess diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java index 387d293c359a..9e3556972081 100644 --- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,43 +58,43 @@ import lib.StatusException; * @see com.sun.star.view.XSelectionSupplier */ public class _XMultiSelectionSupplier extends MultiMethodTest { - + public XMultiSelectionSupplier oObj = null; public boolean selectionChanged = false; Object[] selections = null; Comparator ObjCompare = null; - + protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { throw new StatusException(Status.failed( "Couldn't get relation 'Selections'")); } - + ObjCompare = (Comparator)tEnv.getObjRelation("Comparer"); } - + protected void after() { disposeEnvironment(); } - + /** * Selects an instance from relation 'First'. <p> * Has <b> OK </b> status if no exceptions were thrown. <p> */ public void _addSelection() { - + boolean bOK = true; - + log.println("clear selections"); oObj.clearSelection(); - + int count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + for(int i = 0; i < selections.length; i++) { try { log.println("select object from object relation 'selections["+i+"]'"); @@ -110,7 +110,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + log.println("try to select object relation 'selections[0]' second time..."); try { count = oObj.getSelectionCount(); @@ -122,35 +122,35 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { log.println("ERROR: the selected count ("+oObj.getSelectionCount() +") is not that before (" + count + ")"); bOK = false; } - + log.println("try to select invalid object..."); try { - + oObj.addSelection(oObj); - + log.println("ERORR: expected exception 'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED"); bOK = false; } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("expected exception 'com.sun.star.lang.IllegalArgumentException' => OK"); } - + tRes.tested("addSelection()", bOK); } - + public void _removeSelection() { requiredMethod("addSelection()"); - + boolean bOK = true; - + log.println("clear selections"); oObj.clearSelection(); - + int count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + log.println("add some selections..."); for(int i = 0; i < selections.length; i++) { try { @@ -167,9 +167,9 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + log.println("try now to remove selections..."); - + count = oObj.getSelectionCount(); int oldCount = oObj.getSelectionCount(); for(int i = 0; i < selections.length; i++) { @@ -187,7 +187,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + log.println("try to remove a removed selection a second time..."); count = oObj.getSelectionCount(); try { @@ -199,22 +199,22 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { log.println("ERROR: the selected count ("+oObj.getSelectionCount() +") is not that before (" + count + ")"); bOK = false; } - + log.println("try to remove invalid object..."); try { - + oObj.removeSelection(oObj); - + log.println("ERORR: expected exception 'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED"); bOK = false; } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("expected exception 'com.sun.star.lang.IllegalArgumentException' => OK"); } - + tRes.tested("removeSelection()", bOK); } - - + + /** * First test changes selection of the object : if nothing is * currently selected or first instance ('First' relation) is @@ -230,20 +230,20 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { requiredMethod("addSelection()"); tRes.tested("getSelectionCount()", true); } - + public void _clearSelection() { requiredMethod("addSelection()"); boolean bOK = true; - + log.println("clear selections"); oObj.clearSelection(); - + int count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + log.println("add some selections..."); for(int i = 0; i < selections.length; i++) { try { @@ -260,34 +260,34 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + count = oObj.getSelectionCount(); - + log.println("clear selections..."); oObj.clearSelection(); - + count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + tRes.tested("clearSelection()", bOK); } - + public void _createSelectionEnumeration() { requiredMethod("addSelection()"); boolean bOK = true; - + log.println("clear selections"); oObj.clearSelection(); - + int count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + log.println("add some selections..."); for(int i = 0; i < selections.length; i++) { try { @@ -304,13 +304,13 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + log.println("create enumeration..."); XEnumeration xEnum = oObj.createSelectionEnumeration(); - + boolean compRes = true; //compare result int i = 0; - + while (xEnum.hasMoreElements()){ log.println("try to get first element.."); Object nextElement = null; @@ -325,15 +325,15 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { } Object shouldElement = selections[i]; i++; - + if (ObjCompare != null) { ObjCompare.compare(shouldElement, nextElement); } else { compRes = util.ValueComparer.equalValue(shouldElement, nextElement); } - + log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes); - + if (!compRes) { if ((selections[i]) instanceof Object[]){ if (((Object[])selections[i])[0] instanceof Integer) { @@ -344,23 +344,23 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { } bOK &= compRes; } - + tRes.tested("createSelectionEnumeration()", bOK); } - + public void _createReverseSelectionEnumeration() { requiredMethod("addSelection()"); boolean bOK = true; - + log.println("clear selections"); oObj.clearSelection(); - + int count = oObj.getSelectionCount(); - + bOK &= (count == 0); - + if ( ! bOK) log.println("ERROR: after clear selection I got a selection count of '" + count + "' => FAILED"); - + log.println("add some selections..."); for(int i = 0; i < selections.length; i++) { try { @@ -377,13 +377,13 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { bOK = false; } } - + log.println("create enumeration..."); XEnumeration xEnum = oObj.createSelectionEnumeration(); - + boolean compRes = true; //compare result int i = selections.length - 1; - + while (xEnum.hasMoreElements()){ log.println("try to get first element.."); Object nextElement = null; @@ -398,15 +398,15 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { } Object shouldElement = selections[i]; i--; - + if (ObjCompare != null) { ObjCompare.compare(shouldElement, nextElement); } else { compRes = util.ValueComparer.equalValue(shouldElement, nextElement); } - + log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes); - + if (!compRes) { if ((selections[i]) instanceof Object[]){ if (((Object[])selections[i])[0] instanceof Integer) { @@ -417,10 +417,10 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { } bOK &= compRes; } - + tRes.tested("createReverseSelectionEnumeration()", bOK); } - + } // finish class _XMultiSelectionSupplier diff --git a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java index acbfe6526b76..28a0c4587936 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ import lib.StatusException; public class _XPrintJobBroadcaster extends MultiMethodTest { public XPrintJobBroadcaster oObj = null; MyPrintJobListener listenerImpl = null; - + /** * Get an object implementation of the _XPrintJobListener interface from the * test environment. @@ -54,7 +54,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { throw new StatusException(Status.failed(" No test possible. The XPrintJobListener interface has to be implemented.")); } } - + /** * add the listener, see if it's called. */ @@ -64,7 +64,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { util.utils.shortWait(1000); tRes.tested("addPrintJobListener()", listenerImpl.actionTriggered()); } - + /** * remove the listener, see if it's still caleed. */ @@ -73,7 +73,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { oObj.removePrintJobListener(listenerImpl); util.utils.shortWait(5000); - + listenerImpl.reset(); listenerImpl.fireEvent(); tRes.tested("removePrintJobListener()", !listenerImpl.actionTriggered()); @@ -89,7 +89,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { XPrintable xPrintable = null; PropertyValue[]printProps = null; String printFileName = null; - + /** * Constructor * @param An object that can be cast to an XPrintable. @@ -114,7 +114,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { public boolean actionTriggered() { return eventCalled; } - + /** * Fire the event that calls the printJobEvent */ @@ -125,7 +125,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { catch(com.sun.star.lang.IllegalArgumentException e) { } } - + public void reset() { File f = new File(printFileName); if (f.exists()) @@ -146,5 +146,5 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { public void disposing(com.sun.star.lang.EventObject eventObject) { } } - + } diff --git a/qadevOOo/tests/java/ifc/view/_XPrintSettingsSupplier.java b/qadevOOo/tests/java/ifc/view/_XPrintSettingsSupplier.java index 8af56b3e5993..22dc8f08e476 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintSettingsSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintSettingsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java index d82c30012cb6..91de64107d1b 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintable.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,7 +174,7 @@ public class _XPrintable extends MultiMethodTest { try { boolean fileExists = fAcc.exists(fileURL); - + log.println("File "+fileName+" exists = "+fileExists); if (result) { diff --git a/qadevOOo/tests/java/ifc/view/_XScreenCursor.java b/qadevOOo/tests/java/ifc/view/_XScreenCursor.java index bd9e9e21fc07..ef6cfd0180c8 100644 --- a/qadevOOo/tests/java/ifc/view/_XScreenCursor.java +++ b/qadevOOo/tests/java/ifc/view/_XScreenCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ import com.sun.star.view.XScreenCursor; public class _XScreenCursor extends MultiMethodTest { // oObj filled by MultiMethodTest - + public XScreenCursor oObj = null; /** diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java index e304789f3430..d21c21709abf 100644 --- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,26 +56,26 @@ import lib.StatusException; * @see com.sun.star.view.XSelectionSupplier */ public class _XSelectionSupplier extends MultiMethodTest { - + public XSelectionSupplier oObj = null; public boolean selectionChanged = false; Object[] selections = null; Comparator ObjCompare = null; - + protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { throw new StatusException(Status.failed( "Couldn't get relation 'Selections'")); } - - ObjCompare = (Comparator)tEnv.getObjRelation("Comparer"); + + ObjCompare = (Comparator)tEnv.getObjRelation("Comparer"); } - + protected void after() { disposeEnvironment(); } - + /** * Listener implementation which just set flag when listener * method is called. @@ -86,11 +86,11 @@ public class _XSelectionSupplier extends MultiMethodTest { log.println("listener called"); selectionChanged = true; } - + } - + XSelectionChangeListener listener = new MyChangeListener(); - + /** * Test adds listener to the object, then selects first and * then second instances to be sure that selection was changed.<p> @@ -111,7 +111,7 @@ public class _XSelectionSupplier extends MultiMethodTest { } tRes.tested("addSelectionChangeListener()", res); } - + /** * Selects an instance from relation 'First'. <p> * Has <b> OK </b> status if no exceptions were thrown. <p> @@ -127,8 +127,8 @@ public class _XSelectionSupplier extends MultiMethodTest { locRes = oObj.select(selections[i]); log.println("select #" + i + ": " + locRes); Object curSelection = oObj.getSelection(); - if (locRes) { - + if (locRes) { + if (ObjCompare != null) { ObjCompare.compare(selections[i], curSelection); } else { @@ -155,10 +155,10 @@ public class _XSelectionSupplier extends MultiMethodTest { ex.printStackTrace(log); res = false; } - + tRes.tested("select()", res); } - + /** * Test removes listener, then selects first and * then second instances to be sure that selection was changed.<p> @@ -185,7 +185,7 @@ public class _XSelectionSupplier extends MultiMethodTest { } tRes.tested("removeSelectionChangeListener()", res); } - + /** * First test changes selection of the object : if nothing is * currently selected or first instance ('First' relation) is @@ -200,8 +200,8 @@ public class _XSelectionSupplier extends MultiMethodTest { public void _getSelection() { requiredMethod("select()"); tRes.tested("getSelection()", true); - } - + } + } // finish class _XSelectionSupplier diff --git a/qadevOOo/tests/java/ifc/view/_XViewSettingsSupplier.java b/qadevOOo/tests/java/ifc/view/_XViewSettingsSupplier.java index fa5b96499e5c..e35496006a7d 100644 --- a/qadevOOo/tests/java/ifc/view/_XViewSettingsSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XViewSettingsSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java index 9f41da0f4a28..d0be517bcca2 100644 --- a/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java +++ b/qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest { public void _UserDefinedAttributes() { XNameContainer uda = null; boolean res = false; - try { + try { uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), oObj.getPropertyValue("UserDefinedAttributes")); @@ -44,8 +44,8 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest { attr.Namespace = "http://www.sun.com/staroffice/apitest/Chartprop"; attr.Type="CDATA"; attr.Value="true"; - uda.insertByName("Chartprop:has-first-alien-attribute",attr); - String[] els = uda.getElementNames(); + uda.insertByName("Chartprop:has-first-alien-attribute",attr); + String[] els = uda.getElementNames(); oObj.setPropertyValue("UserDefinedAttributes",uda); uda = (XNameContainer) AnyConverter.toObject( new Type(XNameContainer.class), @@ -65,7 +65,7 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest { log.println("PropertyVetoException while getting Property 'UserDefinedAttributes'"); } catch (com.sun.star.container.ElementExistException eee) { log.println("ElementExistException while getting Property 'UserDefinedAttributes'"); - } + } tRes.tested("UserDefinedAttributes",res); } diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index 66b70aa5e020..a03d50bdbef6 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java index 64ce14d88417..9351ff0e145b 100644 --- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java index af6812b3304a..4ab9809c9bb4 100644 --- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_adabas/ODriver.java b/qadevOOo/tests/java/mod/_adabas/ODriver.java index da34026594e9..76dce8f9553c 100644 --- a/qadevOOo/tests/java/mod/_adabas/ODriver.java +++ b/qadevOOo/tests/java/mod/_adabas/ODriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ado/ODriver.java b/qadevOOo/tests/java/mod/_ado/ODriver.java index 9d59cf8e6be8..11a00fb7c8fd 100644 --- a/qadevOOo/tests/java/mod/_ado/ODriver.java +++ b/qadevOOo/tests/java/mod/_ado/ODriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java index 1dd3feb3e4ec..c59a731d8838 100644 --- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ import util.WriterTools; import util.utils; public class AccessibleShape extends TestCase { - + XTextDocument xTextDoc = null; XInterface oObj = null; - + protected void cleanup(TestParameters Param, PrintWriter log) { log.println("Cleaning up"); DesktopTools.closeDoc(xTextDoc); @@ -70,7 +70,7 @@ public class AccessibleShape extends TestCase { log.println("Couldn't close IDE"); } } - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); log.println( "creating a test environment" ); @@ -79,7 +79,7 @@ public class AccessibleShape extends TestCase { XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XFrame xFrame = xModel.getCurrentController().getFrame(); XDispatchProvider xDPP = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, xFrame); - + log.println( "opening the basic dialog editor" ); try { Object o = xMSF.createInstance("com.sun.star.frame.DispatchHelper"); @@ -101,9 +101,9 @@ public class AccessibleShape extends TestCase { } catch (Exception e) { throw new StatusException("Couldn't open Basic Dialog",e); } - + utils.shortWait(3000); - + try { oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance ("com.sun.star.awt.Toolkit") ; @@ -114,42 +114,42 @@ public class AccessibleShape extends TestCase { } AccessibilityTools at = new AccessibilityTools(); - + final XWindow basicIDE = xFrame.getContainerWindow(); - + XAccessible xRoot = at.getAccessibleObject(basicIDE); - + at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); - + // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); - + log.println("Implementation Name: " + utils.getImplName(oObj)); - + tEnv.addObjRelation("Destroy", Boolean.TRUE); - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { - public void fireEvent() { + public void fireEvent() { Rectangle oldPosSize = basicIDE.getPosSize(); Rectangle newPosSize = new Rectangle(); newPosSize.Width = oldPosSize.Width/2; newPosSize.Height = oldPosSize.Height/2; newPosSize.X = oldPosSize.X + 20; newPosSize.Y = oldPosSize.Y + 20; - basicIDE.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, - newPosSize.Height, PosSize.POSSIZE); + basicIDE.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, + newPosSize.Height, PosSize.POSSIZE); utils.shortWait(1000); - basicIDE.setPosSize(oldPosSize.X, oldPosSize.Y, oldPosSize.Width, - oldPosSize.Height, PosSize.POSSIZE); + basicIDE.setPosSize(oldPosSize.X, oldPosSize.Y, oldPosSize.Width, + oldPosSize.Height, PosSize.POSSIZE); } }); - + return tEnv; } - - - + + + } diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java index e1672dcef9d7..1a287789a9ea 100644 --- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java index ef012eb4543a..c4203e07cff5 100644 --- a/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java index 09623ec23b3b..cb83a6c2ff1c 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java index 60da66c6bdde..ad908857fd75 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java index 3bfdaf319523..ccd8956994ec 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java index 93b1060d6f3f..6bffda511898 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java index 061cd8b02a48..3918dc67341e 100644 --- a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java +++ b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java index 6908f752d591..b22b2a9b3f7b 100644 --- a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java +++ b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java index 431102a3348f..dbf57e5782ae 100644 --- a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java +++ b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java index a64fd1446fe6..56609c37c0ff 100644 --- a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java +++ b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_connector.uno/Connector.java b/qadevOOo/tests/java/mod/_connector.uno/Connector.java index 19436e0cdc68..06fec0390fa5 100644 --- a/qadevOOo/tests/java/mod/_connector.uno/Connector.java +++ b/qadevOOo/tests/java/mod/_connector.uno/Connector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java index 5bbaae1d200b..118729c01863 100644 --- a/qadevOOo/tests/java/mod/_connectr/Connector.java +++ b/qadevOOo/tests/java/mod/_connectr/Connector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java index e33462780f0c..cada4acf14d4 100644 --- a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java b/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java index 250ddfc1cf71..362311ce7cfc 100644 --- a/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java index ee30bdc2c67a..bc200665e9c5 100644 --- a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public class DLLComponentLoader extends TestCase { // adding object relation for XImplementationLoader ifc test tEnv.addObjRelation("ImplementationLoader", - "com.sun.star.loader.SharedLibrary") ; + "com.sun.star.loader.SharedLibrary") ; String os = (String) Param.get("OS"); if (os == null || os == "") throw new StatusException( diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index c515ffaf8c01..c2494f6c0541 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public class ConnectionLineAccessibility extends TestCase XComponent QueryComponent = null; String user = ""; String password=""; - + /** * Creates a new DataSource and stores it. * Creates a connection and using it @@ -105,13 +105,13 @@ public class ConnectionLineAccessibility 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()) @@ -128,24 +128,24 @@ public class ConnectionLineAccessibility extends TestCase e.printStackTrace(log); throw new StatusException(Status.failed("Couldn't create instance")); } - + String mysqlURL = (String) Param.get("mysql.url"); - + if (mysqlURL == null) { throw new StatusException(Status.failed( "Couldn't get 'mysql.url' from ini-file")); } - + user = (String) Param.get("jdbc.user"); password = (String) Param.get("jdbc.password"); - + if ((user == null) || (password == null)) { throw new StatusException(Status.failed( "Couldn't get 'jdbc.user' or 'jdbc.password' from ini-file")); } - + PropertyValue[] info = new PropertyValue[2]; info[0] = new PropertyValue(); info[0].Name = "user"; @@ -153,10 +153,10 @@ public class ConnectionLineAccessibility extends TestCase info[1] = new PropertyValue(); info[1].Name = "password"; info[1].Value = password; - + XPropertySet propSetDBSource = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oDBSource); - + try { propSetDBSource.setPropertyValue("URL", mysqlURL); @@ -186,7 +186,7 @@ public class ConnectionLineAccessibility extends TestCase throw new StatusException(Status.failed( "Couldn't set property value")); } - + try { log.println("writing database file ..."); @@ -194,7 +194,7 @@ public class ConnectionLineAccessibility extends TestCase UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource); store = (XStorable) UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument()); - + aFile = utils.getOfficeTemp((XMultiServiceFactory) Param.getMSF())+"ConnectionLine.odb"; log.println("... filename will be "+aFile); store.storeAsURL(aFile,new PropertyValue[] @@ -206,19 +206,19 @@ public class ConnectionLineAccessibility extends TestCase e.printStackTrace(log); throw new StatusException(Status.failed("Couldn't register object")); } - + isolConnection = (XIsolatedConnection) UnoRuntime.queryInterface( XIsolatedConnection.class, oDBSource); - + XConnection connection = null; XStatement statement = null; - + final String tbl_name1 = "tst_table1"; final String tbl_name2 = "tst_table2"; final String col_name1 = "id1"; final String col_name2 = "id2"; - + try { connection = isolConnection.getIsolatedConnection(user, password); @@ -251,16 +251,16 @@ public class ConnectionLineAccessibility extends TestCase throw new StatusException(Status.failed("SQLException")); } } - + XQueryDefinitionsSupplier querySuppl = (XQueryDefinitionsSupplier) UnoRuntime.queryInterface( XQueryDefinitionsSupplier.class, oDBSource); - + XNameAccess defContainer = querySuppl.getQueryDefinitions(); - + XPropertySet queryProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, newQuery); - + try { final String query = "select * from " + tbl_name1 + ", " + @@ -293,11 +293,11 @@ public class ConnectionLineAccessibility extends TestCase throw new StatusException(Status.failed( "Couldn't set property value")); } - + XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface( XNameContainer.class, defContainer); - + try { queryContainer.insertByName("Query1", newQuery); @@ -329,43 +329,43 @@ public class ConnectionLineAccessibility extends TestCase e.printStackTrace(log); throw new StatusException(Status.failed("Couldn't insert query")); } - + PropertyValue[] loadProps = new PropertyValue[3]; loadProps[0] = new PropertyValue(); loadProps[0].Name = "QueryDesignView"; loadProps[0].Value = Boolean.TRUE; - + loadProps[1] = new PropertyValue(); loadProps[1].Name = "CurrentQuery"; loadProps[1].Value = "Query1"; - + loadProps[2] = new PropertyValue(); loadProps[2].Name = "DataSource"; loadProps[2].Value = oDBSource; - + QueryComponent = DesktopTools.loadDoc((XMultiServiceFactory) Param.getMSF(),".component:DB/QueryDesign",loadProps); - + util.utils.shortWait(1000); - + xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent). getCurrentController().getFrame().getContainerWindow(); - + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - + AccessibilityTools.printAccessibleTree (log,xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - + oObj = AccessibilityTools.getAccessibleObjectForRoleIgnoreShowing(xRoot, AccessibleRole.UNKNOWN, "", "ConnectionLine"); - + log.println("ImplementationName " + util.utils.getImplName(oObj)); - + log.println("creating TestEnvironment"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + shortWait(); - + final XWindow queryWin = xWindow; - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { @@ -375,10 +375,10 @@ public class ConnectionLineAccessibility extends TestCase queryWin.setPosSize(rect.X, rect.Y, rect.Height-5, rect.Width-5, PosSize.POSSIZE); } }); - + return tEnv; } // finish method getTestEnvironment - + /** * Closes the DatasourceAdministration dialog and Query Dialog. */ @@ -386,7 +386,7 @@ public class ConnectionLineAccessibility extends TestCase { try { - + log.println("closing QueryComponent ..."); DesktopTools.closeDoc(QueryComponent); log.println("... done"); @@ -402,7 +402,7 @@ public class ConnectionLineAccessibility extends TestCase e.printStackTrace(); } } - + /** * Sleeps for 1.5 sec. to allow StarOffice to react on <code> * reset</code> call. diff --git a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java index 85ba95cc5ef2..c79c189addac 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java +++ b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java index 8ec0c0db1bfa..b882e0242558 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ public class JoinViewAccessibility extends TestCase { XComponent QueryComponent = null; String user = ""; String password=""; - + /** * Creates a new DataSource and stores it. * Creates a connection and using it @@ -104,13 +104,13 @@ public class JoinViewAccessibility 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 ()) @@ -126,24 +126,24 @@ public class JoinViewAccessibility extends TestCase { e.printStackTrace (log); throw new StatusException (Status.failed ("Couldn't create instance")); } - + String mysqlURL = (String) Param.get ("mysql.url"); - + if (mysqlURL == null) { throw new StatusException (Status.failed ( "Couldn't get 'mysql.url' from ini-file")); } - + user = (String) Param.get ("jdbc.user"); password = (String) Param.get ("jdbc.password"); - + if ((user == null) || (password == null)) { throw new StatusException (Status.failed ( "Couldn't get 'jdbc.user' or 'jdbc.password' from ini-file")); } - + PropertyValue[] info = new PropertyValue[2]; info[0] = new PropertyValue (); info[0].Name = "user"; @@ -151,10 +151,10 @@ public class JoinViewAccessibility extends TestCase { info[1] = new PropertyValue (); info[1].Name = "password"; info[1].Value = password; - + XPropertySet propSetDBSource = (XPropertySet) UnoRuntime.queryInterface ( XPropertySet.class, oDBSource); - + try { propSetDBSource.setPropertyValue ("URL", mysqlURL); @@ -180,7 +180,7 @@ public class JoinViewAccessibility extends TestCase { throw new StatusException (Status.failed ( "Couldn't set property value")); } - + try { log.println ("writing database file ..."); @@ -198,19 +198,19 @@ public class JoinViewAccessibility extends TestCase { e.printStackTrace (log); throw new StatusException (Status.failed ("Couldn't register object")); } - + isolConnection = (XIsolatedConnection) UnoRuntime.queryInterface ( XIsolatedConnection.class, oDBSource); - + XConnection connection = null; XStatement statement = null; - + final String tbl_name1 = "tst_table1"; final String tbl_name2 = "tst_table2"; final String col_name1 = "id1"; final String col_name2 = "id2"; - + try { connection = isolConnection.getIsolatedConnection (user, password); @@ -241,16 +241,16 @@ public class JoinViewAccessibility extends TestCase { throw new StatusException (Status.failed ("SQLException")); } } - + XQueryDefinitionsSupplier querySuppl = (XQueryDefinitionsSupplier) UnoRuntime.queryInterface ( XQueryDefinitionsSupplier.class, oDBSource); - + XNameAccess defContainer = querySuppl.getQueryDefinitions (); - + XPropertySet queryProp = (XPropertySet) UnoRuntime.queryInterface ( XPropertySet.class, newQuery); - + try { final String query = "select * from " + tbl_name1 + ", " + @@ -279,11 +279,11 @@ public class JoinViewAccessibility extends TestCase { throw new StatusException (Status.failed ( "Couldn't set property value")); } - + XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface ( XNameContainer.class, defContainer); - + try { queryContainer.insertByName ("Query1", newQuery); @@ -310,27 +310,27 @@ public class JoinViewAccessibility extends TestCase { e.printStackTrace (log); throw new StatusException (Status.failed ("Couldn't insert query")); } - + PropertyValue[] loadProps = new PropertyValue[3]; loadProps[0] = new PropertyValue (); loadProps[0].Name = "QueryDesignView"; loadProps[0].Value = Boolean.TRUE; - + loadProps[1] = new PropertyValue (); loadProps[1].Name = "CurrentQuery"; loadProps[1].Value = "Query1"; - + loadProps[2] = new PropertyValue (); loadProps[2].Name = "DataSource"; loadProps[2].Value = oDBSource; - + QueryComponent = DesktopTools.loadDoc ((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps); - + xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent). getCurrentController().getFrame().getContainerWindow(); - + XAccessible xRoot = AccessibilityTools.getAccessibleObject (xWindow); - + AccessibilityTools.printAccessibleTree (log,xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.VIEW_PORT); @@ -345,7 +345,7 @@ public class JoinViewAccessibility extends TestCase { final XWindow queryWin = xWindow; - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { Rectangle rect = queryWin.getPosSize(); @@ -359,10 +359,10 @@ public class JoinViewAccessibility extends TestCase { /** * Closes the DatasourceAdministration dialog and Query Dialog. */ - protected void cleanup(TestParameters Param, PrintWriter log) { + protected void cleanup(TestParameters Param, PrintWriter log) { try { - + log.println ("closing QueryComponent ..."); DesktopTools.closeDoc (QueryComponent); log.println ("... done"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java index 0d06f813396d..82c9a2afd9c0 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java index 0cec0c8b1b28..d7741e30d6d4 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,15 +120,15 @@ public class ODatabaseContext extends TestCase { UnoRuntime.queryInterface(XPropertySet.class, oInterface) ; xDSProps.setPropertyValue("URL", "sdbc:dbase:file:///.") ; - + XDocumentDataSource xDDS = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class, oInterface); XStorable store = (XStorable) UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument ()); String aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"DatabaseContext.odb"; log.println("store to '" + aFile + "'"); - store.storeAsURL(aFile,new PropertyValue[]{}); - + store.storeAsURL(aFile,new PropertyValue[]{}); + tEnv.addObjRelation("XNamingService.RegisterObject", oInterface) ; tEnv.addObjRelation("INSTANCE", oInterface); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index 05ddc216df88..616fe4965cb3 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,13 +98,13 @@ public class ODatabaseSource extends TestCase { protected void initialize ( TestParameters Param, PrintWriter log) { uniqueSuffix = uniqueSuffixStat++ ; } - + protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing not longer needed docs... "); DesktopTools.closeDoc(xDBDoc); } - - + + /** * Creating a Testenvironment for the interfaces to be tested. @@ -133,7 +133,7 @@ public class ODatabaseSource extends TestCase { try{ oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); - if (oInterface == null) + if (oInterface == null) throw new StatusException("Could not get service 'com.sun.star.sdb.DatabaseContext'", new Exception()); }catch( Exception e ) { @@ -153,8 +153,8 @@ public class ODatabaseSource extends TestCase { try{ XInterface oDatabaseDoc = (XInterface) xMSF.createInstance ("com.sun.star.sdb.OfficeDatabaseDocument") ; - - if (oDatabaseDoc == null) + + if (oDatabaseDoc == null) throw new StatusException("Could not get service 'com.sun.star.sdb.OfficeDatabaseDocument'", new Exception()); xDBDoc = (XOfficeDatabaseDocument) UnoRuntime.queryInterface( @@ -169,12 +169,12 @@ public class ODatabaseSource extends TestCase { oObj = (XInterface) xDBDoc.getDataSource(); log.println("ImplementationName: " + utils.getImplName(oObj)); - + // Creating new DBase data source in the TEMP directory XPropertySet xSrcProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oObj); - + try{ xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; } catch ( UnknownPropertyException e){ @@ -198,7 +198,7 @@ public class ODatabaseSource extends TestCase { // registering source in DatabaseContext XStorable store = (XStorable) UnoRuntime.queryInterface(XStorable.class, xDBDoc); - String aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"DataSource.odb"; + String aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"DataSource.odb"; try{ store.storeAsURL(aFile,new PropertyValue[]{}); } catch (IOException e){ @@ -210,16 +210,16 @@ public class ODatabaseSource extends TestCase { e.printStackTrace (); throw new StatusException("Could not save ", e) ; } - + try{ - xDBContextNameServ.registerObject(databaseName, oObj) ; + xDBContextNameServ.registerObject(databaseName, oObj) ; } catch (Exception e){ log.println("Could not register data source" ); e.printStackTrace (); throw new StatusException("Could not register ", e) ; } - + log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java index ed64db1081eb..92a5004dcac5 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index 867888684ee2..c13fc05bacc3 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public class ODatasourceBrowser extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory)Param.getMSF())); System.setProperty("hideMe", "false"); @@ -182,7 +182,7 @@ public class ODatasourceBrowser extends TestCase { * @see com.sun.star.frame.XController * @see com.sun.star.frame.XDispatchProvider */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("creating a test environment"); @@ -214,7 +214,7 @@ public class ODatasourceBrowser extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); @@ -273,15 +273,15 @@ public class ODatasourceBrowser extends TestCase { shortWait(); - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CommandButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel shapeModel = aShape.getControl(); XControlAccess xCtrlAccess = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, secondController); XControl xCtrl = null; @@ -292,7 +292,7 @@ public class ODatasourceBrowser extends TestCase { e.printStackTrace(log); } - XWindow docWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow docWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, xCtrl); log.println("creating a new environment for ODatasourceBrowser object"); @@ -312,7 +312,7 @@ public class ODatasourceBrowser extends TestCase { // Addig relation for XDispatchProvider - tEnv.addObjRelation("XDispatchProvider.URL", + tEnv.addObjRelation("XDispatchProvider.URL", ".uno:DataSourceBrowser/FormLetter"); return tEnv; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java index 947fa6b1c9fe..93652025b748 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 73850dbaf64b..6f1e677d7d8b 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,12 +89,12 @@ public class OQueryDesign extends TestCase { XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); XNameAccess xNameAccess = null; - + // we use the first datasource - XDataSource xDS = null; + XDataSource xDS = null; try { xNameAccess = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, + XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); } catch (Exception ex) { ex.printStackTrace( log ); @@ -112,13 +112,13 @@ public class OQueryDesign extends TestCase { } try { xNameAccess = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, + XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); } catch (Exception ex) { ex.printStackTrace( log ); throw new StatusException( "Could not get DatabaseConext", ex ); } - + log.println("check XMultiServiceFactory"); try { @@ -149,14 +149,14 @@ public class OQueryDesign extends TestCase { shortWait(); Object oDBC = null; - + try { oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); } catch( com.sun.star.uno.Exception e ) { throw new StatusException("Could not instantiate DatabaseContext", e) ; } - + Object oDataSource = null; try{ XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oDBC); @@ -168,11 +168,11 @@ public class OQueryDesign extends TestCase { } XDocumentDataSource xDDS = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); // XModel xMod = (XModel) UnoRuntime.queryInterface(XModel.class, xDDS.getDatabaseDocument ()); - + // Frame = xMod.getCurrentController().getFrame(); - + xFrame = DesktopTools.getCurrentFrame(xMSF); - + // get an instance of Frame Object oFrame = null; SOfficeFactory SOF = null; @@ -187,9 +187,9 @@ public class OQueryDesign extends TestCase { } XModel xDocMod = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); - + XFrame xTextFrame = xDocMod.getCurrentController().getFrame(); - + Object[] params = new Object[3]; param1 = new PropertyValue(); param1.Name = "DataSourceName"; @@ -204,9 +204,9 @@ public class OQueryDesign extends TestCase { param3.Value = new Boolean(true); params[2] = param3; - + oObj = xFrame.getController(); - + TestEnvironment tEnv = new TestEnvironment(oObj); //Adding ObjRelations for XInitialization @@ -227,12 +227,12 @@ public class OQueryDesign extends TestCase { PropertyValue ExceptionParam3 = new PropertyValue(); ExceptionParam3.Name = "QueryDesignView"; ExceptionParam3.Value = new Integer(17);//new Boolean(true); - ExceptionParams[2] = ExceptionParam3; + ExceptionParams[2] = ExceptionParam3; tEnv.addObjRelation("XInitialization.ExceptionArgs", ExceptionParams); tEnv.addObjRelation("Frame", xFrame); - + tEnv.addObjRelation("XInitialization.xIni", getUnititializedObj(Param)); log.println("ImplementationName: "+util.utils.getImplName(oObj)); @@ -240,14 +240,14 @@ public class OQueryDesign extends TestCase { return tEnv; } // finish method getTestEnvironment - + private XInitialization getUnititializedObj(TestParameters Param){ // creating an object wihch ist not initialized - + // get a model of a DataSource Object oDBC = null; XMultiServiceFactory xMSF; - + try { xMSF = (XMultiServiceFactory)Param.getMSF(); oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); @@ -255,7 +255,7 @@ public class OQueryDesign extends TestCase { catch( com.sun.star.uno.Exception e ) { throw new StatusException("Could not instantiate DatabaseContext", e) ; } - + Object oDataSource = null; try{ XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oDBC); @@ -265,7 +265,7 @@ public class OQueryDesign extends TestCase { } catch ( com.sun.star.lang.WrappedTargetException e){ throw new StatusException("could not get '" + sDataSourceName + "'" , e) ; } - + XDocumentDataSource xDDS = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); XModel xMod = (XModel) UnoRuntime.queryInterface(XModel.class, xDDS.getDatabaseDocument ()); @@ -276,9 +276,9 @@ public class OQueryDesign extends TestCase { }catch( com.sun.star.uno.Exception e ) { throw new StatusException("Could not instantiate QueryDesign", e) ; } - + XController xCont = (XController) UnoRuntime.queryInterface(XController.class, oQueryDesign); - + // marry them all xCont.attachModel(xMod); xMod.connectController(xCont); @@ -287,13 +287,13 @@ public class OQueryDesign extends TestCase { } catch (com.sun.star.container.NoSuchElementException e){ throw new StatusException("Could not set controller", e) ; } - + //xCont.attachFrame(xFrame); - + return (XInitialization) UnoRuntime.queryInterface(XInitialization.class, oQueryDesign); - + } - + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { try { @@ -306,7 +306,7 @@ public class OQueryDesign extends TestCase { } catch (com.sun.star.lang.DisposedException e) { log.println("Connection was already closed. It's OK.") ; } - + } /** diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index c349d5dcdb28..a7a9cac89c50 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -255,7 +255,7 @@ public class ORowSet extends TestCase { XMultiServiceFactory orb = (XMultiServiceFactory)Param.getMSF(); uniqueSuffix++; boolean envCreatedOK = false ; - + //initialize test table if (isMySQLDB) { @@ -296,7 +296,7 @@ public class ORowSet extends TestCase { while ( !utils.tryOverwriteFile( orb, oldF, newF ) ); m_tableFile = newF; } - + try { m_rowSet = orb.createInstance("com.sun.star.sdb.RowSet"); @@ -310,7 +310,7 @@ public class ORowSet extends TestCase { rowSetProps.setPropertyValue("CommandType", new Integer(CommandType.TABLE)); - final XRowSet rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSet); + final XRowSet rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSet); rowSet.execute(); m_connection = UnoRuntime.queryInterface( XConnection.class, rowSetProps.getPropertyValue("ActiveConnection") ); @@ -578,16 +578,16 @@ public class ORowSet extends TestCase { public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { private boolean handlerWasUsed = false; private PrintWriter log = new PrintWriter(System.out); - + public boolean checkInteractionHandler() { return handlerWasUsed; } - + 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; @@ -602,7 +602,7 @@ public class ORowSet extends TestCase { log.println("### This is not implemented in ORowSet.InteractionHandlerImpl test -> abort."); abort = true; } - + XInteractionContinuation[]xCont = xInteractionRequest.getContinuations(); XInteractionSupplyParameters xParamCallback = null; for(int i=0; i<xCont.length; i++) { @@ -631,14 +631,14 @@ public class ORowSet extends TestCase { xParamCallback.select(); } else { // we should never reach this: abort has to be true first. - log.println("### _XCompletedExecution.InteractionHandlerImpl: Got no " + + log.println("### _XCompletedExecution.InteractionHandlerImpl: Got no " + "'XInteractionSupplyParameters' and no 'XInteractionAbort'."); } } - + public void setLog(PrintWriter log) { this.log = log; } - + } } diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java index 0b4ce3886df9..c4efa6a963b6 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ public class OSQLMessageDialog extends TestCase { log.println("could not create instacne of 'com.sun.star.awt.Toolkit'" ); throw new StatusException("could not create instacne of 'com.sun.star.awt.Toolkit'", e) ; } - + // Describe the properties of the container window. com.sun.star.awt.WindowDescriptor aDescriptor = new com.sun.star.awt.WindowDescriptor(); @@ -131,7 +131,7 @@ public class OSQLMessageDialog extends TestCase { com.sun.star.awt.XWindowPeer xPeer = null; try{ - + xPeer = xToolkit.createWindow(aDescriptor) ; } catch (com.sun.star.lang.IllegalArgumentException e){ @@ -140,8 +140,8 @@ public class OSQLMessageDialog extends TestCase { } com.sun.star.awt.XWindow xWindow = (com.sun.star.awt.XWindow)UnoRuntime.queryInterface ( - com.sun.star.awt.XWindow .class, xPeer); - + com.sun.star.awt.XWindow .class, xPeer); + log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 3fc9815fc904..d2b05478873c 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,15 +188,15 @@ public class OSingleSelectQueryComposer extends TestCase { xMSF = (XMultiServiceFactory)Param.getMSF(); XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface( - XNameAccess.class, + XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); // we use the first datasource XDataSource xDS = (XDataSource)UnoRuntime.queryInterface( - XDataSource.class, xNameAccess.getByName( "Bibliography" )); - + XDataSource.class, xNameAccess.getByName( "Bibliography" )); + log.println("check XMultiServiceFactory"); XMultiServiceFactory xConn = (XMultiServiceFactory) - UnoRuntime.queryInterface(XMultiServiceFactory.class, + UnoRuntime.queryInterface(XMultiServiceFactory.class, xDS.getConnection(new String(),new String())); log.println("check getAvailableServiceNames"); @@ -205,7 +205,7 @@ public class OSingleSelectQueryComposer extends TestCase { { log.println("Service 'SingleSelectQueryComposer' not supported"); } - + oInterface = (XInterface) xConn.createInstance( sServiceNames[0]); if (oInterface == null) { @@ -229,26 +229,26 @@ public class OSingleSelectQueryComposer extends TestCase { oRowSet) ; xORowSet.execute() ; - + XColumnsSupplier xColSup = (XColumnsSupplier) UnoRuntime.queryInterface(XColumnsSupplier.class, oRowSet); - + XNameAccess xCols = xColSup.getColumns(); - + XPropertySet xCol = (XPropertySet) AnyConverter.toObject( new Type(XPropertySet.class), xCols.getByName(xCols.getElementNames()[0])); - + XSingleSelectQueryAnalyzer xQueryAna = (XSingleSelectQueryAnalyzer) UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oInterface); - + // XSingleSelectQueryComposer XSingleSelectQueryComposer xComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, xQueryAna); xQueryAna.setQuery("SELECT * FROM \"biblio\""); - + oObj = (XInterface) oInterface; log.println("ImplementationName: " + utils.getImplName(oObj)); @@ -257,13 +257,13 @@ public class OSingleSelectQueryComposer extends TestCase { // for XSingleSelectQueryAnalyzer tEnv.addObjRelation("xComposer", xComposer); - + // for XSingleSelectQueryComposer tEnv.addObjRelation("xQueryAna", xQueryAna); - + tEnv.addObjRelation("xProp", xCol); tEnv.addObjRelation("colName", xCols.getElementNames()[0]); - + envCreatedOK = true ; return tEnv; diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java index 020b58594957..01c1713199f9 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java +++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,12 +168,12 @@ public class SbaXGridControl extends TestCase { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XInterface button = AccessibilityTools.getAccessibleObjectForRole(xRoot, + XInterface button = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON); XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( @@ -234,7 +234,7 @@ public class SbaXGridControl extends TestCase { * inserted into collection. Is a column instance.</li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -258,7 +258,7 @@ public class SbaXGridControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); try { @@ -321,7 +321,7 @@ public class SbaXGridControl extends TestCase { // creating another window - aShape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + aShape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -331,7 +331,7 @@ public class SbaXGridControl extends TestCase { //Try to query XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the TextControl @@ -353,11 +353,11 @@ public class SbaXGridControl extends TestCase { //Relations for XSelectionSupplier - tEnv.addObjRelation("Selections", + tEnv.addObjRelation("Selections", new Object[] { new Object[] { new Integer(0) }, new Object[] { new Integer(1) } }); - tEnv.addObjRelation("Comparer", + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { return ((Integer) o1).compareTo((Integer)o2); @@ -407,7 +407,7 @@ public class SbaXGridControl extends TestCase { final XLoadable formLoaderF = formLoader; final XPropertySet ps = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aControl2); - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new ifc.form._XUpdateBroadcaster.UpdateChecker() { private String lastText = ""; @@ -424,7 +424,7 @@ public class SbaXGridControl extends TestCase { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); @@ -441,7 +441,7 @@ public class SbaXGridControl extends TestCase { return tEnv; } // finish method getTestEnvironment - public static XControlShape createGrid(XComponent oDoc, int height, + public static XControlShape createGrid(XComponent oDoc, int height, int width, int x, int y) { Size size = new Size(); Point position = new Point(); @@ -450,7 +450,7 @@ public class SbaXGridControl extends TestCase { //get MSF XMultiServiceFactory oDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, oDoc); try { @@ -460,7 +460,7 @@ public class SbaXGridControl extends TestCase { "com.sun.star.form.component.GridControl"); XPropertySet model_props = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aCon); - model_props.setPropertyValue("DefaultControl", + model_props.setPropertyValue("DefaultControl", "com.sun.star.form.control.InteractionGridControl"); aControl = (XControlModel) UnoRuntime.queryInterface( XControlModel.class, aCon); diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index 4c39c1590890..7b5827a2475e 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,14 +95,14 @@ public class TableWindowAccessibility extends TestCase { * Creates a new query and adds it to DefinitionContainer. * Opens the QueryComponent.with loadComponentFromURL * and gets the object with the role PANEL and the implementation - * name that contains TabelViewAccessibility + * name that contains TabelViewAccessibility * @param Param test parameters * @param log writer to log information while testing * @return * @throws StatusException * @see TestEnvironment */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -110,7 +110,7 @@ public class TableWindowAccessibility extends TestCase { Object oDBSource = null; Object newQuery = null; Object toolkit = null; - XStorable store = null; + XStorable store = null; try { oDBContext = ((XMultiServiceFactory) Param.getMSF()) @@ -189,7 +189,7 @@ public class TableWindowAccessibility extends TestCase { } isolConnection = (XIsolatedConnection) UnoRuntime.queryInterface( - XIsolatedConnection.class, + XIsolatedConnection.class, oDBSource); XConnection connection = null; @@ -205,21 +205,21 @@ public class TableWindowAccessibility extends TestCase { statement = connection.createStatement(); statement.executeUpdate("drop table if exists " + tbl_name1); statement.executeUpdate("drop table if exists " + tbl_name2); - statement.executeUpdate("create table " + tbl_name1 + " (" + + statement.executeUpdate("create table " + tbl_name1 + " (" + col_name1 + " int)"); - statement.executeUpdate("create table " + tbl_name2 + " (" + + statement.executeUpdate("create table " + tbl_name2 + " (" + col_name2 + " int)"); } catch (com.sun.star.sdbc.SQLException e) { try { shortWait(); - connection = isolConnection.getIsolatedConnection(user, + connection = isolConnection.getIsolatedConnection(user, password); statement = connection.createStatement(); statement.executeUpdate("drop table if exists " + tbl_name1); statement.executeUpdate("drop table if exists " + tbl_name2); - statement.executeUpdate("create table " + tbl_name1 + " (" + + statement.executeUpdate("create table " + tbl_name1 + " (" + col_name1 + " int)"); - statement.executeUpdate("create table " + tbl_name2 + " (" + + statement.executeUpdate("create table " + tbl_name2 + " (" + col_name2 + " int)"); } catch (com.sun.star.sdbc.SQLException e2) { e2.printStackTrace(log); @@ -228,7 +228,7 @@ public class TableWindowAccessibility extends TestCase { } XQueryDefinitionsSupplier querySuppl = (XQueryDefinitionsSupplier) UnoRuntime.queryInterface( - XQueryDefinitionsSupplier.class, + XQueryDefinitionsSupplier.class, oDBSource); XNameAccess defContainer = querySuppl.getQueryDefinitions(); @@ -237,9 +237,9 @@ public class TableWindowAccessibility extends TestCase { XPropertySet.class, newQuery); try { - final String query = "select * from " + tbl_name1 + ", " + - tbl_name2 + " where " + tbl_name1 + "." + - col_name1 + "=" + tbl_name2 + "." + + final String query = "select * from " + tbl_name1 + ", " + + tbl_name2 + " where " + tbl_name1 + "." + + col_name1 + "=" + tbl_name2 + "." + col_name2; queryProp.setPropertyValue("Command", query); } catch (com.sun.star.lang.WrappedTargetException e) { @@ -261,7 +261,7 @@ public class TableWindowAccessibility extends TestCase { } XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface( - XNameContainer.class, + XNameContainer.class, defContainer); try { @@ -284,34 +284,34 @@ public class TableWindowAccessibility extends TestCase { e.printStackTrace(log); throw new StatusException(Status.failed("Couldn't insert query")); } - + PropertyValue[] loadProps = new PropertyValue[3]; loadProps[0] = new PropertyValue(); loadProps[0].Name = "QueryDesignView"; loadProps[0].Value = Boolean.TRUE; - + loadProps[1] = new PropertyValue(); loadProps[1].Name = "CurrentQuery"; - loadProps[1].Value = "Query1"; - + loadProps[1].Value = "Query1"; + loadProps[2] = new PropertyValue(); loadProps[2].Name = "DataSource"; - loadProps[2].Value = oDBSource; - + loadProps[2].Value = oDBSource; + QueryComponent = DesktopTools.loadDoc((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps); - + xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent). getCurrentController().getFrame().getContainerWindow(); - XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree (log,xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", - "TableWindowAccessibility"); - + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", + "TableWindowAccessibility"); + log.println("ImplementationName " + util.utils.getImplName(oObj)); - + log.println("creating TestEnvironment ... done"); TestEnvironment tEnv = new TestEnvironment(oObj); @@ -319,21 +319,21 @@ public class TableWindowAccessibility extends TestCase { shortWait(); XAccessibleComponent accComp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - + final Point point = accComp.getLocationOnScreen(); - - tEnv.addObjRelation("EventProducer", + + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { - try { + try { Robot rob = new Robot(); rob.mouseMove(point.X + 2, point.Y + 7); - rob.mousePress(InputEvent.BUTTON1_MASK); + rob.mousePress(InputEvent.BUTTON1_MASK); rob.mouseMove(point.X + 400, point.Y); - rob.mouseRelease (InputEvent.BUTTON1_MASK); + rob.mouseRelease (InputEvent.BUTTON1_MASK); } catch (java.awt.AWTException e) { System.out.println("desired child doesn't exist"); } @@ -346,10 +346,10 @@ public class TableWindowAccessibility extends TestCase { /** * Closes all open documents. */ - protected void cleanup(TestParameters Param, PrintWriter log) { + protected void cleanup(TestParameters Param, PrintWriter log) { try { - + log.println ("closing QueryComponent ..."); DesktopTools.closeDoc (QueryComponent); log.println ("... done"); @@ -364,7 +364,7 @@ public class TableWindowAccessibility extends TestCase { e.printStackTrace (); } } - + /** * Sleeps for 1.5 sec. to allow StarOffice to react on <code> diff --git a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java index 1ee00f74753f..eb00a417afd0 100644 --- a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java +++ b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java index baa1d5488be0..6f2e850c5ffe 100644 --- a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public class NestedRegistry extends TestCase { */ protected void copyFile(String src, String dst, PrintWriter log) throws java.io.IOException { - log.println("Copy File "+src+" to "+dst); + log.println("Copy File "+src+" to "+dst); File srcF = new File(src) ; File dstF = new File(dst) ; diff --git a/qadevOOo/tests/java/mod/_dtrans/generic.java b/qadevOOo/tests/java/mod/_dtrans/generic.java index 6af6f1f1a2e8..cbcba7a9b4b2 100644 --- a/qadevOOo/tests/java/mod/_dtrans/generic.java +++ b/qadevOOo/tests/java/mod/_dtrans/generic.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java index f0577f6ba628..b947b237298c 100644 --- a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java +++ b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_file/calc/ODriver.java b/qadevOOo/tests/java/mod/_file/calc/ODriver.java index 0bb05fd82670..8ffd03254d4c 100644 --- a/qadevOOo/tests/java/mod/_file/calc/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/calc/ODriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java index 14884a39b193..572b2b637855 100644 --- a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_file/flat/ODriver.java b/qadevOOo/tests/java/mod/_file/flat/ODriver.java index e6d293474a85..fb28efebd2f5 100644 --- a/qadevOOo/tests/java/mod/_file/flat/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/flat/ODriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java index 3c4a33d2bbc5..d2a19f1418f9 100644 --- a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java +++ b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fop/FolderPicker.java b/qadevOOo/tests/java/mod/_fop/FolderPicker.java index fc400efb1783..8f3ed5536ea8 100644 --- a/qadevOOo/tests/java/mod/_fop/FolderPicker.java +++ b/qadevOOo/tests/java/mod/_fop/FolderPicker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index dce88234885f..8ddbbc293a06 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,19 +138,19 @@ public class GenericModelTest extends TestCase { private static DBTools.DataSourceInfo m_srcInf = null; /** * This is the name of the Data Base which the test uses: "APITestDatabase" - */ + */ protected final static String m_dbSourceName = "APITestDatabase"; protected final static String m_TestDB = "TestDB"; private DBTools m_dbTools = null; - + private static boolean m_ConnectionColsed = false; - + /** * descibes the kind of the shape which should be created. * Example: m_kindOfshape=DateFiled - */ + */ public static String m_kindOfControl = null; - + /** * If your object needs some special propery values you can specify them with this * <CODE>ArrayList</CODE>. You have to add a <CODE>NamedValue</CODE> to this list. @@ -159,9 +159,9 @@ public class GenericModelTest extends TestCase { * myProp.Name = "Test"; * myProp.Value = "My special Value"; * m_propertiesToSet.add(myProp); - */ + */ public static ArrayList m_propertiesToSet = new ArrayList(); - + /** * This variable contains the name of the property which should be changed while * interface <CODE>com::sun::star::form::XUpdateBroadcaster</CODE> is tested. The @@ -169,7 +169,7 @@ public class GenericModelTest extends TestCase { * "XUpdateBroadcaster.Checker" which is a <CODE>ifc.form._XUpdateBroadcaster.UpdateChecker</CODE>. * @see ifc.form._XUpdateBroadcaster.UpdateChecker * @see ifc.form._XUpdateBroadcaster - */ + */ public static String m_ChangePropertyName = null; /** * This variable contains the value the property should be set while @@ -180,28 +180,28 @@ public class GenericModelTest extends TestCase { * the value of the property. If the current of this property is NULL the * <CODE>ValueChanger</CODE> is unable to change the value. In this case the value * of this variable was used. - */ + */ public static Object m_ChangePropertyValue = null; - + /** * This variable contains the implelemtation name of the object. - */ + */ public static String m_ObjectName = null; - + /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>FormLoader</CODE> - */ + */ protected static XLoadable m_XFormLoader = null; /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>XPropertySet</CODE> - */ + */ protected static XPropertySet m_XPS = null; /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>Control</CODE> - */ + */ protected static XInterface m_XCtrl = null; /** * The insterface test of <CODE>ifc.form._DataWareControlModel</CODE> expects an @@ -211,16 +211,16 @@ public class GenericModelTest extends TestCase { * @see ifc.form._DataAwareControlModel */ protected static String m_LCShape_Type = null; - + protected static String m_XPropertyAccess_propertyToChange = "HelpText"; - + protected static String m_XPropertyContainer_propertyNotRemovable = "HelpText"; /** - * If this variable is true some more debug info was logged. It was setted by the parameter variable + * If this variable is true some more debug info was logged. It was setted by the parameter variable * <code>debug_is_active</code> */ protected static boolean debug = false; - + /** * Creates Writer document where controls are placed. * @param tParam the test paremter @@ -244,19 +244,19 @@ public class GenericModelTest extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("closing connection..."); - + // some interface tests call cleanup to reset the environment. If such // a test is the last one cleanup was called twice. The second call // causes then nasty exceptions... if (m_ConnectionColsed) return; - + try { - XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), + XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), (FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc))) .getByName("Standard")); - + if (debug){ if (myForm == null){ log.println("ERROR: could not get 'Standard' from drawpage!"); @@ -266,18 +266,18 @@ public class GenericModelTest extends TestCase { for (int i = 0; i< elements.length; i++){ log.println("Element[" + i + "] :" + elements[i]); } - + } - + XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, myForm); XConnection connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), + new Type(XConnection.class), xSetProp.getPropertyValue("ActiveConnection")); if (debug && connection == null){ log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); } - + connection.close(); } catch (Exception e) { log.println("ERROR: Can't close the connection: " + e.toString()); @@ -306,7 +306,7 @@ public class GenericModelTest extends TestCase { } catch (Exception e) { log.println("ERROR: couldn't close data source: " + e.toString()); } - + log.println("disposing data source..."); try { XComponent dataSourceComp = (XComponent)UnoRuntime.queryInterface( @@ -316,7 +316,7 @@ public class GenericModelTest extends TestCase { catch (Exception e) { log.println("couldn't dispose the data source"); } - + log.println("closing document..."); try { @@ -338,7 +338,7 @@ public class GenericModelTest extends TestCase { } catch (com.sun.star.uno.Exception e) { log.println("ERROR: Error while object test cleaning up: " + e.toString()); } - + m_ConnectionColsed = true; } @@ -377,40 +377,40 @@ public class GenericModelTest extends TestCase { * @param log the log writer * @return a test environment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XControlShape aShape = null; XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); - + try{ log.println("adding contol shape '" + m_kindOfControl + "'"); - aShape = FormTools.createControlShape(m_xTextDoc, 3000, - 4500, 15000, 10000, + aShape = FormTools.createControlShape(m_xTextDoc, 3000, + 4500, 15000, 10000, m_kindOfControl); } catch (Exception e){ e.printStackTrace(log); - throw new StatusException("Couldn't create following control shape (m_kindOfControl): '" + + throw new StatusException("Couldn't create following control shape (m_kindOfControl): '" + m_kindOfControl + "': ", e); - + } WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape); oObj = aShape.getControl(); - + log.println("Implementation name: " + util.utils.getImplName(oObj)); try { String sourceTestDB = utils.getFullURL(utils.getFullTestDocName("TestDB/testDB.dbf")); String destTestDB = utils.getOfficeTemp(xMSF); destTestDB = utils.getFullURL(destTestDB + "testDB.dbf"); - + log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'"); utils.copyFile(xMSF, sourceTestDB, destTestDB); - + m_dbTools = new DBTools( xMSF, log ); String tmpDir = utils.getOfficeTemp((xMSF)); - + m_srcInf = m_dbTools.newDataSourceInfo(); m_srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); log.println("data source: " + m_srcInf.URL); @@ -418,7 +418,7 @@ public class GenericModelTest extends TestCase { m_dbSrc = m_srcInf.getDataSourceService(); m_dbTools.reRegisterDB(m_dbSourceName, m_dbSrc); - m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, + m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, m_TestDB); } catch (com.sun.star.uno.Exception e) { log.println("!!! Can't access TestDB !!!"); @@ -429,25 +429,25 @@ public class GenericModelTest extends TestCase { log.println("creating a new environment for object"); TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", m_ObjectName); - + log.println("adding shape '" + m_LCShape_Type +"' for DataAwareControlModel test"); - aShape = FormTools.createControlShape(m_xTextDoc, 6000, 4500, 15000, + aShape = FormTools.createControlShape(m_xTextDoc, 6000, 4500, 15000, 10000, m_LCShape_Type); WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape); m_XPS = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); - + int i = 0; NamedValue prop = null; try { for (i = 0; i < m_propertiesToSet.size(); i++){ prop = (NamedValue) m_propertiesToSet.get(i); - + log.println("setting property: '"+prop.Name+"' to value '"+prop.Value.toString()+"'"); - + m_XPS.setPropertyValue(prop.Name, prop.Value); } } catch (com.sun.star.lang.WrappedTargetException e) { @@ -475,12 +475,12 @@ public class GenericModelTest extends TestCase { // adding relation for XUpdateBroadcaster m_XCtrl = oObj; - - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); // adding relation for DataAwareControlModel service - tEnv.addObjRelation("DataAwareControlModel.NewFieldName", + tEnv.addObjRelation("DataAwareControlModel.NewFieldName", DBTools.TST_DATE_F); //adding ObjRelation for XPersistObject @@ -490,18 +490,18 @@ public class GenericModelTest extends TestCase { java.util.HashSet exclude = new java.util.HashSet(); exclude.add("FormatKey"); tEnv.addObjRelation("XFastPropertySet.ExcludeProps", exclude); - + PropertyValue propVal = new PropertyValue(); propVal.Name = m_XPropertyAccess_propertyToChange; propVal.Value = "Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", propVal); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", m_XPropertyContainer_propertyNotRemovable); - + return tEnv; } // finish method getTestEnvironment - - + + static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker { private Object lastValue = null; XLoadable formLoaderF = null; @@ -509,7 +509,7 @@ public class GenericModelTest extends TestCase { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -517,26 +517,26 @@ public class GenericModelTest extends TestCase { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + public void update() throws com.sun.star.uno.Exception { if (!formLoaderF.isLoaded()) { formLoaderF.load(); } lastValue = util.ValueChanger.changePValue(ps.getPropertyValue(ChangePropertyName)); - + if (lastValue == null){ if (ChangePropertyValue != null){ - + lastValue = ChangePropertyValue; - + } else { - + String msg = "The initial value of the property '" + ChangePropertyName + "' is NULL\n"; msg += "The member variable 'm_ChangePropertyValue' is NULL\n"; msg += "Could not change Property."; - + throw new StatusException(Status.failed(msg)); } } @@ -547,7 +547,7 @@ public class GenericModelTest extends TestCase { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index d6bff70496db..7d21c2deead6 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,7 +119,7 @@ public class OButtonControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } @@ -152,7 +152,7 @@ public class OButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -162,16 +162,16 @@ public class OButtonControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CommandButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -180,7 +180,7 @@ public class OButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -212,7 +212,7 @@ public class OButtonControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java index 5c5618f5167e..b648236a9533 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ import lib.TestParameters; * @see ifc.lang._XComponent */ public class OButtonModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -98,17 +98,17 @@ public class OButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="CommandButton"; - + super.m_ObjectName = "stardiv.one.form.component.CommandButton"; - + super.m_LCShape_Type = "CommandButton"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -118,8 +118,8 @@ public class OButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -130,5 +130,5 @@ public class OButtonModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class OButtonModelold diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index fc01ddfc9c04..70ee585e3083 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ public class OCheckBoxControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java index 9a569c833470..342e6d6aff48 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,13 +115,13 @@ public class OCheckBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl= "CheckBox"; - + super.m_ObjectName = "stardiv.one.form.component.CheckBox"; - + super.m_LCShape_Type = "FixedText"; } @@ -133,7 +133,7 @@ public class OCheckBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -141,7 +141,7 @@ public class OCheckBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index bc9c315e9443..5e21356f623b 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ public class OComboBoxControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -174,16 +174,16 @@ public class OComboBoxControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "ComboBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -192,7 +192,7 @@ public class OComboBoxControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -225,14 +225,14 @@ public class OComboBoxControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java index 4f3b256fa982..326ccda4554d 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,22 +123,22 @@ public class OComboBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="ComboBox"; - + super.m_ObjectName = "stardiv.one.form.component.ComboBox"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -148,7 +148,7 @@ public class OComboBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -156,7 +156,7 @@ public class OComboBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index 6cbcb2de6bce..c3977ec7eb63 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ public class OCurrencyControl extends TestCase { * can have only numeric values the relation must be specified. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -177,16 +177,16 @@ public class OCurrencyControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CurrencyField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -195,7 +195,7 @@ public class OCurrencyControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OCurrencyControl @@ -232,14 +232,14 @@ public class OCurrencyControl extends TestCase { tEnv.addObjRelation("XTextComponent.onlyNumbers", new Object()); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java index 319e1a90a502..c1c98761239b 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,23 +118,23 @@ public class OCurrencyModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ObjectName = "stardiv.one.form.component.CurrencyField"; super.m_kindOfControl="CurrencyField"; - - NamedValue myProp = new NamedValue(); + + NamedValue myProp = new NamedValue(); myProp.Name = "DataField"; - myProp.Value = "Identifier"; + myProp.Value = "Identifier"; super.m_propertiesToSet.add(myProp); super.m_ChangePropertyName = "Value"; super.m_ChangePropertyValue = new Double(0); - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -144,7 +144,7 @@ public class OCurrencyModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -152,7 +152,7 @@ public class OCurrencyModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 4b360e20fd10..a060245ddfde 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -283,7 +283,7 @@ public class ODatabaseForm extends TestCase { } catch (com.sun.star.uno.Exception e) { log.println("Error while object test initialization :"); e.printStackTrace(log); - throw new StatusException("Error while object test" + + throw new StatusException("Error while object test" + " initialization", e); } } else { @@ -291,9 +291,9 @@ public class ODatabaseForm extends TestCase { try { String myDbUrl = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); srcInf.URL = myDbUrl; - + log.println("try to register '"+myDbUrl+"' as '"+dbSourceName+"'"); - + dbSrc = srcInf.getDataSourceService(); dbTools.reRegisterDB(dbSourceName, dbSrc); } catch (com.sun.star.uno.Exception e) { @@ -309,9 +309,9 @@ public class ODatabaseForm extends TestCase { do { tableName = "ODatabaseForm_tmp" + uniqueSuffix; oldF = utils.getFullURL(origDB); - newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + + newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + ".dbf"; - } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && + } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && (uniqueSuffix++ < 50)); } } @@ -319,7 +319,7 @@ public class ODatabaseForm extends TestCase { /** * * creating a Testenvironment for the interfaces to be tested */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { if (xTextDoc != null) { try { @@ -383,10 +383,10 @@ public class ODatabaseForm extends TestCase { XLoadable formLoader = null; try { - formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, + formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, tableName); } catch (com.sun.star.uno.Exception e) { - log.println("Cann't bind the form to source '" + dbSourceName + + log.println("Cann't bind the form to source '" + dbSourceName + "', table '" + tableName + "' :"); e.printStackTrace(log); throw new StatusException("Cann't bind a form", e); @@ -409,12 +409,12 @@ public class ODatabaseForm extends TestCase { log.println("Elements in the 'MyForm' :"); XIndexAccess formElements1 = (XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, forms.getByName("MyForm")); for (int i = 0; i < formElements1.getCount(); i++) { XNamed elemName = (XNamed) UnoRuntime.queryInterface( - XNamed.class, + XNamed.class, formElements1.getByIndex(i)); log.println(" '" + elemName.getName() + "'"); } @@ -424,14 +424,14 @@ public class ODatabaseForm extends TestCase { //put something on the drawpage log.println("inserting some ControlShapes"); oShapes = DrawTools.getShapes(WriterTools.getDrawPage(xTextDoc)); - shape1 = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + shape1 = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 1000, "CommandButton"); - shape2 = FormTools.createControlShape(xTextDoc, 5000, 3500, 7500, + shape2 = FormTools.createControlShape(xTextDoc, 5000, 3500, 7500, 5000, "TextField"); - XControlShape shape3 = FormTools.createControlShape(xTextDoc, 2000, - 1500, 1000, - 1000, + XControlShape shape3 = FormTools.createControlShape(xTextDoc, 2000, + 1500, 1000, + 1000, "CheckBox"); oShapes.add((XShape) shape1); oShapes.add((XShape) shape2); @@ -451,12 +451,12 @@ public class ODatabaseForm extends TestCase { log.println("Elements in the 'MyForm' :"); XIndexAccess formElements1 = (XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, forms.getByName("MyForm")); for (int i = 0; i < formElements1.getCount(); i++) { XNamed elemName = (XNamed) UnoRuntime.queryInterface( - XNamed.class, + XNamed.class, formElements1.getByIndex(i)); log.println(" '" + elemName.getName() + "'"); } @@ -467,7 +467,7 @@ public class ODatabaseForm extends TestCase { formLoader.load(); try { - oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), + oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), (FormTools.getForms( WriterTools.getDrawPage( xTextDoc))) @@ -476,7 +476,7 @@ public class ODatabaseForm extends TestCase { XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), + new Type(XConnection.class), xSetProp.getPropertyValue("ActiveConnection")); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get Form"); @@ -498,7 +498,7 @@ public class ODatabaseForm extends TestCase { // adding relation for XSubmit XControlModel the_Model = shape2.getControl(); XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); XControl cntrl = null; @@ -520,7 +520,7 @@ public class ODatabaseForm extends TestCase { } catch (SQLException e) { log.println("Cann't move cursor to the first row."); e.printStackTrace(); - throw new StatusException("Can't move cursor to the first row.", e); + throw new StatusException("Can't move cursor to the first row.", e); } tEnv.addObjRelation("Model1", shape1.getControl()); @@ -555,9 +555,9 @@ public class ODatabaseForm extends TestCase { } for (int n = 1; n < (2 * (THRCNT + 1)); n++) { - log.println("adding INSTANCE" + n + + log.println("adding INSTANCE" + n + " as obj relation to environment"); - tEnv.addObjRelation("INSTANCE" + n, + tEnv.addObjRelation("INSTANCE" + n, FormTools.createControl(xTextDoc, "CheckBox")); } @@ -577,12 +577,12 @@ public class ODatabaseForm extends TestCase { final XResultSet xResSet = (XResultSet) UnoRuntime.queryInterface( XResultSet.class, oObj); final XResultSetUpdate xResSetUpdate = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, oObj); final XRowSet xRowSet = (XRowSet) UnoRuntime.queryInterface( XRowSet.class, oObj); final PrintWriter logF = log; - tEnv.addObjRelation("XRowSetApproveBroadcaster.ApproveChecker", + tEnv.addObjRelation("XRowSetApproveBroadcaster.ApproveChecker", new ifc.sdb._XRowSetApproveBroadcaster.RowSetApproveChecker() { public void moveCursor() { try { @@ -657,12 +657,12 @@ public class ODatabaseForm extends TestCase { // Adding relation for XCompletedExecution tEnv.addObjRelation("InteractionHandlerChecker", new InteractionHandlerImpl()); - + // Adding for XWarningSupplier tEnv.addObjRelation("CheckWarningsSupplier", new Boolean(isMySQLDB)); // Adding relation for XDatabaseParameterBroadcaster - tEnv.addObjRelation("ParameterListenerChecker", new ODatabaseForm.ParameterListenerImpl()); + tEnv.addObjRelation("ParameterListenerChecker", new ODatabaseForm.ParameterListenerImpl()); XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, oObj) ; try { @@ -673,7 +673,7 @@ public class ODatabaseForm extends TestCase { else { xSetProp.setPropertyValue("Command", "SELECT \"_TEXT\" FROM \"ODatabaseForm_tmp0\" WHERE ( ( \"_TEXT\" = :param1 ) )"); } - + xSetProp.setPropertyValue("CommandType", new Integer(CommandType.COMMAND)) ; } @@ -685,7 +685,7 @@ public class ODatabaseForm extends TestCase { XRowUpdate.class, oObj); final XRow xRow = (XRow) UnoRuntime.queryInterface(XRow.class, oObj); - tEnv.addObjRelation("XResultSetUpdate.UpdateTester", + tEnv.addObjRelation("XResultSetUpdate.UpdateTester", new ifc.sdbc._XResultSetUpdate.UpdateTester() { String lastUpdate = null; @@ -731,15 +731,15 @@ public class ODatabaseForm extends TestCase { XRow row = (XRow) UnoRuntime.queryInterface(XRow.class, oObj); tEnv.addObjRelation("XRowUpdate.XRow", row); - + tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "Cycle"); PropertyValue propVal = new PropertyValue(); propVal.Name = "Name"; propVal.Value = "Text since XPropertyAccess"; - + tEnv.addObjRelation("XPropertyAccess.propertyToChange", propVal); - + return tEnv; } // finish method getTestEnvironment @@ -768,8 +768,8 @@ public class ODatabaseForm extends TestCase { } catch (com.sun.star.lang.DisposedException e) { log.println("couldn't close data source"); } - - + + log.println("closing document..."); try { @@ -792,7 +792,7 @@ public class ODatabaseForm extends TestCase { throw new StatusException("Error while object test cleaning up", e); } } - + /** * Implementation of interface _XDatabaseParameterBroadcaster.CheckParameterListener * for the XDatabaseParameterBroadcaster test @@ -801,15 +801,15 @@ public class ODatabaseForm extends TestCase { public class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { boolean listenerWasCalled = false; PrintWriter log = new PrintWriter(System.out); - - /** + + /** * Return true, if the listener was called, false otherwise. * @return True, if any other method of the listener was called. */ public boolean checkListener() { return listenerWasCalled; } - + /** * Take the DataBaseParameterEvent and fill it with a meaningful value. * @param e The database parameter that will be filled with a value. @@ -835,7 +835,7 @@ public class ODatabaseForm extends TestCase { } return true; } - + /** * Dummy implemetnation. Do nothing, just log * @param o Ignore. @@ -843,7 +843,7 @@ public class ODatabaseForm extends TestCase { public void disposing(EventObject o) { log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: disposing"); } - + /** * Set a log writer, so messages go to log instead of Standard.out * @param log The log messages get printed to. @@ -851,10 +851,10 @@ public class ODatabaseForm extends TestCase { public void setLog(PrintWriter log) { this.log = log; } - + } - - + + /** * Implementation of interface _XCompletedExecution.CheckInteractionHandler * for the XCompletedExecution test @@ -863,11 +863,11 @@ public class ODatabaseForm extends TestCase { public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { private boolean handlerWasUsed = false; private PrintWriter log = new PrintWriter(System.out); - + public boolean checkInteractionHandler() { return handlerWasUsed; } - + public void handle(XInteractionRequest xInteractionRequest) { log.println("### _XCompletedExecution.InteractionHandlerImpl: handle called."); handlerWasUsed = true; @@ -892,10 +892,10 @@ public class ODatabaseForm extends TestCase { eI.printStackTrace(log); } } - + public void setLog(PrintWriter log) { this.log = log; } - + } } // finish class ODatabaseForm diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index e143929fa19d..4b37ec21c2cf 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ public class ODateControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class ODateControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "DateField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class ODateControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ODateControl @@ -224,14 +224,14 @@ public class ODateControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java index 297c5088937e..d692bb27d6bf 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateModel.java +++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,25 +133,25 @@ public class ODateModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Date"; - + super.m_kindOfControl="DateField"; - + super.m_ObjectName = "stardiv.one.form.component.DateField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_DATE_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_DATE_F; super.m_propertiesToSet.add(DataField); - - NamedValue Date = new NamedValue(); - Date.Name = "Date"; - Date.Value = new Integer(DBTools.TST_DATE); + + NamedValue Date = new NamedValue(); + Date.Name = "Date"; + Date.Value = new Integer(DBTools.TST_DATE); super.m_propertiesToSet.add(Date); - + super.m_LCShape_Type = "FixedText"; } @@ -163,7 +163,7 @@ public class ODateModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -171,7 +171,7 @@ public class ODateModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index ac56d9f0cf93..4204606d087e 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -173,7 +173,7 @@ public class OEditControl extends TestCase { * of another component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XControl aControl = null; @@ -183,16 +183,16 @@ public class OEditControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -201,7 +201,7 @@ public class OEditControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OEditControl @@ -234,11 +234,11 @@ public class OEditControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // relations for XChangeBroadcaster - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); - tEnv.addObjRelation("Win1", - (XWindow) UnoRuntime.queryInterface(XWindow.class, + tEnv.addObjRelation("Win1", + (XWindow) UnoRuntime.queryInterface(XWindow.class, oObj)); tEnv.addObjRelation("Win2", forObjRel); tEnv.addObjRelation("CONTROL", aControl); @@ -249,7 +249,7 @@ public class OEditControl extends TestCase { tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java index 4004b68d13a1..bcecd77550df 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditModel.java +++ b/qadevOOo/tests/java/mod/_forms/OEditModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,22 +129,22 @@ public class OEditModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="TextField"; - + super.m_ObjectName = "stardiv.one.form.component.Edit"; - NamedValue myProp = new NamedValue(); - myProp.Name = "DataField"; - myProp.Value = DBTools.TST_STRING_F; + NamedValue myProp = new NamedValue(); + myProp.Name = "DataField"; + myProp.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(myProp); - + super.m_LCShape_Type = "FixedText"; - + super.m_ChangePropertyName = "Text"; } /** @@ -155,7 +155,7 @@ public class OEditModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -163,7 +163,7 @@ public class OEditModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 3ece2f3a359e..b83e9ce007ee 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,13 +100,13 @@ import com.sun.star.util.XCloseable; */ public class OFileControlModel extends TestCase { XComponent xDrawDoc; - + /** * Creates Draw document where controls are placed. */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); - + try { log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); @@ -116,13 +116,13 @@ public class OFileControlModel extends TestCase { throw new StatusException(Status.failed("Can't create a document")); } } - + /** * Disposes Draw document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xDrawDoc); @@ -133,7 +133,7 @@ public class OFileControlModel extends TestCase { log.println("couldn't close document"); } } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates FileControl in the Form. <p> @@ -147,26 +147,26 @@ public class OFileControlModel extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - - + + // creation of testobject here // first we write what we are intend to do to log file log.println("creating a test environment"); - + //get FileControlModel String objName = "FileControl"; - + XControlShape aShape = null; - + Size size = new Size(); Point position = new Point(); XControlModel aControl = null; - + //get MSF XMultiServiceFactory oDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, xDrawDoc); - + try { Object oInt = oDocMSF.createInstance( "com.sun.star.drawing.ControlShape"); @@ -187,16 +187,16 @@ public class OFileControlModel extends TestCase { log.println("Couldn't create a component " + e); throw new StatusException(Status.failed("Can't create component")); } - + aShape.setControl(aControl); - + DrawTools.getDrawPage(xDrawDoc, 0).add((XShape) aShape); oObj = aShape.getControl(); - + log.println("creating a new environment for drawpage object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component." + objName); PropertyValue prop = new PropertyValue(); @@ -204,7 +204,7 @@ public class OFileControlModel extends TestCase { prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + return tEnv; } // finish method getTestEnvironment } // finish class OFileControlModel diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java index 5753da62d75a..c3a172eb746a 100644 --- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ import lib.TestParameters; */ public class OFixedTextModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -92,17 +92,17 @@ public class OFixedTextModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="FixedText"; - + super.m_ObjectName = "stardiv.one.form.component.FixedText"; - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -112,8 +112,8 @@ public class OFixedTextModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -124,5 +124,5 @@ public class OFixedTextModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class OFixedTextModel diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index 4888caba5441..5a1a4c3d6bb1 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -160,7 +160,7 @@ public class OFormattedControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -170,16 +170,16 @@ public class OFormattedControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "FormattedField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -188,7 +188,7 @@ public class OFormattedControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OFormattedControl @@ -221,14 +221,14 @@ public class OFormattedControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java index b51b4b575932..73d174eae99f 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,20 +123,20 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="DatabaseFormattedField"; - + super.m_ObjectName = "stardiv.one.form.component.Edit"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -147,7 +147,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -155,7 +155,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index af94a546b004..a04e06bbf1a5 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java +++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 65131dae1c46..92655bf9e2eb 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ import com.sun.star.util.XCloseable; */ public class OGridControlModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -148,17 +148,17 @@ public class OGridControlModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="GridControl"; - + super.m_ObjectName = "stardiv.one.form.component.Grid"; - + super.m_LCShape_Type = "GridControl"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -168,8 +168,8 @@ public class OGridControlModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -179,7 +179,7 @@ public class OGridControlModel extends GenericModelTest { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - + XInterface oObj = tEnv.getTestObject(); XPropertySet aControl = null; @@ -187,7 +187,7 @@ public class OGridControlModel extends GenericModelTest { XPropertySet aControl3 = null; XPropertySet aControl4 = null; XPropertySet aControl5 = null; - + try { XGridColumnFactory columns = (XGridColumnFactory) UnoRuntime.queryInterface( XGridColumnFactory.class, oObj); @@ -234,8 +234,8 @@ public class OGridControlModel extends GenericModelTest { tEnv.addObjRelation("INSTANCE1", aControl4); tEnv.addObjRelation("INSTANCE2", aControl5); - - tEnv.addObjRelation("Comparer", + + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XNamed named1 = (XNamed) UnoRuntime.queryInterface( @@ -257,14 +257,14 @@ public class OGridControlModel extends GenericModelTest { // HashSet exclude = new HashSet(); -// +// // exclude.add("FormatKey"); // -// tEnv.addObjRelation("XUpdateBroadcaster.Checker", +// tEnv.addObjRelation("XUpdateBroadcaster.Checker", // new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + } // finish class OButtonModelold @@ -324,7 +324,7 @@ class OGridControlModelold extends TestCase { * {@link ifc.container._XContainer} : a column instance. </li> * </ul> */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface oInstance = null; @@ -342,8 +342,8 @@ class OGridControlModelold extends TestCase { //get GridControlModel String objName = "Grid"; - XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, - 7000, 2000, 2000, + XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, + 7000, 2000, 2000, "GridControl"); oObj = shape.getControl(); @@ -389,7 +389,7 @@ class OGridControlModelold extends TestCase { tEnv.addObjRelation("Selections", new Object[] { aControl, aControl2 }); // COMPARER - + int THRCNT = 1; String count = (String)Param.get("THRCNT"); if (count != null) @@ -401,7 +401,7 @@ class OGridControlModelold extends TestCase { try { for (int n = 1; n < (3 * THRCNT + 1); n++) { - log.println("adding INSTANCE" + n + + log.println("adding INSTANCE" + n + " as obj relation to environment"); oInstance = columns.createColumn("TextField"); tEnv.addObjRelation("INSTANCE" + n, oInstance); diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index 7b4a6adea8be..c3707748fdf5 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,7 +142,7 @@ public class OGroupBoxControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -152,16 +152,16 @@ public class OGroupBoxControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 5000, - 7000, 2000, 2000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 5000, + 7000, 2000, 2000, "GroupBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -170,7 +170,7 @@ public class OGroupBoxControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OGroupBoxControl @@ -205,8 +205,8 @@ public class OGroupBoxControl extends TestCase { // Adding relation for XWindow - tEnv.addObjRelation("XWindow.AnotherWindow", - UnoRuntime.queryInterface(XWindow.class, + tEnv.addObjRelation("XWindow.AnotherWindow", + UnoRuntime.queryInterface(XWindow.class, anotherCtrl)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java index 8f8f227457c6..feb425c693df 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ import lib.TestParameters; * @see ifc.lang._XComponent */ public class OGroupBoxModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -91,17 +91,17 @@ public class OGroupBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="GroupBox"; - + super.m_ObjectName = "stardiv.one.form.component.GroupBox"; - + super.m_LCShape_Type = "FixedText"; - + super.m_ChangePropertyName = "Text"; } /** @@ -112,8 +112,8 @@ public class OGroupBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index de2f93bc494c..f7557ca671d8 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,13 +96,13 @@ import com.sun.star.util.XCloseable; */ public class OHiddenModel extends TestCase { XComponent xDrawDoc; - + /** * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); - + try { log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); @@ -112,13 +112,13 @@ public class OHiddenModel extends TestCase { throw new StatusException("Couldn't create document", e); } } - + /** * Disposes drawing document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xDrawDoc); @@ -129,7 +129,7 @@ public class OHiddenModel extends TestCase { log.println("couldn't close document"); } } - + /** * Creates hidden component, then adds Form into draw page, * and inserts the component into Form components' collection. @@ -143,28 +143,28 @@ public class OHiddenModel extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - - + + // creation of testobject here // first we write what we are intend to do to log file log.println("creating a test environment"); - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); String objName = "HiddenControl"; XInterface ctrl = SOF.createControl(xDrawDoc, objName); - + try { XDrawPage oDP = DrawTools.getDrawPage(xDrawDoc, 0); - + XNameContainer nc = FormTools.getForms(oDP); FormTools.insertForm(xDrawDoc, nc, "OHiddenModelForm"); - + Object frm = nc.getByName("OHiddenModelForm"); - + XNameContainer frmNC = (XNameContainer) UnoRuntime.queryInterface( XNameContainer.class, frm); - + frmNC.insertByName("OHiddenModel", ctrl); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class), @@ -182,22 +182,22 @@ public class OHiddenModel extends TestCase { e.printStackTrace(log); throw new StatusException("Can't create and add control", e); } - + log.println("creating a new environment for drawpage object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + util.dbg.getSuppServices(oObj); - + log.println("adding DrawDocument as obj relation to environment"); tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component.Hidden"); - + PropertyValue prop = new PropertyValue(); prop.Name = "Name"; prop.Value = "new Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "Name"); - + return tEnv; } // finish method getTestEnvironment } // finish class OHiddenModel diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index 8d8744ed7377..60f208825863 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -147,7 +147,7 @@ public class OImageButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -157,16 +157,16 @@ public class OImageButtonControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "ImageButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -175,7 +175,7 @@ public class OImageButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OImageButtonControl @@ -209,7 +209,7 @@ public class OImageButtonControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java index 9920e26feea9..3b5dbcded56f 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,13 +96,13 @@ public class OImageButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="ImageButton"; - + super.m_ObjectName = "stardiv.one.form.component.ImageButton"; super.m_LCShape_Type = "ImageButton"; @@ -116,7 +116,7 @@ public class OImageButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -124,7 +124,7 @@ public class OImageButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index f8771e086ec2..4dcec1573015 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ public class OImageControlControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -159,15 +159,15 @@ public class OImageControlControl extends TestCase { //Insert a ControlShape and get the ControlModel XControlShape aShape = FormTools.createControlShapeWithDefaultControl( - xTextDoc, 3000, 4500, 15000, 10000, + xTextDoc, 3000, 4500, 15000, 10000, "DatabaseImageControl"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -176,7 +176,7 @@ public class OImageControlControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OImageControlControl @@ -210,7 +210,7 @@ public class OImageControlControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java index 461b60fa52cd..0525f6ff6778 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,18 +124,18 @@ public class OImageControlModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_kindOfControl= "DatabaseImageControl"; - + super.m_ObjectName = "stardiv.one.form.component.ImageControl"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_BINARY_STREAM_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_BINARY_STREAM_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -146,7 +146,7 @@ public class OImageControlModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -154,7 +154,7 @@ public class OImageControlModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index 66dfaa38d777..5d014aa759ee 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public class OListBoxControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } @@ -146,16 +146,16 @@ public class OListBoxControl extends TestCase { // Adding relation for XWindow XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); - + XWindow objWin = (XWindow) UnoRuntime.queryInterface(XWindow.class, oObj); tEnv.addObjRelation("XWindow.AnotherWindow",forObjRel); tEnv.addObjRelation("XWindow.ControlShape",aShape); - + tEnv.addObjRelation("Win1",objWin); tEnv.addObjRelation("Win2",forObjRel); - + tEnv.addObjRelation("CONTROL",anotherCtrl); // adding relation for XChangeBroadcaster diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java index ebfe3bf5a47f..c5aa052abbc0 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,10 +126,10 @@ public class OListBoxModel extends GenericModelTest { * DataField.Value = DBTools.TST_DATE_F; * super.m_propertiesToSet.add(DataField); * - * NamedValue ListSource = new NamedValue(); - * ListSource.Name = "ListSource"; + * NamedValue ListSource = new NamedValue(); + * ListSource.Name = "ListSource"; * ListSource.Value = new String[] { - * "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; + * "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; * super.m_propertiesToSet.add(ListSource); * super.m_LCShape_Type = "FixedText"; * </pre> @@ -138,26 +138,26 @@ public class OListBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "SelectedItems"; - + super.m_kindOfControl="ListBox"; - + super.m_ObjectName = "stardiv.one.form.component.ListBox"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - - NamedValue ListSource = new NamedValue(); - ListSource.Name = "ListSource"; + + NamedValue ListSource = new NamedValue(); + ListSource.Name = "ListSource"; ListSource.Value = new String[] { - "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; + "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; super.m_propertiesToSet.add(ListSource); - + super.m_LCShape_Type = "FixedText"; } @@ -169,7 +169,7 @@ public class OListBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -180,15 +180,15 @@ public class OListBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + static class Checker implements UpdateChecker { private short lastItem = (short) 0; XLoadable formLoaderF = null; @@ -196,7 +196,7 @@ public class OListBoxModel extends GenericModelTest { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -204,7 +204,7 @@ public class OListBoxModel extends GenericModelTest { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + public void update() throws Exception { if (!formLoaderF.isLoaded()) { formLoaderF.load(); @@ -217,7 +217,7 @@ public class OListBoxModel extends GenericModelTest { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); @@ -232,5 +232,5 @@ public class OListBoxModel extends GenericModelTest { return (getS.length > 0) && (lastItem == getS[0]); } } - + } // finish class OListBoxModel diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index f965a9c8af3f..eac8ce39cb4e 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public class ONavigationBarControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -119,16 +119,16 @@ public class ONavigationBarControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "NavigationToolBar"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -137,7 +137,7 @@ public class ONavigationBarControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -169,7 +169,7 @@ public class ONavigationBarControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java index ffe624ed8f5d..75b8c2089c45 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ import lib.TestEnvironment; import lib.TestParameters; public class ONavigationBarModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -44,17 +44,17 @@ public class ONavigationBarModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="NavigationToolBar"; - + super.m_ObjectName = "com.sun.star.form.component.NavigationToolBar"; - + super.m_LCShape_Type = "NavigationToolBar"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -64,8 +64,8 @@ public class ONavigationBarModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -76,6 +76,6 @@ public class ONavigationBarModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class ONavigationBarModel diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index ce03616582b0..3a89d4639814 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ public class ONumericControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class ONumericControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "NumericField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class ONumericControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ONumericControl @@ -224,14 +224,14 @@ public class ONumericControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java index 8a2ba304283f..2e4a32bf9aa0 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,20 +121,20 @@ public class ONumericModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Value"; - + super.m_kindOfControl="NumericField"; - + super.m_ObjectName = "stardiv.one.form.component.NumericField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_DOUBLE_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_DOUBLE_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -145,7 +145,7 @@ public class ONumericModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -153,7 +153,7 @@ public class ONumericModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index 34d325498c79..31046fab2eb0 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ public class OPatternControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class OPatternControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "PatternField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class OPatternControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OPatternControl @@ -224,14 +224,14 @@ public class OPatternControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java index cc80327ff20d..070ed5a9e870 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,20 +126,20 @@ public class OPatternModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="PatternField"; - + super.m_ObjectName = "stardiv.one.form.component.PatternField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -150,7 +150,7 @@ public class OPatternModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -158,7 +158,7 @@ public class OPatternModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index e013cb29cff8..52ff5ffb189e 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ public class ORadioButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -161,16 +161,16 @@ public class ORadioButtonControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "RadioButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -179,7 +179,7 @@ public class ORadioButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ORadioButtonControl @@ -212,7 +212,7 @@ public class ORadioButtonControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java index 36e3927f46af..f846b3a8132d 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,21 +122,21 @@ public class ORadioButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "State"; - + super.m_kindOfControl="RadioButton"; - + super.m_ObjectName = "stardiv.one.form.component.RadioButton"; - NamedValue myProp = new NamedValue(); + NamedValue myProp = new NamedValue(); myProp.Name = "DataField"; - myProp.Value = DBTools.TST_STRING_F; + myProp.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(myProp); - + super.m_LCShape_Type = "GroupBox"; } @@ -148,7 +148,7 @@ public class ORadioButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -156,17 +156,17 @@ public class ORadioButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - tEnv.addObjRelation("DataAwareControlModel.NewFieldName", + tEnv.addObjRelation("DataAwareControlModel.NewFieldName", DBTools.TST_INT_F); PropertyValue prop = new PropertyValue(); prop.Name = "HelpText"; prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + return tEnv; } diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index a847bfff055d..1104c65abd75 100644 --- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ import util.FormTools; import util.WriterTools; public class OScrollBarModel extends TestCase { - + XTextDocument xTextDoc; - + /** * Creates Writer document. */ @@ -53,8 +53,8 @@ public class OScrollBarModel extends TestCase { log.println( "creating a textdocument" ); xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); - } - + } + /** * Disposes the Writer document. */ @@ -68,10 +68,10 @@ public class OScrollBarModel extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } - } - + } + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -83,9 +83,9 @@ public class OScrollBarModel extends TestCase { oObj = aShape.getControl(); log.println( "creating a new environment for OScrollBarModel object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - + System.out.println("Implementation Name: "+util.utils.getImplName(oObj)); - + String objName = "ScrollBar"; tEnv.addObjRelation("OBJNAME", "com.sun.star.form.component." + objName); PropertyValue prop = new PropertyValue(); @@ -95,5 +95,5 @@ public class OScrollBarModel extends TestCase { tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java index bde3fd640e52..c4a574755192 100644 --- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ import util.FormTools; import util.WriterTools; public class OSpinButtonModel extends TestCase { - + XTextDocument xTextDoc; - + /** * Creates a Writer document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - + log.println( "creating a textdocument" ); xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); } - + /** * Disposes the Writer document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -71,19 +71,19 @@ public class OSpinButtonModel extends TestCase { log.println("couldn't close document"); } } - - + + /** * Creating a Testenvironment for the interfaces to be tested. * Adds spin button into text and retrieves it's control model. */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + XInterface oObj = null; - + XControlShape aShape = FormTools.createControlShape( xTextDoc,3000,4500,15000,10000,"SpinButton"); - + WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); oObj = aShape.getControl(); log.println( "creating a new environment for OButtonModel object" ); @@ -94,9 +94,9 @@ public class OSpinButtonModel extends TestCase { prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + System.out.println("Implementation name: "+util.utils.getImplName(oObj)); return tEnv; } // finish method getTestEnvironment - + } diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index f23d635de7df..30c457630c4c 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ public class OTimeControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -174,16 +174,16 @@ public class OTimeControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "TimeField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -192,7 +192,7 @@ public class OTimeControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OTimeControl @@ -224,14 +224,14 @@ public class OTimeControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index de1e17332d7f..e77eff500152 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,20 +135,20 @@ public class OTimeModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Time"; - + super.m_kindOfControl="TimeField"; - + super.m_ObjectName = "stardiv.one.form.component.TimeField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_INT_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_INT_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -169,19 +169,19 @@ public class OTimeModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); HashSet exclude = new HashSet(); - + exclude.add("FormatKey"); - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + static class Checker implements UpdateChecker { private short lastItem = (short) 0; XLoadable formLoaderF = null; @@ -189,7 +189,7 @@ public class OTimeModel extends GenericModelTest { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -197,7 +197,7 @@ public class OTimeModel extends GenericModelTest { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + private int lastTime = 0; public void update() throws com.sun.star.uno.Exception { @@ -218,7 +218,7 @@ public class OTimeModel extends GenericModelTest { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); @@ -230,7 +230,7 @@ public class OTimeModel extends GenericModelTest { Integer getT = (Integer) ps.getPropertyValue("Time"); - return (getT != null) && + return (getT != null) && (Math.abs(getT.intValue() - lastTime) < 100); } } diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java index b4e31924062b..810e71c425f4 100644 --- a/qadevOOo/tests/java/mod/_fps/FilePicker.java +++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java index 0180503fe9f2..7ba8bee180dd 100644 --- a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java +++ b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java index cd469b9ed269..db2a50b0e622 100755 --- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ public class ControlMenuController extends TestCase { * protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -66,7 +66,7 @@ public class ControlMenuController extends TestCase { /** * Create test environment. - */ + */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -77,7 +77,7 @@ public class ControlMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'ControlMenuController'", e); } - + /* log.println("Creating instance..."); @@ -93,7 +93,7 @@ public class ControlMenuController extends TestCase { XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, xTextDoc); // the supplier is available from the model - XUIConfigurationManagerSupplier xSupplier = + XUIConfigurationManagerSupplier xSupplier = (XUIConfigurationManagerSupplier)UnoRuntime.queryInterface( XUIConfigurationManagerSupplier.class, xModel); @@ -102,9 +102,9 @@ public class ControlMenuController extends TestCase { // just to make sure, it's the right one. log.println("TestObject: " + util.utils.getImplName(xManager)); tEnv = new TestEnvironment(xManager); */ - log.println("TestObject: " + utils.getImplName(oObj)); + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/Desktop.java b/qadevOOo/tests/java/mod/_fwk/Desktop.java index f777b58a9e27..c0ce8bd1fe80 100644 --- a/qadevOOo/tests/java/mod/_fwk/Desktop.java +++ b/qadevOOo/tests/java/mod/_fwk/Desktop.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java index 46c31dde8850..f552f185cda6 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ public class DispatchRecorder extends TestCase { } catch (InterruptedException ex) { } - + XModel model = (XModel) UnoRuntime.queryInterface(XModel.class, oDoc); xFrame = model.getCurrentController().getFrame(); diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java index 739c3d5709de..50323a5b055e 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java b/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java index 22e36b48a8ed..59e760bad0b2 100644 --- a/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java +++ b/qadevOOo/tests/java/mod/_fwk/DocumentProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java index 9231cecfb0cf..da86e8276b18 100755 --- a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class FontMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class FontMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'FontMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java index c0d99302af6c..a27f0d60ec63 100755 --- a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class FontSizeMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class FontSizeMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'FontSizeMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java index 1b8184072ca2..c84a6c1f8f4b 100755 --- a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class FooterMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class FooterMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'FooterMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java index 426d1790fb16..bce5015156e1 100755 --- a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class FormatMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class FormatMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'FormatMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java b/qadevOOo/tests/java/mod/_fwk/Frame.java index 1dbcd3adc62c..6e9b3d8ad780 100644 --- a/qadevOOo/tests/java/mod/_fwk/Frame.java +++ b/qadevOOo/tests/java/mod/_fwk/Frame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ public class Frame extends TestCase { log.println(util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment( oObj ); - + tEnv.addObjRelation("XDispatchProvider.URL", ".uno:SwitchControlDesignMode"); diff --git a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java index f39f184720c1..d4baffdc4500 100755 --- a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class HeaderMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class HeaderMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'HeaderMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java index 32ee88d123f4..2f16d9922295 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java +++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -176,7 +176,7 @@ public class JobExecutor extends TestCase { UnoRuntime.queryInterface(XSingleServiceFactory.class, events); Object oNewEvent = eventsFac.createInstance(); - XNameAccess xNewEventNA = (XNameAccess) + XNameAccess xNewEventNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oNewEvent); Object oJobList = xNewEventNA.getByName("JobList"); XSingleServiceFactory jobListFac = (XSingleServiceFactory) @@ -187,10 +187,10 @@ public class JobExecutor extends TestCase { oJobList); log.println("\tAdding TimeStamps to Events ..."); Object oNewJobTimeStamps = jobListFac.createInstance(); - + jobListNC.insertByName("TestJob", oNewJobTimeStamps); - - + + XNameContainer xEventsNC = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, events); xEventsNC.insertByName("TestEvent", oNewEvent); diff --git a/qadevOOo/tests/java/mod/_fwk/JobHandler.java b/qadevOOo/tests/java/mod/_fwk/JobHandler.java index 6a6cacf2c83d..abfaf198f64e 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/JobHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java index d967ff287a38..6ba1b97fce76 100755 --- a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java +++ b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public class LayoutManager extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -111,12 +111,12 @@ public class LayoutManager extends TestCase { } // just to make sure, it's the right one. - log.println("TestObject: " + util.utils.getImplName(xManager)); + log.println("TestObject: " + util.utils.getImplName(xManager)); tEnv = new TestEnvironment(xManager); - + tEnv.addObjRelation("XLayoutManager.TextDoc", xTextDoc); tEnv.addObjRelation("XLayoutManager.Frame",xFrame); - + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java index 015db63832e4..22f3fcb269e7 100755 --- a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class MacrosMenuController extends TestCase{ XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class MacrosMenuController extends TestCase{ e.printStackTrace(log); throw new StatusException("Could not create object 'MacrosMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; - } + } } diff --git a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java index afaf35486841..fc5e84c0532d 100644 --- a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java +++ b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java index f7d11d422046..d8ca9a58a85d 100755 --- a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ import lib.TestParameters; */ public class MenuBarFactory extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.MenuBarFactory"); - + tEnv = new TestEnvironment(oObj); } catch(com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java index 790ad94ddcfc..026faf8c1012 100755 --- a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,17 +90,17 @@ public class ModuleManager extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); - + // get text document interfaces try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); - + } catch (Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xTextMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xTextMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController xTextController = xTextMode1.getCurrentController(); XFrame xTextFrame = xTextController.getFrame(); @@ -110,12 +110,12 @@ public class ModuleManager extends TestCase { try { log.println("creating a web document"); xWebDoc = SOF.loadDocument("private:factory/swriter/web"); - + } catch (Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xWebMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xWebMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xWebDoc); XController xWebController = xWebMode1.getCurrentController(); XFrame xWebFrame = xWebController.getFrame(); @@ -124,12 +124,12 @@ public class ModuleManager extends TestCase { try { log.println("creating a global document"); xGlobalDoc = SOF.loadDocument("private:factory/swriter/GlobalDocument"); - + } catch (Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xGlobalMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xGlobalMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xGlobalDoc); XController xGlobalController = xGlobalMode1.getCurrentController(); XFrame xGlobalFrame = xGlobalController.getFrame(); @@ -142,7 +142,7 @@ public class ModuleManager extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xSheetMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xSheetMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xSheetDoc); XController xSheetController = xSheetMode1.getCurrentController(); @@ -155,11 +155,11 @@ public class ModuleManager extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xDrawMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xDrawMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc); XController xDrawController = xDrawMode1.getCurrentController(); XFrame xDrawFrame = xDrawController.getFrame(); - + // get impress interfaces try { log.println("creating a impress document"); @@ -168,11 +168,11 @@ public class ModuleManager extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xImpressMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xImpressMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xImpressDoc); XController xImpressController = xImpressMode1.getCurrentController(); XFrame xImpressFrame = xImpressController.getFrame(); - + // get math interfaces try { log.println("creating a math document"); @@ -181,11 +181,11 @@ public class ModuleManager extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document ", e); } - XModel xMathMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xMathMode1 = (XModel) UnoRuntime.queryInterface(XModel.class, xMathDoc); XController xMathController = xMathMode1.getCurrentController(); XFrame xMathFrame = xMathController.getFrame(); - + PropertyValue[] xFrameSeq = new PropertyValue[7]; xFrameSeq[0] = new PropertyValue(); xFrameSeq[0].Name = "com.sun.star.text.TextDocument"; @@ -254,10 +254,10 @@ public class ModuleManager extends TestCase { xModelSeq[6] = new PropertyValue(); xModelSeq[6].Name = "com.sun.star.formula.FormulaProperties"; xModelSeq[6].Value = xMathMode1; - + TestEnvironment tEnv = new TestEnvironment( oObj ); - - + + tEnv.addObjRelation("XModuleManager.XFrame", xFrameSeq); tEnv.addObjRelation("XModuleManager.XController", xControllerSeq); tEnv.addObjRelation("XModuleManager.XModel", xModelSeq); diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index 7b30a94b3293..4f4f950e0ed6 100755 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,23 +92,23 @@ public class ModuleUIConfigurationManager extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - + try { xMSF = (XMultiServiceFactory)tParam.getMSF(); - + log.println("Creating instance..."); xTextDoc = WriterTools.createTextDoc(xMSF); - + Object o = (XInterface)xMSF.createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); XModuleUIConfigurationManagerSupplier xMUICMS = (XModuleUIConfigurationManagerSupplier) UnoRuntime.queryInterface(XModuleUIConfigurationManagerSupplier.class, o); - + util.dbg.printInterfaces(xMUICMS); oObj = xMUICMS.getUIConfigurationManager("com.sun.star.text.TextDocument"); - log.println("TestObject: " + utils.getImplName(oObj)); + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); - + XNameAccess xMM = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xMSF.createInstance("com.sun.star.comp.framework.ModuleManager")); String[] names = xMM.getElementNames(); @@ -116,13 +116,13 @@ public class ModuleUIConfigurationManager extends TestCase { XSingleServiceFactory xStorageService = (XSingleServiceFactory) UnoRuntime.queryInterface(XSingleServiceFactory.class, o); Object[]props = new Object[2]; - + String aFile = util.utils.getOfficeTempDir(xMSF) + "dummyFile.dat"; log.println("storage file : '"+ aFile + "'"); - + props[0] = aFile; props[1] = new Integer(ElementModes.READWRITE); - xStore = (XStorage)UnoRuntime.queryInterface(XStorage.class, xStorageService.createInstanceWithArguments(props)); + xStore = (XStorage)UnoRuntime.queryInterface(XStorage.class, xStorageService.createInstanceWithArguments(props)); PropertyValue[] initProps = new PropertyValue[4]; PropertyValue propVal = new PropertyValue(); @@ -131,8 +131,8 @@ public class ModuleUIConfigurationManager extends TestCase { initProps[0] = propVal; propVal = new PropertyValue(); propVal.Name = "UserConfigStorage"; - propVal.Value = xStore; - initProps[1] = propVal; + propVal.Value = xStore; + initProps[1] = propVal; propVal = new PropertyValue(); propVal.Name = "ModuleIdentifier"; propVal.Value = "swriter"; @@ -140,24 +140,24 @@ public class ModuleUIConfigurationManager extends TestCase { propVal = new PropertyValue(); propVal.Name = "UserRootCommit"; propVal.Value = (XTransactedObject)UnoRuntime.queryInterface(XTransactedObject.class, xStore); - initProps[3] = propVal; - - + initProps[3] = propVal; + + tEnv.addObjRelation("XInitialization.args", initProps); - + // the short cut manager service name - // 2do: correct the service name when it's no longer in - tEnv.addObjRelation("XConfigurationManager.ShortCutManager", + // 2do: correct the service name when it's no longer in + tEnv.addObjRelation("XConfigurationManager.ShortCutManager", "com.sun.star.ui.ModuleAcceleratorConfiguration"); - + // the resourceURL tEnv.addObjRelation("XModuleUIConfigurationManager.ResourceURL", "private:resource/menubar/menubar"); - tEnv.addObjRelation("XUIConfiguration.XUIConfigurationListenerImpl", - new ConfigurationListener(log, + tEnv.addObjRelation("XUIConfiguration.XUIConfigurationListenerImpl", + new ConfigurationListener(log, (XUIConfigurationManager)UnoRuntime.queryInterface( XUIConfigurationManager.class, oObj), xMSF)); - tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigManagerImplementationName", + tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigManagerImplementationName", "com.sun.star.comp.framework.ModuleUIConfigurationManager"); } catch(com.sun.star.uno.Exception e) { @@ -166,7 +166,7 @@ public class ModuleUIConfigurationManager extends TestCase { } return tEnv; } - + /** * An implementation of the _XUIConfiguration.XUIConfigurationListenerImpl * interface to trigger the event for a listener call. @@ -177,7 +177,7 @@ public class ModuleUIConfigurationManager extends TestCase { private PrintWriter log = null; private XUIConfigurationManager xUIManager = null; private XMultiServiceFactory xMSF = null; - + public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; this.xUIManager = xUIManager; @@ -193,7 +193,7 @@ public class ModuleUIConfigurationManager extends TestCase { PropertyValue[]prop = _XUIConfigurationManager.createMenuBarEntry( "Trigger Event", xMenuBarSettings, xMSF, log); - _XUIConfigurationManager.createMenuBarItem("Click for Macro", + _XUIConfigurationManager.createMenuBarItem("Click for Macro", (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, prop[3].Value), log); XIndexContainer x = (XIndexContainer)UnoRuntime.queryInterface(XIndexContainer.class, xMenuBarSettings); @@ -241,5 +241,5 @@ public class ModuleUIConfigurationManager extends TestCase { log.println("_XUIConfiguration.XUIConfigurationListenerImpl.elementReplaced."); } } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java index 0d3ba82f9115..9da4e7fa8d59 100755 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ import lib.TestParameters; */ public class ModuleUIConfigurationManagerSupplier extends TestCase{ XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); oObj = (XInterface)xMSF.createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigurationManager", + tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigurationManager", "com.sun.star.frame.StartModule"); tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigManagerImplementationName", "com.sun.star.comp.framework.ModuleUIConfigurationManager"); } @@ -55,6 +55,6 @@ public class ModuleUIConfigurationManagerSupplier extends TestCase{ throw new StatusException("Cannot create test object", e); } return tEnv; - } - + } + } diff --git a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java index 3fd6a3d8ed0c..2b1da80a87d5 100755 --- a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public class ObjectMenuController extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -88,7 +88,7 @@ public class ObjectMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'ControlMenuController'", e); } - log.println("TestObject: " + utils.getImplName(oObj)); + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } diff --git a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java index e45cd14ad452..91ac2fbd8e70 100755 --- a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public class PopupMenuControllerFactory extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -67,7 +67,7 @@ public class PopupMenuControllerFactory extends TestCase { } } - + /** * Create test environment: * @param tParam The test parameters. @@ -83,7 +83,7 @@ public class PopupMenuControllerFactory extends TestCase { xTextDoc = WriterTools.createTextDoc(xMSF); util.dbg.printInterfaces(xTextDoc); - + try { xInst = (XInterface)xMSF.createInstance( "com.sun.star.comp.framework.PopupMenuControllerFactory"); @@ -91,7 +91,7 @@ public class PopupMenuControllerFactory extends TestCase { catch(com.sun.star.uno.Exception e) { throw new StatusException("Couldn't create test object", e); } - + log.println("TestObject: " + util.utils.getImplName(xInst)); tEnv = new TestEnvironment(xInst); XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xMSF); @@ -108,15 +108,15 @@ public class PopupMenuControllerFactory extends TestCase { log.println("Cannot get the 'DefaultContext' for XMultiComponentFactory test."); e.printStackTrace(log); } - + // register one controller, so it can be instantiated XUIControllerRegistration xReg = (XUIControllerRegistration) UnoRuntime.queryInterface(XUIControllerRegistration.class, xInst); - + xReg.registerController(".uno:MyCommandUrl", "", "com.sun.star.comp.framework.FooterMenuController"); tEnv.addObjRelation("XUIControllerRegistration.RegisteredController", ".uno:MyCommandUrl"); tEnv.addObjRelation("XMultiComponentFactory.ServiceNames", new String[]{".uno:MyCommandUrl"}); - + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java index 391e01f4cb42..9caa75de4d4f 100644 --- a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java index 3b74f8015a43..d94c3d57a123 100644 --- a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,9 +70,9 @@ public class SoundHandler extends TestCase { } TestEnvironment tEnv = new TestEnvironment( oObj ); - URL dispURL = utils.parseURL((XMultiServiceFactory)Param.getMSF(), + URL dispURL = utils.parseURL((XMultiServiceFactory)Param.getMSF(), utils.getFullTestURL("ok.wav")); - System.out.println("DISPATCHURL: "+ dispURL.Complete); + System.out.println("DISPATCHURL: "+ dispURL.Complete); tEnv.addObjRelation("XDispatch.URL", dispURL); return tEnv; diff --git a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java index bc3cfa588aa7..a7d09a818331 100644 --- a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ import lib.TestParameters; */ public class StatusBarControllerFactory extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.StatusBarControllerFactory"); - + tEnv = new TestEnvironment(oObj); } catch(com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java index 5472043e4e88..a27761f0389c 100644 --- a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class ToolBarsMenuController extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class ToolBarsMenuController extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'ToolBarsMenuController'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java index 9f7492a497b8..2adf240b8db4 100644 --- a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; */ public class UICategoryDescription extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -51,10 +51,10 @@ public class UICategoryDescription extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'UICategoryDescription'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java index 19277d71621c..7b506972e5f0 100755 --- a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ import util.utils; */ public class UICommandDescription extends TestCase { XInterface oObj = null; - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); @@ -52,10 +52,10 @@ public class UICommandDescription extends TestCase { e.printStackTrace(log); throw new StatusException("Could not create object 'UICommandDescription'", e); } - + log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; - } + } } diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 0ab78ad40bab..235e8a4be8ab 100755 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ import util.utils; */ public class UIConfigurationManager extends TestCase { XUIConfigurationManager xManager = null; - - + + /** * Create test environment: * <ul> @@ -70,9 +70,9 @@ public class UIConfigurationManager extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); - + log.println("Creating instance..."); - + try { xManager = (XUIConfigurationManager)UnoRuntime.queryInterface( XUIConfigurationManager.class, xMSF.createInstance( @@ -83,7 +83,7 @@ public class UIConfigurationManager extends TestCase { // just to make sure, it's the right one. log.println("TestObject: " + utils.getImplName(xManager)); tEnv = new TestEnvironment(xManager); - + // create a configuration storage try { String sourceDeleteCfg = util.utils.getFullTestURL("delete.cfg"); @@ -98,7 +98,7 @@ public class UIConfigurationManager extends TestCase { props[1] = new Integer(ElementModes.READWRITE); XStorage xRootStorage = (XStorage)UnoRuntime.queryInterface(XStorage.class, xSSF.createInstanceWithArguments(props)); xSubStorage = xRootStorage.openStorageElement("Configurations2", ElementModes.READWRITE); - + XUIConfigurationStorage xConfigStorage =(XUIConfigurationStorage)UnoRuntime.queryInterface(XUIConfigurationStorage.class, xManager); xConfigStorage.setStorage(xSubStorage); tEnv.addObjRelation("XUIConfigurationStorage.Storage", xSubStorage); @@ -107,17 +107,17 @@ public class UIConfigurationManager extends TestCase { log.println("Could not create storage: " + e.toString()); } util.dbg.printInterfaces(xManager); - + tEnv.addObjRelation("XUIConfiguration.XUIConfigurationListenerImpl", new ConfigurationListener(log, xManager, xMSF)); // the short cut manager service name - // 2do: correct the service name when it's no longer in - tEnv.addObjRelation("XConfigurationManager.ShortCutManager", + // 2do: correct the service name when it's no longer in + tEnv.addObjRelation("XConfigurationManager.ShortCutManager", "com.sun.star.ui.DocumentAcceleratorConfiguration"); return tEnv; } - + /** * An implementation of the _XUIConfiguration.XUIConfigurationListenerImpl * interface to trigger the event for a listener call. @@ -129,7 +129,7 @@ public class UIConfigurationManager extends TestCase { private XUIConfigurationManager xUIManager = null; private XMultiServiceFactory xMSF = null; private static int iUniqueCounter; - + public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; this.xUIManager = xUIManager; @@ -146,7 +146,7 @@ public class UIConfigurationManager extends TestCase { PropertyValue[][]props = xUIManager.getUIElementsInfo(UIElementType.UNKNOWN); XIndexAccess xMenuBarSettings = xUIManager.getSettings( "private:resource/menubar/menubar", true); - + PropertyValue[]prop = _XUIConfigurationManager.createMenuBarEntry( "Trigger Event", xMenuBarSettings, xMSF, log); _XUIConfigurationManager.createMenuBarItem("Click for Macro", @@ -199,7 +199,7 @@ public class UIConfigurationManager extends TestCase { log.println("_XUIConfiguration.XUIConfigurationListenerImpl.elementReplaced."); } } - + } diff --git a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java index aef3ad663ae1..7c26c3b18b87 100755 --- a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public class UIElementFactoryManager extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -90,10 +90,10 @@ public class UIElementFactoryManager extends TestCase { throw new StatusException("Cannot create test object.", e); } log.println("TestObject: " + util.utils.getImplName(oObj)); - + tEnv = new TestEnvironment((XInterface)oObj); - + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java index 56fee3181ae0..f9984b93308e 100644 --- a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java +++ b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java index 109611657bab..e50998ab1b26 100644 --- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,14 +97,14 @@ public class ContentHandlerFactory extends TestCase { (XNameAccess.class, oObj); tEnv.addObjRelation("XMSF.serviceNames", xNA.getElementNames()); String[] dummy = xNA.getElementNames(); - + // com.sun.star.container.XContainerQuery - NamedValue[] querySequenze = new NamedValue[1]; + NamedValue[] querySequenze = new NamedValue[1]; NamedValue query = new NamedValue(); query.Name = "Name"; query.Value = "com.sun.star.comp.framework.SoundHandler"; querySequenze[0] = query; - + tEnv.addObjRelation("XContainerQuery.createSubSetEnumerationByProperties", querySequenze); diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java index 42c05bd24f41..f274282c45cb 100644 --- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ public class FilterFactory extends TestCase { XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface (XNameAccess.class, oObj); String[] filterNames = xNA.getElementNames(); - + // XNameContainer; XNameReplace String filterName = filterNames[0]; Object[] instance = null;; @@ -119,14 +119,14 @@ public class FilterFactory extends TestCase { throw new StatusException( Status.failed("Couldn't get elements from object")); } - + log.println("adding INSTANCE 1 as obj relation to environment"); - + log.println("fill property 'TemplateName' with 'INSTANCE1'"); setPropertyValueValue((PropertyValue[])instance, "TemplateName", "INSTANCE1"); tEnv.addObjRelation("INSTANCE" +1, instance); - - + + // XMSF Vector vFTypes = new Vector(); Vector vFArgs = new Vector(); @@ -163,16 +163,16 @@ public class FilterFactory extends TestCase { vFArgs.toArray(new Object[vFArgs.size()][])); // com.sun.star.container.XContainerQuery - NamedValue[] querySequenze = new NamedValue[1]; + NamedValue[] querySequenze = new NamedValue[1]; NamedValue query = new NamedValue(); query.Name = "Name"; query.Value = "Rich Text Format"; querySequenze[0] = query; - + tEnv.addObjRelation("XContainerQuery.createSubSetEnumerationByProperties", querySequenze); - - + + return tEnv; } // finish method getTestEnvironment @@ -182,7 +182,7 @@ public class FilterFactory extends TestCase { i++; } return i < props.length ? props[i].Value : null; - + } protected void setPropertyValueValue(PropertyValue[] props, String pName, Object pValue) { @@ -199,7 +199,7 @@ public class FilterFactory extends TestCase { i++; } return i < props.length ? props[i] : null; - + } } diff --git a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java index da819d91fe3c..dc83d96dd928 100644 --- a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,12 +97,12 @@ public class FrameLoaderFactory extends TestCase { tEnv.addObjRelation("XMSF.serviceNames", xNA.getElementNames()); // com.sun.star.container.XContainerQuery - NamedValue[] querySequenze = new NamedValue[1]; + NamedValue[] querySequenze = new NamedValue[1]; NamedValue query = new NamedValue(); query.Name = "Name"; query.Value = "com.sun.star.frame.Bibliography"; querySequenze[0] = query; - + tEnv.addObjRelation("XContainerQuery.createSubSetEnumerationByProperties", querySequenze); diff --git a/qadevOOo/tests/java/mod/_fwl/PathSettings.java b/qadevOOo/tests/java/mod/_fwl/PathSettings.java index dbedc87bd374..7bfe808b43f9 100644 --- a/qadevOOo/tests/java/mod/_fwl/PathSettings.java +++ b/qadevOOo/tests/java/mod/_fwl/PathSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class PathSettings extends TestCase { private static NamedValue[] m_Properties; private static XPropertySet xPS; - + /** * restores the old values of the path settings * @param tParam the test parameter @@ -82,10 +82,10 @@ public class PathSettings extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("restore old values of path settings..."); - + for (int i=0; i < m_Properties.length; i++){ try{ - + xPS.setPropertyValue(m_Properties[i].Name, m_Properties[i].Value); } catch (com.sun.star.beans.UnknownPropertyException e){ @@ -94,7 +94,7 @@ public class PathSettings extends TestCase { } catch (WrappedTargetException e){ } } - } + } /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service @@ -130,25 +130,25 @@ public class PathSettings extends TestCase { exclProps.add("UIConfig"); tEnv.addObjRelation("XFastPropertySet.ExcludeProps", exclProps); tEnv.addObjRelation("XMultiPropertySet.ExcludeProps", exclProps); - + saveAllPropertyValues(oObj); return tEnv; } // finish method getTestEnvironment - + private void saveAllPropertyValues(XInterface oObj){ - + xPS = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); - + XPropertySetInfo xPSI = xPS.getPropertySetInfo(); - + Property[] allProperties = xPSI.getProperties(); m_Properties = new NamedValue[allProperties.length]; - + for (int i=0; i < allProperties.length; i++){ try{ - m_Properties[i] = new NamedValue(allProperties[i].Name, + m_Properties[i] = new NamedValue(allProperties[i].Name, xPS.getPropertyValue(allProperties[i].Name)); } catch (com.sun.star.beans.UnknownPropertyException e){ diff --git a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java index ba69d3d86035..1cda9fdcbf1c 100644 --- a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java +++ b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index 4a298e8bc637..80d42dcd297f 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ import util.SOfficeFactory; * @see ifc.util.XFlushable */ public class TypeDetection extends TestCase { - + /** * Disposes text document. */ @@ -88,7 +88,7 @@ public class TypeDetection extends TestCase { } XTextDocument xTextDoc = null; - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service @@ -133,35 +133,35 @@ public class TypeDetection extends TestCase { throw new StatusException( Status.failed("Couldn't get elements from object")); } - + log.println("adding INSTANCE 1 as obj relation to environment"); - + setPropertyValueValue((PropertyValue[])instance, "Preferred", "INSTANCE1"); tEnv.addObjRelation("INSTANCE" +1, instance); // com.sun.star.container.XContainerQuery - NamedValue[] querySequenze = new NamedValue[1]; + NamedValue[] querySequenze = new NamedValue[1]; NamedValue query = new NamedValue(); query.Name = "Name"; query.Value = "writer_Text"; querySequenze[0] = query; - - + + log.println("create text document with bookmarks"); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); String fileURL = null; try { xTextDoc = SOF.createTextDoc( null ); XInterface xBookMark = SOF.createBookmark( xTextDoc ); SOF.insertTextContent( xTextDoc, (XTextContent) xBookMark ); - + fileURL = utils.getOfficeTemp((XMultiServiceFactory)Param.getMSF() ); fileURL = fileURL + "bookmarks.oot"; XStorable store = (XStorable) UnoRuntime.queryInterface(XStorable.class, xTextDoc); System.out.println(fileURL); store.storeToURL(fileURL, new PropertyValue[0]); - + } catch( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException( "Couldn't create Bookmark", e ); @@ -174,7 +174,7 @@ public class TypeDetection extends TestCase { return tEnv; } // finish method getTestEnvironment - + protected void setPropertyValueValue(PropertyValue[] props, String pName, Object pValue) { int i = 0; while (i < props.length && !props[i].Name.equals(pName)) { diff --git a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java index caad1aade8d1..6ef935db601c 100644 --- a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java +++ b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java index 2ebbb1a38281..6ff2b549b76c 100644 --- a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java +++ b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java index 423c8b8cde28..0b22deed7a93 100644 --- a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java +++ b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java index d3267a6117e8..1044442ca56d 100644 --- a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java +++ b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/Collator.java b/qadevOOo/tests/java/mod/_i18n/Collator.java index a887a86df3ff..a6d7b81ed063 100644 --- a/qadevOOo/tests/java/mod/_i18n/Collator.java +++ b/qadevOOo/tests/java/mod/_i18n/Collator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java index 9f2990cc3ba5..c0299087ed8d 100644 --- a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java +++ b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/LocaleData.java b/qadevOOo/tests/java/mod/_i18n/LocaleData.java index f71dcbcb8501..935a534fbeb9 100644 --- a/qadevOOo/tests/java/mod/_i18n/LocaleData.java +++ b/qadevOOo/tests/java/mod/_i18n/LocaleData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java index 7b46c973f683..86a676380c7e 100644 --- a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java +++ b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/TextSearch.java b/qadevOOo/tests/java/mod/_i18n/TextSearch.java index 835e0a3c1a90..20b678d4b155 100644 --- a/qadevOOo/tests/java/mod/_i18n/TextSearch.java +++ b/qadevOOo/tests/java/mod/_i18n/TextSearch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_i18n/Transliteration.java b/qadevOOo/tests/java/mod/_i18n/Transliteration.java index 1f89d930d39f..808311032e4c 100644 --- a/qadevOOo/tests/java/mod/_i18n/Transliteration.java +++ b/qadevOOo/tests/java/mod/_i18n/Transliteration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java index 7805a66c3042..0c85c74d1eab 100644 --- a/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java index 184aaff2db8c..cc48e6e314c7 100644 --- a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_insp/Introspection.java b/qadevOOo/tests/java/mod/_insp/Introspection.java index f3b9956dcc3f..891d182df31d 100644 --- a/qadevOOo/tests/java/mod/_insp/Introspection.java +++ b/qadevOOo/tests/java/mod/_insp/Introspection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java b/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java index 2c0ddac78ba8..ba4b9431df42 100644 --- a/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java +++ b/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_inv/Invocation.java b/qadevOOo/tests/java/mod/_inv/Invocation.java index 06de72e30c5a..98d5e91b4ea3 100644 --- a/qadevOOo/tests/java/mod/_inv/Invocation.java +++ b/qadevOOo/tests/java/mod/_inv/Invocation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java index 91a91ab3f28a..2b13633d8b2f 100644 --- a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java index 46dd600d0cf3..6b1e5e47d7eb 100644 --- a/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java b/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java index f112fe07ab34..6b376a3618d4 100644 --- a/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java +++ b/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java index 7e9a5f68f5a7..17ba5818306f 100644 --- a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java index 8d20e4e2ffc7..81ee0485888c 100644 --- a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public class JavaComponentLoader extends TestCase { // adding object relation for XImplementationLoader ifc test tEnv.addObjRelation("ImplementationLoader", "com.sun.star.loader.JavaComponentLoader") ; - + String implURL = utils.getFullTestURL("qadevlibs/MyPersistObjectImpl.jar"); tEnv.addObjRelation("ImplementationUrl", implURL) ; log.println("looking for shared lib: " + implURL); diff --git a/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java index 63e60fa95976..09192967bce0 100644 --- a/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java index fd056e877f6b..c7fbc712ed91 100644 --- a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java +++ b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java index 136eed306ebe..ba25eb21342e 100644 --- a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_lng/DicList.java b/qadevOOo/tests/java/mod/_lng/DicList.java index 13b0998babe3..806b38290c93 100644 --- a/qadevOOo/tests/java/mod/_lng/DicList.java +++ b/qadevOOo/tests/java/mod/_lng/DicList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_lng/LinguProps.java b/qadevOOo/tests/java/mod/_lng/LinguProps.java index c209f4b2367b..77e951568f38 100644 --- a/qadevOOo/tests/java/mod/_lng/LinguProps.java +++ b/qadevOOo/tests/java/mod/_lng/LinguProps.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java index 609cfe4101a3..f2433f0cf3a4 100644 --- a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java +++ b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java index 431cdaafd994..7e313385d07b 100644 --- a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java +++ b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java index 293c80a07c1c..55cc7e143099 100644 --- a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java +++ b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ public class SpellChecker extends TestCase { String Iname = util.utils.getImplName(oObj); log.println("Implementation Name: "+Iname); TestEnvironment tEnv = new TestEnvironment(oObj); - + XLinguServiceManager xLinguServiceManager = (XLinguServiceManager) UnoRuntime.queryInterface(XLinguServiceManager.class, LinguServiceManager); tEnv.addObjRelation("AlternativeChecker",xLinguServiceManager.getSpellChecker()); diff --git a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java index 566bbbaf4561..65c5939798f1 100644 --- a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java +++ b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java index 523ed4cd0e2d..42ded566f92d 100644 --- a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java +++ b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java index 1ff1c8492fb8..a50398eff832 100644 --- a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java +++ b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java b/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java index 0c2a3128e0ff..73ff7815b9f7 100644 --- a/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_namingservice/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/NamingService.java index b6d02e0a2ac8..d7bffd85e347 100644 --- a/qadevOOo/tests/java/mod/_namingservice/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice/NamingService.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java index 6c5f7dc53997..b1c9c8642254 100644 --- a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java index 6289f863dce7..0705d424cd57 100644 --- a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java +++ b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java index 52635c813eb9..aabee75977bc 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,13 +67,13 @@ import util.utils; * @see com.sun.star.frame.XController */ public class ObjectInspector extends TestCase { - + /** * module variable which holds the Desktop * @see com.sun.star.frame.Desktop */ protected static Object StarDesktop = null; - + /** * assign to the module variable <CODE>StarDesktop</CODE> the desktop * @param Param the test parameters @@ -89,7 +89,7 @@ public class ObjectInspector extends TestCase { throw new StatusException("Could not get a Desktop: null", null); } } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service @@ -105,88 +105,88 @@ public class ObjectInspector extends TestCase { * @see helper.PropertyHandlerImpl */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - + this.cleanup(tParam, log); - + XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); - + try { XInterface oInspector = (XInterface) xMSF.createInstance("com.sun.star.inspection.ObjectInspector"); - + XObjectInspector xInspector = (XObjectInspector) UnoRuntime.queryInterface(XObjectInspector.class, oInspector); - + log.println("ImplementationName '" + utils.getImplName(xInspector) + "'"); - + XInterface oInspectorModel = (XInterface) xMSF.createInstance("com.sun.star.inspection.ObjectInspectorModel"); - + XObjectInspectorModel xInspectorModel = (XObjectInspectorModel) UnoRuntime.queryInterface(XObjectInspectorModel.class, oInspectorModel); - + XInterface oInspectorModelToSet = (XInterface) xMSF.createInstance("com.sun.star.inspection.ObjectInspectorModel"); - + XObjectInspectorModel xInspectorModelToSet = (XObjectInspectorModel) UnoRuntime.queryInterface(XObjectInspectorModel.class, oInspectorModelToSet); - - + + log.println("create a floating frame..."); - + XWindow xWindow = null; try{ - + XWindowPeer xWindowPeer = DesktopTools.createFloatingWindow(xMSF); - + xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, xWindowPeer); - + } catch (StatusException e){ throw new StatusException("Coud not create test object", e); } - + XInterface oFrame = (XInterface) xMSF.createInstance("com.sun.star.frame.Frame"); - + XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, oFrame); - + xFrame.setName("ObjectInspector"); xFrame.initialize(xWindow); - + XFramesSupplier xFramesSup = (XFramesSupplier) UnoRuntime.queryInterface(XFramesSupplier.class, StarDesktop); - + XFrames xFrames = xFramesSup.getFrames(); xFrames.append(xFrame); - - + + log.println("attach ObjectInspector to floating frame..."); - + XInitialization xOII = (XInitialization) UnoRuntime.queryInterface(XInitialization.class, xInspectorModel); - + xOII.initialize(new Object[0]); - + xInspector.setInspectorModel(xInspectorModel); - + // for debug purposes the following lines could commented out. But in // this case the com.sun.star.frame.XController would be failed! //xInspector.attachFrame(xFrame); //xWindow.setVisible(true); - + Object[] oInspect = new Object[1]; oInspect[0] = new PropertyHandlerImpl(); - + TestEnvironment tEnv = new TestEnvironment(xInspector); - + // com.sun.star.frame.XController tEnv.addObjRelation("Frame",xFrame); - + tEnv.addObjRelation("XObjectInspector.toInspect", oInspect); - + tEnv.addObjRelation("XObjectInspector.InspectorModelToSet", xInspectorModelToSet); - + return tEnv; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Unexpected exception", e); } - + } - + /** * Closes the ObjectOnspector using <CODE>XCloseable</CODE> * @see com.sun.star.util.XCloseable @@ -195,13 +195,13 @@ public class ObjectInspector extends TestCase { */ protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog if one exists ... "); - + XFrame existentInspector = null; - + XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, StarDesktop); - + existentInspector = xFrame.findFrame( "ObjectInspector", 255 ); - + if ( existentInspector != null ){ XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, existentInspector); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java index f6044a3926d8..2330de06ee7d 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ import util.utils; * @see com.sun.star.inspection.XObjectInspectorModel */ public class ObjectInspectorModel extends TestCase { - + /** * module variable which holds the Desktop * @see com.sun.star.frame.Desktop */ protected static Object StarDesktop = null; - + /** * assign to the module variable <CODE>StarDesktop</CODE> the desktop * @param Param the test parameters @@ -81,7 +81,7 @@ public class ObjectInspectorModel extends TestCase { throw new StatusException("Could not get a Desktop: null", null); } } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service @@ -95,21 +95,21 @@ public class ObjectInspectorModel extends TestCase { * @see helper.PropertyHandlerImpl */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - + this.cleanup(tParam, log); - + XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); - + XPropertySet xMSFProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xMSF); XComponentContext xDefaultContext = null; try{ // Get the default context from the office server. Object oDefaultContext = xMSFProp.getPropertyValue("DefaultContext"); - + // Query for the interface XComponentContext. xDefaultContext = (XComponentContext) UnoRuntime.queryInterface( XComponentContext.class, oDefaultContext); - + } catch (UnknownPropertyException e){ throw new StatusException("could not get DefaultContext from xMSF", e); } catch (WrappedTargetException e){ @@ -117,35 +117,35 @@ public class ObjectInspectorModel extends TestCase { } catch (Exception e){ throw new StatusException("could not get DefaultContext from xMSF", e); } - + try { - + Object[] oHandlerFactories = new Object[1]; oHandlerFactories[0] = new PropertyHandlerFactroy(); - + int minHelpTextLines = 200; int maxHelpTextLines = 400; - + XObjectInspectorModel oInspectorModel = com.sun.star.inspection.ObjectInspectorModel. createWithHandlerFactoriesAndHelpSection(xDefaultContext, oHandlerFactories, minHelpTextLines, maxHelpTextLines); - + log.println("ImplementationName '" + utils.getImplName(oInspectorModel) + "'"); - + TestEnvironment tEnv = new TestEnvironment(oInspectorModel); - + // com.sun.star.inspection.XObjectInspectorModel tEnv.addObjRelation("minHelpTextLines", new Integer(minHelpTextLines)); tEnv.addObjRelation("maxHelpTextLines", new Integer(maxHelpTextLines)); - + return tEnv; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Unexpected exception", e); } - + } - + /** * Closes the ObjectOnspector using <CODE>XCloseable</CODE> * @see com.sun.star.util.XCloseable @@ -154,13 +154,13 @@ public class ObjectInspectorModel extends TestCase { */ protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog if one exists ... "); - + XFrame existentInspector = null; - + XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, StarDesktop); - + existentInspector = xFrame.findFrame( "ObjectInspector", 255 ); - + if ( existentInspector != null ){ XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, existentInspector); diff --git a/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java index ccd1286f697e..b3ee9aeb8e53 100644 --- a/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java index 75857eecc44d..15ce8a8ef4df 100644 --- a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java index 8ac66de12de6..41c467479a8e 100644 --- a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java +++ b/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java index 50ece587ff33..80068cfadf71 100644 --- a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java +++ b/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java index adca07f799d6..0bbe59be86df 100755 --- a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java +++ b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 9785b9fd484e..0e6d823d20d5 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java index 6030cf18d99a..840e6e5a2df8 100644 --- a/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java index 0bcaecc361db..8cdd56280b97 100644 --- a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 88491ab7a186..c2cb26046a03 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ public class various extends TestCase { ex = e ; } catch (com.sun.star.connection.AlreadyAcceptingException e) { ex = e ; - } + } } } diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java index b7018b7691f7..4d9f25301219 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { protected static XMultiServiceFactory msf = null; protected static XAccessibleAction action = null; - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XAccessibleContext oObj = null; Object toolkit = null; @@ -85,7 +85,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); @@ -93,15 +93,15 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { util.utils.shortWait(Param.getInt("ShortWait")); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext ok_button = AccessibilityTools.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, + XAccessibleContext ok_button = AccessibilityTools.getAccessibleObjectForRole(xRoot, + AccessibleRole.PUSH_BUTTON, "Cancel"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); log.println("ImplementationName " + utils.getImplName(oObj)); log.println("AccessibleName " + oObj.getAccessibleName()); - log.println("ParentDescription " + + log.println("ParentDescription " + oObj.getAccessibleParent().getAccessibleContext() .getAccessibleDescription()); @@ -114,18 +114,18 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { XAccessibleText.class, oObj); XAccessibleEditableText eText = (XAccessibleEditableText) UnoRuntime.queryInterface( - XAccessibleEditableText.class, + XAccessibleEditableText.class, oObj); eText.setText("LEFT"); tEnv.addObjRelation("XAccessibleText.Text", text.getText()); - - tEnv.addObjRelation("Destroy", "AccessibleEditableTextPara_PreviewCell"); + + tEnv.addObjRelation("Destroy", "AccessibleEditableTextPara_PreviewCell"); final XAccessibleEditableText editText = eText; - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { editText.setText("LEFT_EVENT"); @@ -161,7 +161,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { try { SOfficeFactory SOF = SOfficeFactory.getFactory(msf); - xCalcDoc = (XComponent) UnoRuntime.queryInterface(XComponent.class, + xCalcDoc = (XComponent) UnoRuntime.queryInterface(XComponent.class, SOF.createCalcDoc( null)); } catch (com.sun.star.uno.Exception e) { @@ -183,7 +183,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { } public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xCalcDoc); XController xController = aModel.getCurrentController(); @@ -192,10 +192,10 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { try { String aSlotID = ".uno:EditHeaderAndFooter"; XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, msf.createInstance( "com.sun.star.util.URLTransformer")); diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java index 4e0276304743..cda222edc858 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -158,20 +158,20 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL,true); xRoot = AccessibilityTools.SearchedAccessible; - + //AccessibilityTools.printAccessibleTree(log,xRoot); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,AccessibleRole.PARAGRAPH); - + log.println("ImplementationName " + utils.getImplName(oObj)); log.println("AccessibleName " + oObj.getAccessibleName()); log.println("Parent " + utils.getImplName(oObj.getAccessibleParent())); TestEnvironment tEnv = new TestEnvironment( oObj ); - + tEnv.addObjRelation("EditOnly", "AccessibleEditableTextPara_PreviewCell"); tEnv.addObjRelation("Destroy", "AccessibleEditableTextPara_PreviewCell"); - + final XCell cell_to_change = xCell; tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){ @@ -179,7 +179,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { cell_to_change.setFormula("NewString"); } }); - + return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java index c295e7197eb1..9c648edc8ace 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ public class ScAccessibleCell extends TestCase { log.println("ImplementationName " + utils.getImplName(oObj)); - TestEnvironment tEnv = new TestEnvironment(oObj); + TestEnvironment tEnv = new TestEnvironment(oObj); // relation for XAccessibleEventBroadcaster XCell xCell = null; @@ -146,7 +146,7 @@ public class ScAccessibleCell extends TestCase { XIndexAccess oIndexAccess = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, oColumns); XPropertySet column = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class,oIndexAccess.getByIndex(1)); + XPropertySet.class,oIndexAccess.getByIndex(1)); column.setPropertyValue("OptimalWidth", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { log.println("Exception ceating relation :"); @@ -163,9 +163,9 @@ public class ScAccessibleCell extends TestCase { } catch(com.sun.star.lang.IllegalArgumentException e) { log.println("Exception ceating relation :"); e.printStackTrace(log); - } - - tEnv.addObjRelation("EditOnly", + } + + tEnv.addObjRelation("EditOnly", "This method is only supported if the Cell is in edit mode"); final XCell fCell = xCell ; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 3a18fce51185..b52891687452 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index 15c81df729af..2a7737d53743 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 08b7b85b0fdb..84553b082622 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ public class ScAccessibleCsvRuler extends TestCase { * @see TestEnvironment * @see #getTestEnvironment() */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -86,18 +86,18 @@ public class ScAccessibleCsvRuler extends TestCase { XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); accAction = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - XAccessibleContext acc = AccessibilityTools.getAccessibleObjectForRole(xRoot, + XAccessibleContext acc = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.RADIO_BUTTON); log.println("Click on: " + acc.getAccessibleName()); @@ -112,15 +112,15 @@ public class ScAccessibleCsvRuler extends TestCase { //util.dbg.printInterfaces(oObj); - AccessibilityTools.printAccessibleTree(log, xRoot); - oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT, + AccessibilityTools.printAccessibleTree(log, xRoot); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT, "Ruler", true); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this dialog"); XAccessibleText text = (XAccessibleText) UnoRuntime.queryInterface( @@ -143,7 +143,7 @@ public class ScAccessibleCsvRuler extends TestCase { return tEnv; } - + /** * Called while disposing a <code>TestEnvironment</code>. * Disposes calc document. @@ -175,7 +175,7 @@ public class ScAccessibleCsvRuler extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); log.println("opening dialog"); - + PropertyValue[] args = new PropertyValue[1]; try { args[0] = new PropertyValue(); @@ -184,13 +184,13 @@ public class ScAccessibleCsvRuler extends TestCase { "com.sun.star.comp.uui.UUIInteractionHandler"); } catch(com.sun.star.uno.Exception e) { } - + lThread = new loadThread(SOF, args); lThread.start(); shortWait(); } - + /** * Sleeps for 2 sec. to allow StarOffice to react on <code> * reset</code> call. @@ -201,10 +201,10 @@ public class ScAccessibleCsvRuler extends TestCase { } catch (InterruptedException e) { log.println("While waiting :" + e) ; } - } - + } + public class loadThread extends Thread { - + private SOfficeFactory SOF = null ; private PropertyValue[] args = null; public XComponent xSpreadSheedDoc = null; @@ -215,15 +215,15 @@ public class ScAccessibleCsvRuler extends TestCase { } public void run() { - try { + try { String url= utils.getFullTestURL("10test.csv"); log.println("loading "+url); - SOF.loadDocument(url,args); + SOF.loadDocument(url,args); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); throw new StatusException( "Couldn't create document ", e ); } - } - } - + } + } + } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index fd930eedaf01..cbb3917b2e03 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index ff6328dc1b92..3835f1a876d4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index 599f8a097ad6..d77ca0f674b1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,14 +166,14 @@ public class ScAccessiblePageHeader extends TestCase { at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); - + XStyleFamiliesSupplier StyleFam = (XStyleFamiliesSupplier) UnoRuntime.queryInterface( XStyleFamiliesSupplier.class, xSpreadsheetDoc ); XNameAccess StyleFamNames = StyleFam.getStyleFamilies(); XStyle StdStyle = null; - + try{ XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject( new Type(XNameAccess.class), @@ -212,9 +212,9 @@ public class ScAccessiblePageHeader extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't get HeaderContent", e); } - + final XHeaderFooterContent RPHC2 = RPHC; - + final XText center = RPHC2.getCenterText(); final XText left = RPHC2.getLeftText(); final XText right = RPHC2.getRightText(); @@ -233,7 +233,7 @@ public class ScAccessiblePageHeader extends TestCase { } catch (com.sun.star.lang.WrappedTargetException e) {} } }); - + return tEnv; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index 3e387afeb8d3..f0157633ccc4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -157,7 +157,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { try { oObj = at.getAccessibleObjectForRole (xRoot, AccessibleRole.HEADER, "").getAccessibleChild(0); - XAccessibleContext cont = (XAccessibleContext) + XAccessibleContext cont = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class, oObj); XAccessibleStateSet StateSet = cont.getAccessibleStateSet(); if (StateSet.contains((short)27)) { @@ -166,26 +166,26 @@ public class ScAccessiblePageHeaderArea extends TestCase { } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { throw new StatusException("Couldn't find needed Child",iabe); } - + log.println("ImplementationName " + utils.getImplName(oObj)); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); - + XAccessibleContext zoomIn = at.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); - - final XAccessibleAction pressZoom = (XAccessibleAction) + + final XAccessibleAction pressZoom = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, zoomIn); tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { - public void fireEvent() { + public void fireEvent() { try { pressZoom.doAccessibleAction(0); } catch (com.sun.star.lang.IndexOutOfBoundsException ibe) {} } - }); - + }); + return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java index d6f93c401c77..13f8aeeeb52f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index d57690852dc9..5662ee0addc9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { * Switchs the document to preview mode and then obtains the * accessible object for the header cell. */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -146,7 +146,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { throw new StatusException("Couldn't create document", e); } - XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xSheetDoc); XController xController = xModel.getCurrentController(); @@ -161,7 +161,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { XIndexAccess oIndexSheets = (XIndexAccess) UnoRuntime.queryInterface( XIndexAccess.class, oSheets); XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexSheets.getByIndex(0)); log.println("Getting a cell from sheet"); @@ -184,14 +184,14 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { //setting property 'PrintHeaders' of the style 'Default' XStyleFamiliesSupplier xSFS = (XStyleFamiliesSupplier) UnoRuntime.queryInterface( - XStyleFamiliesSupplier.class, + XStyleFamiliesSupplier.class, xSheetDoc); XNameAccess xNA = xSFS.getStyleFamilies(); XPropertySet xPropSet = null; try { Object oPageStyles = xNA.getByName("PageStyles"); - xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oPageStyles); Object oDefStyle = xNA.getByName("Default"); @@ -228,10 +228,10 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { //switching to 'Print Preview' mode try { XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, ( (XMultiServiceFactory) Param.getMSF()) .createInstance("com.sun.star.util.URLTransformer")); URL[] aParseURL = new URL[1]; @@ -261,8 +261,8 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { if (oObj == null) { log.println("Version with a fixed #103863#"); - oObj = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.TABLE_CELL, + oObj = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.TABLE_CELL, true); } @@ -270,7 +270,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java index 2c7271f50e86..b12c7c55e362 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -182,9 +182,9 @@ public class ScAccessiblePreviewTable extends TestCase { XWindow xWindow = at.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), xModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - + at.printAccessibleTree(log,xRoot, Param.getBool(PropertyName.DEBUG_IS_ACTIVE)); - + at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); oObj = AccessibilityTools.SearchedContext; @@ -195,9 +195,9 @@ public class ScAccessiblePreviewTable extends TestCase { XAccessibleContext zoomIn = at.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); - + log.println("Getting "+ zoomIn.getAccessibleName()); - + final XAccessibleAction pressZoom = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, zoomIn); tEnv.addObjRelation("EventProducer", diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index 0d5fd6c1bb86..3f80a7e5ac24 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java index aa43190a6a42..d2a1a2ef23ce 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java index 723163c13989..ab06d2977b96 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,11 +202,11 @@ public class ScAnnotationShapeObj extends TestCase { //adding ObjRelation for XText DefaultDsc tDsc = new DefaultDsc("com.sun.star.text.XTextContent", "com.sun.star.text.TextField.DateTime"); - + log.println( "adding InstCreator object" ); tEnv.addObjRelation( - "XTEXTINFO", new InstCreator( xSheetDoc, tDsc ) ); - + "XTEXTINFO", new InstCreator( xSheetDoc, tDsc ) ); + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java index 94dd58a9c7ff..662f509696a7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java index 0ce18e51d13f..1ff4a3f91d11 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java index 9ecf4045bfb8..0054823cf1bc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java index 1c3c64e25b98..edb102225e2b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java index 32f1158bf42c..9fd4c73109b5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java index 840f2e600cda..4731dac7e335 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java index 21590965fbdf..70f051f8f0d6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java index 55ed9e3c3b73..1baa4c21d8a0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ public class ScCellCursorObj extends TestCase { * retieved from collection)</li> * </ul> */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; TestEnvironment tEnv = null; @@ -166,19 +166,19 @@ public class ScCellCursorObj extends TestCase { log.println("Creating a test environment"); XSpreadsheets oSpreadsheets = ((XSpreadsheetDocument) UnoRuntime.queryInterface( - XSpreadsheetDocument.class, + XSpreadsheetDocument.class, xSheetDoc)).getSheets(); try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oSpreadsheets.getByName( oSpreadsheets.getElementNames()[0])); testRange = oSheet.getCellRangeByName("$A$1:$D$4"); XSheetCellRange testSheetRange = (XSheetCellRange) UnoRuntime.queryInterface( - XSheetCellRange.class, + XSheetCellRange.class, testRange); oObj = oSheet.createCursorByRange(testSheetRange); oSheet.getCellByPosition(1, 1).setValue(1); @@ -207,7 +207,7 @@ public class ScCellCursorObj extends TestCase { tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("CRDESC", + tEnv.addObjRelation("CRDESC", "Column and RowDescriptions can't be changed for this Object"); tEnv.addObjRelation("SHEET", oSheet); @@ -221,13 +221,13 @@ public class ScCellCursorObj extends TestCase { expectedResults[_XCellRangesQuery.QUERYROWDIFFERENCES] = "Sheet1.A2;Sheet1.C2"; expectedResults[_XCellRangesQuery.QUERYVISIBLECELLS] = "Sheet1.A2"; tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", expectedResults); - - tEnv.addObjRelation("NewData", - new Object[][] + + tEnv.addObjRelation("NewData", + new Object[][] { - { "", "", "", "" }, - { "", "2", "3", "4" }, - { "", "2", "3", "4" }, + { "", "", "", "" }, + { "", "2", "3", "4" }, + { "", "2", "3", "4" }, { "", "2", "3", "4" } }); @@ -238,7 +238,7 @@ public class ScCellCursorObj extends TestCase { //Adding relation for util.XSortable final PrintWriter finalLog = log; final XCellRange oTable = testRange; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -257,7 +257,7 @@ public class ScCellCursorObj extends TestCase { } } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); @@ -281,16 +281,16 @@ public class ScCellCursorObj extends TestCase { String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } else { @@ -298,15 +298,15 @@ public class ScCellCursorObj extends TestCase { String[] rightVal = { "3", "4", "23", "b" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java index a2f0d11e3bb5..1b39d32a3c2d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java index f91389211354..b410257f7ba9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java index c78ac67cf64f..a920559dbc7c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java index 68396cbb37de..915891919bc0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java index 7711676f41a3..bd19c78a3da8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java index 5d4fdcaae4e4..b7b119c3b3b3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,7 +138,7 @@ public class ScCellRangeObj extends TestCase { * </ul> * @see com.sun.star.sheet.XSpreadsheet */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XCellRange testRange; @@ -149,7 +149,7 @@ public class ScCellRangeObj extends TestCase { log.println("Creating a test environment"); XSpreadsheets oSpreadsheets = ((XSpreadsheetDocument) UnoRuntime.queryInterface( - XSpreadsheetDocument.class, + XSpreadsheetDocument.class, xSheetDoc)).getSheets(); XNameAccess oNames = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, oSpreadsheets); @@ -158,7 +158,7 @@ public class ScCellRangeObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oNames.getByName(oNames.getElementNames()[0])); oObj = oSheet.getCellRangeByPosition(0, 0, 3, 4); @@ -182,7 +182,7 @@ public class ScCellRangeObj extends TestCase { "Error getting cell object from spreadsheet document", e); } - + TestEnvironment tEnv = new TestEnvironment(oObj); tEnv.addObjRelation("SHEET", oSheet); @@ -201,7 +201,7 @@ public class ScCellRangeObj extends TestCase { XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); tEnv.addObjRelation("PropSet", PropSet); - + // XSearchable: Add a cell to make a seacrchable entry try { tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", new XCell[] { @@ -211,7 +211,7 @@ public class ScCellRangeObj extends TestCase { e.printStackTrace((PrintWriter)log); log.println("Cannot make required object relation 'XSearchable.MAKEENTRYINCELL'."); } - + // XCellRangeData /* Object[][] newData = new Object[5][4]; for (int i=0; i<newData.length; i++) { @@ -220,11 +220,11 @@ public class ScCellRangeObj extends TestCase { } } tEnv.addObjRelation("NewData", newData); */ - + //Adding relation for util.XSortable final PrintWriter finalLog = log; final XCellRange oTable = testRange; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -243,7 +243,7 @@ public class ScCellRangeObj extends TestCase { } } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); @@ -267,16 +267,16 @@ public class ScCellRangeObj extends TestCase { String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } else { @@ -284,15 +284,15 @@ public class ScCellRangeObj extends TestCase { String[] rightVal = { "3", "4", "23", "b" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java index b3c3e4e66e1d..9d4216a0132c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,7 +198,7 @@ public class ScCellRangesObj extends TestCase { for (int j = 0; j < 5; j++) { oSheet.getCellByPosition(i, j).setFormula("a"); } - } + } for (int i = 0; i < 10; i++) { for (int j = 5; j < 10; j++) { oSheet.getCellByPosition(i, j).setValue(i + j); @@ -210,7 +210,7 @@ public class ScCellRangesObj extends TestCase { "Exception occurred while filling cells", e); } - + TestEnvironment tEnv = new TestEnvironment( oObj ); // NameReplaceIndex : _XNameReplace @@ -242,7 +242,7 @@ public class ScCellRangesObj extends TestCase { tEnv.addObjRelation("SHEET", oSheet); // add expected results for the XCellRangesQuery interface test String[]expectedResults = new String[7]; - expectedResults[_XCellRangesQuery.QUERYCOLUMNDIFFERENCES] = "Sheet1.I7:J8"; + expectedResults[_XCellRangesQuery.QUERYCOLUMNDIFFERENCES] = "Sheet1.I7:J8"; expectedResults[_XCellRangesQuery.QUERYCONTENTCELLS] = ""; expectedResults[_XCellRangesQuery.QUERYEMPTYCELLS] = ""; expectedResults[_XCellRangesQuery.QUERYFORMULACELLS] = ""; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java index 5e1f6153eb07..60d9cc9f38b2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java index 05313f90cb00..56a79463d0aa 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java index 5b41b5bb2928..f394e1dd9dbb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java index 4e83d890427e..dfaf72aa525f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java index 4c0e38aeaab3..ae94cf3358bb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java index ffce67b4f173..4541e30cafa3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java index 9ca1dfb9c448..d0338dc75653 100644 --- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java +++ b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java index a1f3dfb433f4..4b080bee0a75 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java index fbcb724c27fd..42d8f75dc78e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 7ef352c94d2a..c011619a0687 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,13 +61,13 @@ import util.SOfficeFactory; public class ScDataPilotFieldGroupItemObj extends TestCase { static XSpreadsheetDocument xSheetDoc = null; - + /** * A field is filled some values. This integer determines the size of the * field in x and y direction. */ private int mMaxFieldIndex = 6; - + /** * Creates Spreadsheet document. */ @@ -75,7 +75,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory ( (XMultiServiceFactory) tParam.getMSF ()); - + try { log.println ("creating a Spreadsheet document"); @@ -88,30 +88,30 @@ public class ScDataPilotFieldGroupItemObj extends TestCase throw new StatusException ("Couldn't create document", e); } } - + /** * Disposes Spreadsheet document. */ protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); - + XComponent oComp = (XComponent) UnoRuntime.queryInterface ( XComponent.class, xSheetDoc); util.DesktopTools.closeDoc (oComp); } - + protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface datapilotfield = null; XInterface groups = null; - + // creation of testobject here // first we write what we are intend to do to log file log.println ("Creating a test environment"); - + // the cell range CellRangeAddress sCellRangeAdress = new CellRangeAddress (); sCellRangeAdress.Sheet = 0; @@ -119,21 +119,21 @@ public class ScDataPilotFieldGroupItemObj extends TestCase sCellRangeAdress.StartRow = 0; sCellRangeAdress.EndColumn = mMaxFieldIndex - 1; sCellRangeAdress.EndRow = mMaxFieldIndex - 1; - + // position of the data pilot table CellAddress sCellAdress = new CellAddress (); sCellAdress.Sheet = 0; sCellAdress.Column = 7; sCellAdress.Row = 8; - + log.println ("Getting a sheet"); - + XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = (XIndexAccess) UnoRuntime.queryInterface ( XIndexAccess.class, xSpreadsheets); - + try { oSheet = (XSpreadsheet) AnyConverter.toObject ( @@ -158,11 +158,11 @@ public class ScDataPilotFieldGroupItemObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get a spreadsheet", e); } - + try { log.println ("Filling a table"); - + for (int i = 1; i < mMaxFieldIndex; i++) { oSheet.getCellByPosition (i, 0).setFormula ("Col" + i); @@ -170,7 +170,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase oSheet2.getCellByPosition (i, 0).setFormula ("Col" + i); oSheet2.getCellByPosition (0, i).setFormula ("Row" + i); } - + for (int i = 1; i < mMaxFieldIndex; i++) { for (int j = 1; j < mMaxFieldIndex; j++) @@ -179,35 +179,35 @@ public class ScDataPilotFieldGroupItemObj extends TestCase oSheet2.getCellByPosition (i, j).setValue (i * (j + 2)); } } - + oSheet.getCellByPosition (1, 1).setFormula ("aName"); oSheet.getCellByPosition (1, 2).setFormula ("otherName"); oSheet.getCellByPosition (1, 3).setFormula ("una"); oSheet.getCellByPosition (1, 4).setFormula ("otherName"); oSheet.getCellByPosition (1, 5).setFormula ("somethingelse"); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace (); 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); - + int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - - + + // cell of the data pilot output oCheckCell = oSheet.getCellByPosition (x, y); aChangeValue = new Integer (27); @@ -217,20 +217,20 @@ public class ScDataPilotFieldGroupItemObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get cells for changeing.", e); } - - + + // create the test objects log.println ("Getting test objects"); - + XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface ( XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables (); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor (); DPDsc.setSourceRange (sCellRangeAdress); - - XPropertySet fieldPropSet = null; - + + XPropertySet fieldPropSet = null; + try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); @@ -276,14 +276,14 @@ public class ScDataPilotFieldGroupItemObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't create a test environment", e); } - + log.println ("Insert the DataPilotTable"); - + if (DPT.hasByName ("DataPilotTable")) { DPT.removeByName ("DataPilotTable"); } - + DPT.insertNewByName ("DataPilotTable", sCellAdress, DPDsc); XIndexAccess xIA = (XIndexAccess) UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ()); XIndexAccess IA = null; @@ -311,7 +311,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); } - + try { XDataPilotFieldGrouping dpfg = (XDataPilotFieldGrouping) UnoRuntime.queryInterface (XDataPilotFieldGrouping.class, datapilotfield); @@ -333,7 +333,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); - } + } for (int i=0;i<IA.getCount ();i++) { datapilotfield = (XInterface) AnyConverter.toObject ( @@ -348,7 +348,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase } } groups = dpgi.Groups; - XIndexAccess groupAccess = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, groups); + XIndexAccess groupAccess = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, groups); XNameAccess groupNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, groupAccess.getByIndex(0)); oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, groupNames.getByName("aName")); } @@ -356,16 +356,16 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { e.printStackTrace (); } - + log.println ("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); - + TestEnvironment tEnv = new TestEnvironment (oObj); - + log.println ("Implementationname: " + util.utils.getImplName (oObj)); - + // Other parameters required for interface tests return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index 71a699175c85..fab644979093 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,13 +60,13 @@ import util.SOfficeFactory; public class ScDataPilotFieldGroupObj extends TestCase { static XSpreadsheetDocument xSheetDoc = null; - + /** * A field is filled some values. This integer determines the size of the * field in x and y direction. */ private int mMaxFieldIndex = 6; - + /** * Creates Spreadsheet document. */ @@ -74,7 +74,7 @@ public class ScDataPilotFieldGroupObj extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory ( (XMultiServiceFactory) tParam.getMSF ()); - + try { log.println ("creating a Spreadsheet document"); @@ -87,30 +87,30 @@ public class ScDataPilotFieldGroupObj extends TestCase throw new StatusException ("Couldn't create document", e); } } - + /** * Disposes Spreadsheet document. */ protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); - + XComponent oComp = (XComponent) UnoRuntime.queryInterface ( XComponent.class, xSheetDoc); util.DesktopTools.closeDoc (oComp); } - + protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface datapilotfield = null; XInterface groups = null; - + // creation of testobject here // first we write what we are intend to do to log file log.println ("Creating a test environment"); - + // the cell range CellRangeAddress sCellRangeAdress = new CellRangeAddress (); sCellRangeAdress.Sheet = 0; @@ -118,21 +118,21 @@ public class ScDataPilotFieldGroupObj extends TestCase sCellRangeAdress.StartRow = 0; sCellRangeAdress.EndColumn = mMaxFieldIndex - 1; sCellRangeAdress.EndRow = mMaxFieldIndex - 1; - + // position of the data pilot table CellAddress sCellAdress = new CellAddress (); sCellAdress.Sheet = 0; sCellAdress.Column = 7; sCellAdress.Row = 8; - + log.println ("Getting a sheet"); - + XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = (XIndexAccess) UnoRuntime.queryInterface ( XIndexAccess.class, xSpreadsheets); - + try { oSheet = (XSpreadsheet) AnyConverter.toObject ( @@ -157,11 +157,11 @@ public class ScDataPilotFieldGroupObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get a spreadsheet", e); } - + try { log.println ("Filling a table"); - + for (int i = 1; i < mMaxFieldIndex; i++) { oSheet.getCellByPosition (i, 0).setFormula ("Col" + i); @@ -169,7 +169,7 @@ public class ScDataPilotFieldGroupObj extends TestCase oSheet2.getCellByPosition (i, 0).setFormula ("Col" + i); oSheet2.getCellByPosition (0, i).setFormula ("Row" + i); } - + for (int i = 1; i < mMaxFieldIndex; i++) { for (int j = 1; j < mMaxFieldIndex; j++) @@ -178,35 +178,35 @@ public class ScDataPilotFieldGroupObj extends TestCase oSheet2.getCellByPosition (i, j).setValue (i * (j + 2)); } } - + oSheet.getCellByPosition (1, 1).setFormula ("aName"); oSheet.getCellByPosition (1, 2).setFormula ("otherName"); oSheet.getCellByPosition (1, 3).setFormula ("una"); oSheet.getCellByPosition (1, 4).setFormula ("otherName"); oSheet.getCellByPosition (1, 5).setFormula ("somethingelse"); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace (); 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); - + int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - - + + // cell of the data pilot output oCheckCell = oSheet.getCellByPosition (x, y); aChangeValue = new Integer (27); @@ -216,20 +216,20 @@ public class ScDataPilotFieldGroupObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get cells for changeing.", e); } - - + + // create the test objects log.println ("Getting test objects"); - + XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface ( XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables (); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor (); DPDsc.setSourceRange (sCellRangeAdress); - - XPropertySet fieldPropSet = null; - + + XPropertySet fieldPropSet = null; + try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); @@ -275,14 +275,14 @@ public class ScDataPilotFieldGroupObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't create a test environment", e); } - + log.println ("Insert the DataPilotTable"); - + if (DPT.hasByName ("DataPilotTable")) { DPT.removeByName ("DataPilotTable"); } - + DPT.insertNewByName ("DataPilotTable", sCellAdress, DPDsc); XIndexAccess xIA = (XIndexAccess) UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ()); XIndexAccess IA = null; @@ -310,7 +310,7 @@ public class ScDataPilotFieldGroupObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); } - + try { XDataPilotFieldGrouping dpfg = (XDataPilotFieldGrouping) UnoRuntime.queryInterface (XDataPilotFieldGrouping.class, datapilotfield); @@ -332,7 +332,7 @@ public class ScDataPilotFieldGroupObj extends TestCase { e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); - } + } for (int i=0;i<IA.getCount ();i++) { datapilotfield = (XInterface) AnyConverter.toObject ( @@ -354,16 +354,16 @@ public class ScDataPilotFieldGroupObj extends TestCase { e.printStackTrace (); } - + log.println ("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); - + TestEnvironment tEnv = new TestEnvironment (oObj); - + log.println ("Implementationname: " + util.utils.getImplName (oObj)); - + // Other parameters required for interface tests return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 152c1d82a09a..5045ed93647a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,13 +60,13 @@ import util.SOfficeFactory; public class ScDataPilotFieldGroupsObj extends TestCase { static XSpreadsheetDocument xSheetDoc = null; - + /** * A field is filled some values. This integer determines the size of the * field in x and y direction. */ private int mMaxFieldIndex = 6; - + /** * Creates Spreadsheet document. */ @@ -74,7 +74,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory ( (XMultiServiceFactory) tParam.getMSF ()); - + try { log.println ("creating a Spreadsheet document"); @@ -87,30 +87,30 @@ public class ScDataPilotFieldGroupsObj extends TestCase throw new StatusException ("Couldn't create document", e); } } - + /** * Disposes Spreadsheet document. */ protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); - + XComponent oComp = (XComponent) UnoRuntime.queryInterface ( XComponent.class, xSheetDoc); util.DesktopTools.closeDoc (oComp); } - + protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface datapilotfield = null; - - + + // creation of testobject here // first we write what we are intend to do to log file log.println ("Creating a test environment"); - + // the cell range CellRangeAddress sCellRangeAdress = new CellRangeAddress (); sCellRangeAdress.Sheet = 0; @@ -118,21 +118,21 @@ public class ScDataPilotFieldGroupsObj extends TestCase sCellRangeAdress.StartRow = 0; sCellRangeAdress.EndColumn = mMaxFieldIndex - 1; sCellRangeAdress.EndRow = mMaxFieldIndex - 1; - + // position of the data pilot table CellAddress sCellAdress = new CellAddress (); sCellAdress.Sheet = 0; sCellAdress.Column = 7; sCellAdress.Row = 8; - + log.println ("Getting a sheet"); - + XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = (XIndexAccess) UnoRuntime.queryInterface ( XIndexAccess.class, xSpreadsheets); - + try { oSheet = (XSpreadsheet) AnyConverter.toObject ( @@ -157,11 +157,11 @@ public class ScDataPilotFieldGroupsObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get a spreadsheet", e); } - + try { log.println ("Filling a table"); - + for (int i = 1; i < mMaxFieldIndex; i++) { oSheet.getCellByPosition (i, 0).setFormula ("Col" + i); @@ -169,7 +169,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase oSheet2.getCellByPosition (i, 0).setFormula ("Col" + i); oSheet2.getCellByPosition (0, i).setFormula ("Row" + i); } - + for (int i = 1; i < mMaxFieldIndex; i++) { for (int j = 1; j < mMaxFieldIndex; j++) @@ -178,35 +178,35 @@ public class ScDataPilotFieldGroupsObj extends TestCase oSheet2.getCellByPosition (i, j).setValue (i * (j + 2)); } } - + oSheet.getCellByPosition (1, 1).setFormula ("aName"); oSheet.getCellByPosition (1, 2).setFormula ("otherName"); oSheet.getCellByPosition (1, 3).setFormula ("una"); oSheet.getCellByPosition (1, 4).setFormula ("otherName"); oSheet.getCellByPosition (1, 5).setFormula ("somethingelse"); - + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace (); 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); - + int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - - + + // cell of the data pilot output oCheckCell = oSheet.getCellByPosition (x, y); aChangeValue = new Integer (27); @@ -216,20 +216,20 @@ public class ScDataPilotFieldGroupsObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get cells for changeing.", e); } - - + + // create the test objects log.println ("Getting test objects"); - + XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface ( XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables (); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor (); DPDsc.setSourceRange (sCellRangeAdress); - - XPropertySet fieldPropSet = null; - + + XPropertySet fieldPropSet = null; + try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); @@ -275,14 +275,14 @@ public class ScDataPilotFieldGroupsObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't create a test environment", e); } - + log.println ("Insert the DataPilotTable"); - + if (DPT.hasByName ("DataPilotTable")) { DPT.removeByName ("DataPilotTable"); } - + DPT.insertNewByName ("DataPilotTable", sCellAdress, DPDsc); XIndexAccess xIA = (XIndexAccess) UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ()); XIndexAccess IA = null; @@ -310,7 +310,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); } - + try { XDataPilotFieldGrouping dpfg = (XDataPilotFieldGrouping) UnoRuntime.queryInterface (XDataPilotFieldGrouping.class, datapilotfield); @@ -332,7 +332,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase { e.printStackTrace (); throw new StatusException ("Couldn't get data pilot field", e); - } + } for (int i=0;i<IA.getCount ();i++) { datapilotfield = (XInterface) AnyConverter.toObject ( @@ -352,16 +352,16 @@ public class ScDataPilotFieldGroupsObj extends TestCase { e.printStackTrace (); } - + log.println ("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); - + TestEnvironment tEnv = new TestEnvironment (oObj); - + log.println ("Implementationname: " + util.utils.getImplName (oObj)); - + // Other parameters required for interface tests return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index c19e8dab3b36..27f2da2a8a6b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class ScDataPilotFieldObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -157,10 +157,10 @@ public class ScDataPilotFieldObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); oSheet2 = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(1)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -220,7 +220,7 @@ public class ScDataPilotFieldObj extends TestCase { log.println("Getting test objects"); XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface( - XDataPilotTablesSupplier.class, + XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables(); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor(); @@ -241,9 +241,9 @@ public class ScDataPilotFieldObj extends TestCase { } try { - fieldPropSet.setPropertyValue("Function", + fieldPropSet.setPropertyValue("Function", com.sun.star.sheet.GeneralFunction.SUM); - fieldPropSet.setPropertyValue("Orientation", + fieldPropSet.setPropertyValue("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -284,7 +284,7 @@ public class ScDataPilotFieldObj extends TestCase { throw new StatusException("Couldn't get data pilot field", e); } - log.println("Creating object - " + + log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); TestEnvironment tEnv = new TestEnvironment(oObj); @@ -318,7 +318,7 @@ public class ScDataPilotFieldObj extends TestCase { return; } - XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, field); String name = named.getName(); @@ -333,35 +333,35 @@ public class ScDataPilotFieldObj extends TestCase { try { switch (cnt % 5) { case 0: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.COLUMN); log.println(" Column"); break; case 1: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.ROW); log.println(" Row"); break; case 2: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.DATA); log.println(" Data"); break; case 3: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.HIDDEN); log.println(" Hidden"); break; case 4: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.PAGE); log.println(" Page"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java index a8de7196baba..8ef56fbc041d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index c50a32775416..b2c0b6c4bff9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public class ScDataPilotItemObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -158,10 +158,10 @@ public class ScDataPilotItemObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); oSheet2 = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(1)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -221,7 +221,7 @@ public class ScDataPilotItemObj extends TestCase { log.println("Getting test objects"); XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface( - XDataPilotTablesSupplier.class, + XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables(); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor(); @@ -242,9 +242,9 @@ public class ScDataPilotItemObj extends TestCase { } try { - fieldPropSet.setPropertyValue("Function", + fieldPropSet.setPropertyValue("Function", com.sun.star.sheet.GeneralFunction.SUM); - fieldPropSet.setPropertyValue("Orientation", + fieldPropSet.setPropertyValue("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -285,7 +285,7 @@ public class ScDataPilotItemObj extends TestCase { throw new StatusException("Couldn't get data pilot field", e); } - log.println("Creating object - " + + log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); XDataPilotField xDataPilotField = (XDataPilotField) UnoRuntime.queryInterface( @@ -294,7 +294,7 @@ public class ScDataPilotItemObj extends TestCase { XIndexAccess xIA = xDataPilotField.getItems(); try { - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, + oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, xIA.getByIndex(0)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get DataPilotItemObj"); @@ -336,7 +336,7 @@ public class ScDataPilotItemObj extends TestCase { return; } - XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, field); String name = named.getName(); @@ -351,35 +351,35 @@ public class ScDataPilotItemObj extends TestCase { try { switch (cnt % 5) { case 0: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.COLUMN); log.println(" Column"); break; case 1: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.ROW); log.println(" Row"); break; case 2: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.DATA); log.println(" Data"); break; case 3: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.HIDDEN); log.println(" Hidden"); break; case 4: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.PAGE); log.println(" Page"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index ac9971b3c778..c3d0df45cbe2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public class ScDataPilotItemsObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -158,10 +158,10 @@ public class ScDataPilotItemsObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); oSheet2 = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(1)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -221,7 +221,7 @@ public class ScDataPilotItemsObj extends TestCase { log.println("Getting test objects"); XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface( - XDataPilotTablesSupplier.class, + XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables(); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor(); @@ -242,9 +242,9 @@ public class ScDataPilotItemsObj extends TestCase { } try { - fieldPropSet.setPropertyValue("Function", + fieldPropSet.setPropertyValue("Function", com.sun.star.sheet.GeneralFunction.SUM); - fieldPropSet.setPropertyValue("Orientation", + fieldPropSet.setPropertyValue("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -285,7 +285,7 @@ public class ScDataPilotItemsObj extends TestCase { throw new StatusException("Couldn't get data pilot field", e); } - log.println("Creating object - " + + log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); XDataPilotField xDataPilotField = (XDataPilotField) UnoRuntime.queryInterface( @@ -324,7 +324,7 @@ public class ScDataPilotItemsObj extends TestCase { return; } - XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, field); String name = named.getName(); @@ -339,35 +339,35 @@ public class ScDataPilotItemsObj extends TestCase { try { switch (cnt % 5) { case 0: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.COLUMN); log.println(" Column"); break; case 1: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.ROW); log.println(" Row"); break; case 2: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.DATA); log.println(" Data"); break; case 3: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.HIDDEN); log.println(" Hidden"); break; case 4: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.PAGE); log.println(" Page"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java index 290c2d9c07b2..015b94b7f31f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -282,13 +282,13 @@ public class ScDataPilotTableObj extends TestCase { return tEnv; } - /** + /** * Create a new DataPilot table output for use with testing XDataPilotTable2 - * interface. - * + * interface. + * * @param oSheet current sheet instance * @param srcRange source range - * @param tEnv test environment instance + * @param tEnv test environment instance */ private void createTable2(XSpreadsheet oSheet, CellRangeAddress srcRange, TestEnvironment tEnv) { @@ -303,7 +303,7 @@ public class ScDataPilotTableObj extends TestCase { int fieldCount = xIA.getCount() - 1; // skip the last field because it's always hidden. try { - for (int i = 0; i < fieldCount; ++i) + for (int i = 0; i < fieldCount; ++i) { Object o = xIA.getByIndex(i); XPropertySet fieldPropSet = (XPropertySet)UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java index 27ce48595b7c..73a174902fb9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index 0b9a71c860a3..d10a1a792340 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ public class ScDatabaseRangeObj extends TestCase { * @see com.sun.star.sheet.DatabaseRange * @see com.sun.star.table.CellRangeAddress */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -149,10 +149,10 @@ public class ScDatabaseRangeObj extends TestCase { try { Object sheet = sheets.getByName(names[0]); - xImp = (XImportable) UnoRuntime.queryInterface(XImportable.class, + xImp = (XImportable) UnoRuntime.queryInterface(XImportable.class, sheet); dbRanges = (XDatabaseRanges) AnyConverter.toObject( - new Type(XDatabaseRanges.class), + new Type(XDatabaseRanges.class), docProps.getPropertyValue("DatabaseRanges")); _doImport(xImp); } catch (com.sun.star.lang.WrappedTargetException e) { @@ -184,20 +184,20 @@ public class ScDatabaseRangeObj extends TestCase { try { String[] dbNames = dbrNA.getElementNames(); - xNamed = (XNamed) UnoRuntime.queryInterface(XNamed.class, + xNamed = (XNamed) UnoRuntime.queryInterface(XNamed.class, dbrNA.getByName( dbNames[0])); xNamed.setName("dbRange"); XCellRangeReferrer aReferrer = (XCellRangeReferrer) UnoRuntime.queryInterface( - XCellRangeReferrer.class, + XCellRangeReferrer.class, dbrNA.getByName("dbRange")); XCellRangeAddressable aRangeA = (XCellRangeAddressable) UnoRuntime.queryInterface( - XCellRangeAddressable.class, + XCellRangeAddressable.class, aReferrer.getReferredCells()); aRange = aRangeA.getRangeAddress(); oObj = (XInterface) AnyConverter.toObject( - new Type(XInterface.class), + new Type(XInterface.class), dbrNA.getByName("dbRange")); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -228,12 +228,12 @@ public class ScDatabaseRangeObj extends TestCase { } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); throw new StatusException( - "Error getting of first spreadsheet from spreadsheet" + + "Error getting of first spreadsheet from spreadsheet" + " document", e); } catch (com.sun.star.container.NoSuchElementException e) { e.printStackTrace(log); throw new StatusException( - "Error getting of first spreadsheet from spreadsheet" + + "Error getting of first spreadsheet from spreadsheet" + " document", e); } diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java index 1125628c357e..06b8d3e17c74 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java index afcae57deb47..f15d109ce413 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java +++ b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,10 +68,10 @@ public class ScDocumentConfiguration extends TestCase { DesktopTools.closeDoc(xSheetDoc); } - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory docMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, xSheetDoc); Object oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java index a01dd8441fc9..4a6e1eaea16c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java index ce766e056f66..ec1ccf069fc5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java index 2477eb8230d1..abcdb81ab116 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java index 9360a2301205..719a55ded4f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java index 19762e3897e3..3b171bde6432 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java index e8180fa2f255..5f3ce09f8f61 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java index 25cbc68fa9c4..97fcf84ad8d2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java index 2d3719cf8fa4..a71077cd26d6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java index 521d754da79a..13083444297e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java index 38495bbc8673..a70cef7b7304 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java index a3bd6160657c..ef70232f14a9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java index 33066b04432c..1224cc0cbb8c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java index 787c0e33881d..1f98b8e902c8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java index 0406f914622c..9034de739054 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java index 955fb407b22e..3b1d914205f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index 5755966c0ed2..3474f22f84f4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -160,10 +160,10 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); oSheet2 = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(1)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -223,7 +223,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration log.println("Getting test objects"); XDataPilotTablesSupplier DPTS = (XDataPilotTablesSupplier) UnoRuntime.queryInterface( - XDataPilotTablesSupplier.class, + XDataPilotTablesSupplier.class, oSheet); XDataPilotTables DPT = DPTS.getDataPilotTables(); XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor(); @@ -244,9 +244,9 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration } try { - fieldPropSet.setPropertyValue("Function", + fieldPropSet.setPropertyValue("Function", com.sun.star.sheet.GeneralFunction.SUM); - fieldPropSet.setPropertyValue("Orientation", + fieldPropSet.setPropertyValue("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -287,14 +287,14 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration throw new StatusException("Couldn't get data pilot field", e); } - log.println("Creating object - " + + log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); XDataPilotField xDataPilotField = (XDataPilotField) UnoRuntime.queryInterface( XDataPilotField.class, oObj); XEnumerationAccess xEnumerationAccess = (XEnumerationAccess) UnoRuntime.queryInterface( - XEnumerationAccess.class, + XEnumerationAccess.class, xDataPilotField.getItems()); oObj = xEnumerationAccess.createEnumeration(); @@ -330,7 +330,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration return; } - XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed named = (XNamed) UnoRuntime.queryInterface(XNamed.class, field); String name = named.getName(); @@ -345,35 +345,35 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration try { switch (cnt % 5) { case 0: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.COLUMN); log.println(" Column"); break; case 1: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.ROW); log.println(" Row"); break; case 2: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.DATA); log.println(" Data"); break; case 3: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.HIDDEN); log.println(" Hidden"); break; case 4: - props.setPropertyValue("Orientation", + props.setPropertyValue("Orientation", DataPilotFieldOrientation.PAGE); log.println(" Page"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java index 652623f2ef74..0b7bdabaf6b7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java index 314c5884952b..bf1b874d92ca 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java index 017920b57d02..03f890e1b28b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java index 6a07462a0df9..594868d0e65a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java index 080a454fac51..b66cb993eb97 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java index f8ca5d66c8b3..3f17dd472e8b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java index 5001a02da185..9094469f690d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java index e91b153dcbab..769f031a53cc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { XSheetLinkable SL = (XSheetLinkable) UnoRuntime.queryInterface(XSheetLinkable.class, oSheet); - // creating link. + // creating link. String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc"); SL.link(aSourceArea, "Sheet1", "", "", com.sun.star.sheet.SheetLinkMode.VALUE); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java index d369c81ec336..22779ea482f6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java index 325472ed724a..439d22b55cc9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java index 83c3b22e9f70..6659a68f8965 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java index a399e095fed8..8212b7828f1a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index f1beaf8ad87b..25097fd9d9f0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java index d6e3267daf0f..a5a018cea24f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java index 13c5a2939703..9dd0e2f21410 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java index 52e362fab9aa..0892f58acc16 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java index 6f1c23f614ce..95065d5d72f4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java index 59e7850f15fc..bafb8cd3d68f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java index c1e3b57e2b63..6808d2f6401a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java index 6dd93942ff6b..52223953c94a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ public class ScModelObj extends TestCase { XComponent.class, xSpreadsheetDoc); util.DesktopTools.closeDoc(oComp); - oComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, + oComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, xSecondsheetDoc); util.DesktopTools.closeDoc(oComp); } @@ -124,7 +124,7 @@ public class ScModelObj extends TestCase { * </ul> * @see */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // creation of the testobject here // first we write what we are intend to do to log file @@ -155,9 +155,9 @@ public class ScModelObj extends TestCase { throw new StatusException("Couldn't create document ", e); } - XModel model1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel model1 = (XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - XModel model2 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel model2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondsheetDoc); XInterface oObj = model1; @@ -180,7 +180,7 @@ public class ScModelObj extends TestCase { XIndexAccess oIndexSheets = (XIndexAccess) UnoRuntime.queryInterface( XIndexAccess.class, oSheets); XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexSheets.getByIndex(0)); log.println("Getting a cell from sheet"); @@ -190,7 +190,7 @@ public class ScModelObj extends TestCase { oSheet.getCellByPosition(5, 5).setValue(10); oSheet.getCellByPosition(6, 5).setFormula("= E6 * F6"); xCalculatableCells = new XCell[]{ - oSheet.getCellByPosition(4, 5), + oSheet.getCellByPosition(4, 5), oSheet.getCellByPosition(5, 5), oSheet.getCellByPosition(6, 5) }; @@ -225,8 +225,8 @@ public class ScModelObj extends TestCase { } _XPrintJobBroadcaster.MyPrintJobListener listener = new _XPrintJobBroadcaster.MyPrintJobListener(oObj, fileName); tEnv.addObjRelation("XPrintJobBroadcaster.XPrintJobListener", listener); - + return tEnv; } - + } // finish class ScModelObj diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java index 9be7b474161a..2fcac156fca3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java index b7ed2add02c6..ef9ad060e0dc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java index 30f9de40250f..aeaa0a4eab65 100644 --- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java index aae4b08ba19e..51f284453e77 100644 --- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java index 1257498a53fd..e8953bb3efdf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ import com.sun.star.uno.XInterface; public class ScShapeObj extends TestCase { static XComponent xSheetDoc; - + protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); @@ -107,9 +107,9 @@ public class ScShapeObj extends TestCase { // create test environment here TestEnvironment tEnv = new TestEnvironment( oShape ); - + log.println("Implementation name: "+util.utils.getImplName(oObj)); - tEnv.addObjRelation("DOCUMENT",xSheetDoc); + tEnv.addObjRelation("DOCUMENT",xSheetDoc); return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java index 1a6fa837dbce..8af7acd39fa6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java index ada0b9d5cd1c..9f7fb9a2d32f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java index c193eef05d1c..74ffdf1a8928 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java index eb5b9760a8ee..98a7d7658353 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java index 98016c8b5cf9..a38071cb4041 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java index a9601a671554..fd5d58a5039a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java index 3c90df65111e..128acaa84d4c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java index 44181500ce9f..7937aebb549f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java index f353d6a2f547..eb821d2fabbe 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,10 +140,10 @@ public class ScSubTotalDescriptorBase extends TestCase { column.Column = 3; column.Function = GeneralFunction.SUM; columns[0] = column; - + XSubTotalDescriptor desc = xSTC.createSubTotalDescriptor(true); desc.addNew(columns, 1); - + XInterface oObj = desc; TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java index ffe5db10607b..0282e18c11f0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java index d90f91b43ab0..6431bcaeeb66 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,15 +95,15 @@ import com.sun.star.uno.XInterface; public class ScTabViewObj extends TestCase { public static XSpreadsheetDocument xSpreadsheetDoc; public static XSpreadsheetDocument xSpreadsheetDoc2; - + /** * Creates Spreadsheet document. */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - + SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); - + try { log.println("creating two spreadsheet documents"); xSpreadsheetDoc = SOF.createCalcDoc(null); @@ -116,7 +116,7 @@ public class ScTabViewObj extends TestCase { throw new StatusException( "Couldn't create document ", e ); } } - + /** * Disposes Spreadsheet document. */ @@ -129,7 +129,7 @@ public class ScTabViewObj extends TestCase { UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc2) ; util.DesktopTools.closeDoc(oComp2); } - + /** * Creating a Testenvironment for the interfaces to be tested. * Retieves the current controller of the spreadsheet document using the @@ -147,18 +147,18 @@ public class ScTabViewObj extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XDrawPage oDrawPage = null; - + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - + XModel aSecondModel = (XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc2); - + XInterface oObj = aModel.getCurrentController(); - + log.println("getting sheets"); XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); - + log.println("getting a sheet"); XSpreadsheet oSheet = null; XIndexAccess oIndexAccess = (XIndexAccess) @@ -176,17 +176,17 @@ public class ScTabViewObj extends TestCase { e.printStackTrace(log); throw new StatusException( "Couldn't get a spreadsheet", e); } - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("XDispatchProvider.URL", ".uno:Copy") ; - + log.println("adding 'Sheet' as ObjRelation"); tEnv.addObjRelation("Sheet", oSheet); tEnv.addObjRelation("Frame",aModel.getCurrentController().getFrame()); tEnv.addObjRelation("SecondModel",aSecondModel); tEnv.addObjRelation("FirstModel",aModel); - + //Relation for XControlAccess tEnv.addObjRelation("DOCUMENT", UnoRuntime.queryInterface(XComponent.class,xSpreadsheetDoc)); tEnv.addObjRelation("XControlAccess.isSheet", Boolean.TRUE); @@ -204,10 +204,10 @@ public class ScTabViewObj extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't get some cell", e); } - + Object[] selections = {oSheet, cellRange, cell_1, cell_2}; tEnv.addObjRelation("Selections", selections); - + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XCellRangeAddressable adr1 = (XCellRangeAddressable) @@ -222,26 +222,26 @@ public class ScTabViewObj extends TestCase { public boolean equals(Object obj) { return compare(this, obj) == 0; } }); - + tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + // XForm for com.sun.star.view.XFormLayerAccess - + XForm myForm = null; String kindOfControl="CommandButton"; XShape aShape = null; try{ log.println("adding contol shape '" + kindOfControl + "'"); XComponent oComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc) ; - + aShape = FormTools.createControlShape(oComp, 3000, 4500, 15000, 10000, kindOfControl); - + } catch (Exception e){ e.printStackTrace(log); throw new StatusException("Couldn't create following control shape : '" + kindOfControl + "': ", e); } - + log.println("adding relation for com.sun.star.view.XFormLayerAccess: XForm"); try { log.println( "getting Drawpages" ); @@ -254,7 +254,7 @@ public class ScTabViewObj extends TestCase { new Type(XDrawPage.class),oDP.getByIndex(0)); if (oDrawPage == null) log.println("ERROR: could not get DrawPage: null"); - + oDrawPage.add(aShape); log.println("getting XForm"); XNameContainer xForm = FormTools.getForms(oDrawPage); @@ -279,5 +279,5 @@ public class ScTabViewObj extends TestCase { } return tEnv; } - + } // finish class ScTabViewObj diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java index e3f0f54d0e94..541de2ee0c9c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java index 6dca3b67d4bb..c93b5fcf8f51 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public class ScTableColumnsObj extends TestCase { * @see com.sun.star.table.TableColumns */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + XInterface oObj = null; // creation of the testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java index b427536b3dba..ad91ad4b5712 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java index c873ba5e4367..9dc73573ef9d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java index 077cbf26c4c1..f4db946d2a3a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java index 17e45dc1fb59..46ac8fddc1ab 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index f6355fe0de86..d50e80008079 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ public class ScTableSheetObj extends TestCase { * </ul> * @see com.sun.star.sheet.XArrayFormulaRange */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -206,7 +206,7 @@ public class ScTableSheetObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -241,38 +241,38 @@ public class ScTableSheetObj extends TestCase { log.println("creating a new environment for object"); TestEnvironment tEnv = new TestEnvironment(oObj); - + // do not execute com::sun::star::sheets::XCellSeries::fillAuto() tEnv.addObjRelation("XCELLSERIES_FILLAUTO", new Boolean(false)); // set the adress ranges of the cells (see values set above): for e.g. XSheetOutline test - tEnv.addObjRelation("CellRangeAddress", + tEnv.addObjRelation("CellRangeAddress", new CellRangeAddress((short)0, 6, 6, 8, 8)); - tEnv.addObjRelation("CellRangeSubAddress", + tEnv.addObjRelation("CellRangeSubAddress", new CellRangeAddress((short)0, 6, 6, 7, 8)); // pick a cell with a formula for XSheetAuditing, a dependent cell and a precedent cell tEnv.addObjRelation("XSheetAuditing.CellAddress", new CellAddress((short)0, 8, 6)); tEnv.addObjRelation("XSheetAuditing.PrecedentCellAddress", new CellAddress((short)0, 7, 6)); tEnv.addObjRelation("XSheetAuditing.DependentCellAddress", new CellAddress((short)0, 9, 6)); - + // add an existing sheet for linking tEnv.addObjRelation("XSheetLinkable.LinkSheet", "ScSheetLinksObj.sdc"); - + //adding Scenario and with that a ScenarioSheet-Relation for Scenario and XScenarioEnhanced XScenariosSupplier scene = (XScenariosSupplier) UnoRuntime.queryInterface( - XScenariosSupplier.class, + XScenariosSupplier.class, tEnv.getTestObject()); scene.getScenarios() - .addNewByName("Scenario", + .addNewByName("Scenario", new CellRangeAddress[] { new CellRangeAddress((short) 0, 0, 0, 10, 10) }, "Comment"); XSpreadsheet sSheet = null; - + try { sSheet = (XSpreadsheet) UnoRuntime.queryInterface( - XSpreadsheet.class, + XSpreadsheet.class, xSpreadsheets.getByName("Scenario")); } catch (com.sun.star.container.NoSuchElementException e) { log.println("Couldn't get Scenario"); @@ -282,7 +282,7 @@ public class ScTableSheetObj extends TestCase { tEnv.addObjRelation("ScenarioSheet", sSheet); - log.println("adding ObjRelation 'noArray' to avoid the test" + + log.println("adding ObjRelation 'noArray' to avoid the test" + " 'XArrayFormulaRange'"); tEnv.addObjRelation("noArray", "ScTableSheetObj"); @@ -300,17 +300,17 @@ public class ScTableSheetObj extends TestCase { expectedResults[_XCellRangesQuery.QUERYINTERSECTION] = "Sheet1.D4"; expectedResults[_XCellRangesQuery.QUERYROWDIFFERENCES] = "Sheet1.A5;Sheet1.C1"; expectedResults[_XCellRangesQuery.QUERYVISIBLECELLS] = "Sheet1.A2"; - tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", + tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", expectedResults); // for XFormulaQuery interface test try { - tEnv.addObjRelation("MAKEENTRYINCELL", + tEnv.addObjRelation("MAKEENTRYINCELL", oSheet.getCellByPosition(15, 15)); tEnv.addObjRelation("RANGEINDICES", new int[] { 0, 0 }); - tEnv.addObjRelation("EXPECTEDDEPENDENTVALUES", + tEnv.addObjRelation("EXPECTEDDEPENDENTVALUES", new int[] { 0, 255, 0, 65535 }); - tEnv.addObjRelation("EXPECTEDPRECEDENTVALUES", + tEnv.addObjRelation("EXPECTEDPRECEDENTVALUES", new int[] { 0, 255, 0, 65535 }); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println( @@ -319,9 +319,9 @@ public class ScTableSheetObj extends TestCase { // XSearchable interface test try { - tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", + tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", new XCell[] { - oSheet.getCellByPosition(15, 15), + oSheet.getCellByPosition(15, 15), oSheet.getCellByPosition(15, 16) }); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -333,7 +333,7 @@ public class ScTableSheetObj extends TestCase { //Adding relation for util.XSortable final PrintWriter finalLog = log; final XCellRange oTable = oSheet; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -352,7 +352,7 @@ public class ScTableSheetObj extends TestCase { } } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); @@ -376,16 +376,16 @@ public class ScTableSheetObj extends TestCase { String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } else { @@ -393,15 +393,15 @@ public class ScTableSheetObj extends TestCase { String[] rightVal = { "3", "4", "23", "b" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java index c31f692b8e51..4559c6fc0765 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java index 972e1e010f55..63b78fc806af 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java index 1068af55b063..1d6e96564b6f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,12 +75,12 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { * Disposes Spreadsheet document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { - //add this lines after synchronisation + //add this lines after synchronisation //log.println(" disposing xSheetDoc "); //DesktopTools.closeDoc(xSheetDoc); } - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("Getting the first sheet"); @@ -107,11 +107,11 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { changeColor("D1:D10", 0, 255, 0); XUniqueCellFormatRangesSupplier xUCRS = (XUniqueCellFormatRangesSupplier) UnoRuntime.queryInterface( - XUniqueCellFormatRangesSupplier.class, + XUniqueCellFormatRangesSupplier.class, oSheet); XEnumerationAccess xEnum = (XEnumerationAccess) UnoRuntime.queryInterface( - XEnumerationAccess.class, + XEnumerationAccess.class, xUCRS.getUniqueCellFormatRanges()); XInterface oObj = xEnum.createEnumeration(); log.println("Implementationname: " + util.utils.getImplName(oObj)); @@ -119,7 +119,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); tEnv.addObjRelation("ExpectedCount", new Integer(4)); - + return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java index e85fcb2bb4c5..049f3f672ef2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,12 +74,12 @@ public class ScUniqueCellFormatsObj extends TestCase { * Disposes Spreadsheet document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { - //add this lines after synchronisation + //add this lines after synchronisation //log.println(" disposing xSheetDoc "); //DesktopTools.closeDoc(xSheetDoc); } - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("Getting the first sheet"); @@ -106,7 +106,7 @@ public class ScUniqueCellFormatsObj extends TestCase { changeColor("D1:D10", 0, 255, 0); XUniqueCellFormatRangesSupplier xUCRS = (XUniqueCellFormatRangesSupplier) UnoRuntime.queryInterface( - XUniqueCellFormatRangesSupplier.class, + XUniqueCellFormatRangesSupplier.class, oSheet); XInterface oObj = xUCRS.getUniqueCellFormatRanges(); diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java index cf8bbce0843b..88e2a0fd87d2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,14 +75,14 @@ public class ScViewPaneObj extends TestCase { static private XSpreadsheetDocument xSpreadsheetDoc; static private SOfficeFactory SOF; static private XInterface oObj; - + /** * Creates Spreadsheet document. */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); - + try { log.println("creating a spreadsheetdocument"); xSpreadsheetDoc = SOF.createCalcDoc(null); @@ -91,7 +91,7 @@ public class ScViewPaneObj extends TestCase { throw new StatusException( "Couldn't create document ", e ); } } - + /** * Disposes Spreadsheet document. */ @@ -101,7 +101,7 @@ public class ScViewPaneObj extends TestCase { UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); util.DesktopTools.closeDoc(oComp); } - + /** * Creating a Testenvironment for the interfaces to be tested. * Retieves the current controller of the spreadsheet document using the @@ -119,7 +119,7 @@ public class ScViewPaneObj extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XDrawPage oDrawPage; - + XModel xm = (XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); XController xc = xm.getCurrentController(); @@ -138,36 +138,36 @@ public class ScViewPaneObj extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't get by index", e); } - + TestEnvironment tEnv = new TestEnvironment(oObj); - + //Relation for XControlAccess tEnv.addObjRelation("DOCUMENT", UnoRuntime.queryInterface(XComponent.class,xSpreadsheetDoc)); tEnv.addObjRelation("XControlAccess.isSheet", Boolean.TRUE); - + XViewPane VP = (XViewPane) UnoRuntime.queryInterface(XViewPane.class, oObj); CellRangeAddress dataArea = VP.getVisibleRange(); tEnv.addObjRelation("DATAAREA", dataArea); - + // XForm for com.sun.star.view.XFormLayerAccess log.println("adding relation for com.sun.star.view.XFormLayerAccess: XForm"); - + XForm myForm = null; String kindOfControl="CommandButton"; XShape aShape = null; try{ log.println("adding contol shape '" + kindOfControl + "'"); XComponent oComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc) ; - + aShape = FormTools.createControlShape(oComp, 3000, 4500, 15000, 10000, kindOfControl); - + } catch (Exception e){ e.printStackTrace(log); throw new StatusException("Couldn't create following control shape : '" + kindOfControl + "': ", e); } - + try { log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = (XDrawPagesSupplier) @@ -179,7 +179,7 @@ public class ScViewPaneObj extends TestCase { new Type(XDrawPage.class),oDP.getByIndex(0)); if (oDrawPage == null) log.println("ERROR: could not get DrawPage: null"); - + oDrawPage.add(aShape); log.println("getting XForm"); XNameContainer xForm = FormTools.getForms(oDrawPage); @@ -202,7 +202,7 @@ public class ScViewPaneObj extends TestCase { } catch (com.sun.star.lang.IllegalArgumentException ex) { log.println("ERROR: could not add ObjectRelation 'XFormLayerAccess.XForm': " + ex.toString()); } - + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java index 56a9ec8e6579..4defeb81b290 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -147,7 +147,7 @@ public class XMLContentExporter extends TestCase { new Type(XSpreadsheet.class),xSheetsIndexArray.getByIndex(0)); XCell xCell = xSheet.getCellByPosition(0, 0); xCell.setFormula(CELL_TEXT); - + log.println("fill sheet 1 with contnet..."); util.CalcTools.fillCalcSheetWithContent(xSheetDoc, 1, 1, 1, 5, 5); diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java index 26c8851c741d..9026c664d90a 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java index f7a038f5dd88..1e2454c52bb0 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,10 +145,10 @@ public class XMLExporter extends TestCase { XNamed xSheetNamed = (XNamed) UnoRuntime.queryInterface(XNamed.class, xSheet); xSheetNamed.setName(SHEET_NAME); - + log.println("fill sheet with contnet..."); util.CalcTools.fillCalcSheetWithContent(xSheet, 3, 3, 50, 50); - + } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLImporter.java b/qadevOOo/tests/java/mod/_sc/XMLImporter.java index 64e9225bed02..3f6c9d69c51e 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java index 02c5cfb566f7..c6ae9c78bd46 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,10 +148,10 @@ public class XMLMetaExporter extends TestCase { XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, infoSup.getDocumentInfo()) ; docInfo.setPropertyValue("Title", "TestDocument"); - + log.println("fill sheet 1 with contnet..."); util.CalcTools.fillCalcSheetWithContent(xSheetDoc,1, 3, 3, 50, 50); - + } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create environment.", e) ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java index 29deca17e424..9ddce92e1766 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java index 04c3cbc76c2a..9126221adf69 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -141,9 +141,9 @@ public class XMLSettingsExporter extends TestCase { XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xController); xPropSet.setPropertyValue("ShowGrid", "false"); - + util.CalcTools.fillCalcSheetWithContent(xSheetDoc,1, 3, 3, 50, 50); - + } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java index 72954a3aa93f..68b2df5b5f0f 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java index f0f5f387e0ef..51671d8d279c 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -147,7 +147,7 @@ public class XMLStylesExporter extends TestCase { XStyleFamiliesSupplier.class, xSheetDoc); XNameAccess StyleFamilies = styleSup.getStyleFamilies(); String[] styleFamiliesNames = StyleFamilies.getElementNames(); - XNameContainer StyleFamilyName = (XNameContainer) + XNameContainer StyleFamilyName = (XNameContainer) AnyConverter.toObject(new Type(XNameContainer.class), StyleFamilies.getByName(styleFamiliesNames[0])); Object SC = SOF.createInstance( @@ -155,10 +155,10 @@ public class XMLStylesExporter extends TestCase { XStyle StyleCell = (XStyle) UnoRuntime.queryInterface(XStyle.class,SC); StyleFamilyName.insertByName(newName, StyleCell); - + log.println("fill sheet 1 with contnet..."); util.CalcTools.fillCalcSheetWithContent(xSheetDoc, 1, 3, 3, 50, 100); - + } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Can't create environment.", e); diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java index 7454ff849e42..a9bec3a769fc 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index b371f1950558..3c2a0553b53b 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index 2cdecae03aca..f566c2178d7d 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 3e94364a0559..2be986c8dd6e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index 2d5ec4fde1d5..7d0869150f63 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 9b7f90766fdd..cafb821be171 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index 37d56815983d..d41d88a73509 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index 268f53ec8b3d..0cf1cbb2ed49 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index aa46cdb8407d..f04b8f8916bb 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 61c221df57e0..89f5adf86b99 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index aafe91fdd3d4..79c820d74ebe 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 0639f19ca4cc..17ad8808d6e8 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 66779421cc0b..96b2aed3ca50 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index 9031680f93f1..d52e5a37ff2e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index f796d5530a9c..786456d27381 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index 3236e345b8e6..861cd2b807c6 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index 14caeefff8c1..b9db27d44582 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index deafa9922043..423a9f473457 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ public class ChXChartDocument extends TestCase { * @see com.sun.star.chart.XChartData * @see com.sun.star.chart.ChartDocument */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, + protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -159,7 +159,7 @@ public class ChXChartDocument extends TestCase { tEnv.addObjRelation("CONT2", cont2); log.println("adding another Diagram as mod relation to environment"); - tEnv.addObjRelation("DIAGRAM", + tEnv.addObjRelation("DIAGRAM", SOF.createDiagram(xChartDoc, "PieDiagram")); log.println("adding another ChartData as mod relation to environment"); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index f5476f2d0643..9a8ada525fa3 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java index 0c1647684c75..078571d5df9c 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java index 69139ea5d902..5bb8d83ac3a8 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java index 908b947c4898..901467a89d33 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java index 614327f94a1e..017a1be8a4f3 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartArea.java +++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index 73a44b810436..f863d134bceb 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java index a0dd4fe3ec64..429e30d325ed 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java index 950885060f5f..495bda11c4b7 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLine.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ public class ChartLine extends TestCase { e.printStackTrace( log ); throw new StatusException( "Couldn't get Line", e ); } - + log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index f88c938693bc..004599065969 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index b6f6bc4c881d..383e8eadcf16 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index a486bada5987..a5feffd8612a 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index 31c00288a561..0c78c06c592e 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class AccessibleSlideView extends TestCase { XDrawPagesSupplier oDPS = (XDrawPagesSupplier) UnoRuntime.queryInterface(XDrawPagesSupplier.class, aModel); XDrawPages oDPn = oDPS.getDrawPages(); - + oDPn.insertNewByIndex(0); shortWait(); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java index be510ff1f98c..b8aa29b0c0c7 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -262,7 +262,7 @@ public class DrawController_DrawView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = aController2.getFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -283,7 +283,7 @@ public class DrawController_DrawView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java index 40244836da1e..486a42d72402 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class DrawController_HandoutView extends TestCase { * wait to allow frames to be loaded. Retrieves * the collection of the draw pages * from the first document and takes one of them. Inserts some shapes to the - * retrieved draw page. + * retrieved draw page. * Switch to the <b>HandoutMode</b>. * Obtains a current controller from the first document * using the interface <code>XModel</code>. The obtained controller is the @@ -223,7 +223,7 @@ public class DrawController_HandoutView extends TestCase { } utils.shortWait(500); - + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc); @@ -231,7 +231,7 @@ public class DrawController_HandoutView extends TestCase { log.println("bring first document to front..."); DesktopTools.bringWindowToFront(aModel); - + XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); @@ -265,7 +265,7 @@ public class DrawController_HandoutView extends TestCase { xShapes1.add(shape3); xShapes2.add(shape1); shortWait(); - + tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); tEnv.addObjRelation("Comparer", new Comparator() { @@ -292,7 +292,7 @@ public class DrawController_HandoutView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -316,10 +316,10 @@ public class DrawController_HandoutView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java index 73445b3d33c7..4164342158ec 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class DrawController_NotesView extends TestCase { * wait to allow frames to be loaded. Retrieves * the collection of the draw pages * from the first document and takes one of them. Inserts some shapes to the - * retrieved draw page. + * retrieved draw page. * Switch to the <b>NotesMode</b>. * Obtains a current controller from the first document * using the interface <code>XModel</code>. The obtained controller is the @@ -220,7 +220,7 @@ public class DrawController_NotesView extends TestCase { } utils.shortWait(500); - + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc); @@ -228,7 +228,7 @@ public class DrawController_NotesView extends TestCase { log.println("bring first document to front..."); DesktopTools.bringWindowToFront(aModel); - + XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); @@ -262,7 +262,7 @@ public class DrawController_NotesView extends TestCase { xShapes1.add(shape3); xShapes2.add(shape1); shortWait(); - + tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); tEnv.addObjRelation("Comparer", new Comparator() { @@ -289,7 +289,7 @@ public class DrawController_NotesView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -313,10 +313,10 @@ public class DrawController_NotesView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java index a6398884c7f6..4a39c3049eb5 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class DrawController_OutlineView extends TestCase { * wait to allow frames to be loaded. Retrieves * the collection of the draw pages * from the first document and takes one of them. Inserts some shapes to the - * retrieved draw page. + * retrieved draw page. * Switch to the <b>OutlineMode</b>. * Obtains a current controller from the first document * using the interface <code>XModel</code>. The obtained controller is the @@ -220,7 +220,7 @@ public class DrawController_OutlineView extends TestCase { } utils.shortWait(500); - + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc); @@ -228,7 +228,7 @@ public class DrawController_OutlineView extends TestCase { log.println("bring first document to front..."); DesktopTools.bringWindowToFront(aModel); - + XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); @@ -262,7 +262,7 @@ public class DrawController_OutlineView extends TestCase { xShapes1.add(shape3); xShapes2.add(shape1); shortWait(); - + tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); tEnv.addObjRelation("Comparer", new Comparator() { @@ -289,7 +289,7 @@ public class DrawController_OutlineView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -313,10 +313,10 @@ public class DrawController_OutlineView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java index ad4634cc7324..c86d45878656 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class DrawController_PresentationView extends TestCase { * wait to allow frames to be loaded. Retrieves * the collection of the draw pages * from the first document and takes one of them. Inserts some shapes to the - * retrieved draw page. + * retrieved draw page. * Switch to the <b>DiaMode</b>. * Obtains a current controller from the first document * using the interface <code>XModel</code>. The obtained controller is the @@ -220,7 +220,7 @@ public class DrawController_PresentationView extends TestCase { } utils.shortWait(500); - + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc); @@ -228,7 +228,7 @@ public class DrawController_PresentationView extends TestCase { log.println("bring first document to front..."); DesktopTools.bringWindowToFront(aModel); - + XModel aModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondDrawDoc); @@ -262,7 +262,7 @@ public class DrawController_PresentationView extends TestCase { xShapes1.add(shape3); xShapes2.add(shape1); shortWait(); - + tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); tEnv.addObjRelation("Comparer", new Comparator() { @@ -289,7 +289,7 @@ public class DrawController_PresentationView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -313,10 +313,10 @@ public class DrawController_PresentationView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java index 2ba3b56430dd..bc24b11b4325 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java index 1cd742919727..876615f0b30a 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java index f994b318b2be..690706c4fc57 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java index e0a1344435a9..c1950fb9b789 100644 --- a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdLayer.java b/qadevOOo/tests/java/mod/_sd/SdLayer.java index 7407a20ba17c..a8d8d513d259 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayer.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java index cf8a0644ce8a..7604ae36c922 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java index 20cfce2a5da7..3ab99f2ebeca 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java index a0eb65b9301a..ba314d66dfef 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java index 1cb240b76de7..7a729cd11121 100644 --- a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java index 0d01141653af..fc90ba4166f7 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ public class SdUnoDrawView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { - shape1, shape2, shape3}); + shape1, shape2, shape3}); tEnv.addObjRelation("Pages", the_pages); @@ -238,7 +238,7 @@ public class SdUnoDrawView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); @@ -262,9 +262,9 @@ public class SdUnoDrawView extends TestCase { UnoRuntime.queryInterface(XModifiable.class,xDrawDoc); tEnv.addObjRelation("Modifiable",modify); - + tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = (XIndexAccess) @@ -292,7 +292,7 @@ public class SdUnoDrawView extends TestCase { } catch (InterruptedException e) { System.out.println("While waiting :" + e) ; } - } + } } // finish class SdUnoDrawView diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java index 73ff1f41799f..ccd05a7f7ac9 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ public class SdUnoOutlineView extends TestCase { e.printStackTrace( log ); throw new StatusException("Couldn't create document", e); } - + XDrawPagesSupplier oDPS = (XDrawPagesSupplier) UnoRuntime.queryInterface(XDrawPagesSupplier.class, xImpressDoc); XDrawPages the_pages = oDPS.getDrawPages(); @@ -200,7 +200,7 @@ public class SdUnoOutlineView extends TestCase { XWindow.class,aModel2.getCurrentController()); oObj = aModel.getCurrentController(); - + log.println( "creating a new environment for impress view object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); @@ -213,7 +213,7 @@ public class SdUnoOutlineView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 47a46180ba03..08dd749f4403 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,7 @@ public class SdUnoPresView extends TestCase { the_pages.insertNewByIndex(0); the_pages.insertNewByIndex(0); secondDrawPage = (XDrawPage) AnyConverter.toObject( - new Type(XDrawPage.class),oDPi.getByIndex(3)); + new Type(XDrawPage.class),oDPi.getByIndex(3)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace( log ); throw new StatusException("Couldn't get DrawPage", e); @@ -204,7 +204,7 @@ public class SdUnoPresView extends TestCase { XShape shape1 = SOF.createShape( xImpressDoc, 5000, 3500, 7500, 5000, "Rectangle"); oShapes.add(shape1); - + oShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, secondDrawPage); shape1 = SOF.createShape( @@ -228,10 +228,10 @@ public class SdUnoPresView extends TestCase { if (anotherWindow != null) { tEnv.addObjRelation("XWindow.AnotherWindow",anotherWindow); } - + tEnv.addObjRelation("Selections", new Object[] { oDrawPage, secondDrawPage}); - + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = (XIndexAccess) @@ -246,7 +246,7 @@ public class SdUnoPresView extends TestCase { } public boolean equals(Object obj) { return compare(this, obj) == 0; - } }); + } }); tEnv.addObjRelation("FirstPage", oDrawPage); tEnv.addObjRelation("SecondPage", secondDrawPage); @@ -260,7 +260,7 @@ public class SdUnoPresView extends TestCase { tEnv.addObjRelation("FirstModel", aModel); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + XFrame the_frame = the_Desk.getCurrentFrame(); tEnv.addObjRelation("Frame", the_frame); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java index 03849535157b..74c619841d3a 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,19 +190,19 @@ public class SdUnoSlideView extends TestCase { tEnv.addObjRelation("SecondController", secondController); tEnv.addObjRelation("XDispatchProvider.URL", "slot:27069"); - + tEnv.addObjRelation("XUserInputInterception.XModel", aModel); - + //creating obj-relation for the XSelectionSupplier try { - Object[] selections = + Object[] selections = new Object[]{xDP.getByIndex(0),xDP.getByIndex(1),xDP.getByIndex(2)}; tEnv.addObjRelation("Selections", selections); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(log); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); - } + } log.println("Implementation Name: " + utils.getImplName(oObj)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java index b26ae478216c..ffe835f3e543 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index 9118dbb337d9..c34d0c67c5f2 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java index 6e7652e13afd..39960d7e63a8 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java +++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ import util.utils; public class SdXImpressDocument extends TestCase { XComponent xImpressDoc; XComponent xImpressDoc2; - + /** * Called while disposing a <code>TestEnvironment</code>. * Disposes Impress document. @@ -109,7 +109,7 @@ public class SdXImpressDocument extends TestCase { util.DesktopTools.closeDoc(xImpressDoc);; util.DesktopTools.closeDoc(xImpressDoc2);; } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates new impress document that is the instance of the service @@ -120,11 +120,11 @@ public class SdXImpressDocument extends TestCase { PrintWriter log) throws StatusException { log.println("creating a test environment"); - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); - + try { log.println("creating two impress documents"); xImpressDoc2 = SOF.createImpressDoc(null); @@ -133,27 +133,27 @@ public class SdXImpressDocument extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create documents", e); } - + XModel xModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xImpressDoc); XModel xModel2 = (XModel) UnoRuntime.queryInterface(XModel.class, xImpressDoc2); - + XController cont1 = xModel1.getCurrentController(); XController cont2 = xModel2.getCurrentController(); - + cont1.getFrame().setName("cont1"); cont2.getFrame().setName("cont2"); - + XSelectionSupplier sel = (XSelectionSupplier) UnoRuntime.queryInterface( XSelectionSupplier.class, cont1); - + XShape aShape = SOF.createShape(xImpressDoc, 5000, 3500, 7500, 5000, "Rectangle"); - - + + XPropertySet xShapeProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aShape); - + try { xShapeProps.setPropertyValue("FillStyle", com.sun.star.drawing.FillStyle.SOLID); xShapeProps.setPropertyValue("FillTransparence", new Integer(50)); @@ -170,20 +170,20 @@ public class SdXImpressDocument extends TestCase { ex.printStackTrace(log); throw new StatusException("Couldn't make shape transparent", ex); } - + DrawTools.getDrawPage(xImpressDoc, 0).add(aShape); - + log.println("creating a new environment for drawpage object"); - + TestEnvironment tEnv = new TestEnvironment(xImpressDoc); - + log.println("adding Controller as ObjRelation for XModel"); tEnv.addObjRelation("CONT2", cont2); - + log.println("Adding SelectionSupplier and Shape to select for XModel"); tEnv.addObjRelation("SELSUPP", sel); tEnv.addObjRelation("TOSELECT", aShape); - + // create object relation for XPrintJobBroadcaster String fileName = utils.getOfficeTempDirSys((XMultiServiceFactory) Param.getMSF())+"printfile.prt" ; File f = new File(fileName); @@ -192,8 +192,8 @@ public class SdXImpressDocument extends TestCase { } _XPrintJobBroadcaster.MyPrintJobListener listener = new _XPrintJobBroadcaster.MyPrintJobListener(xImpressDoc, fileName); tEnv.addObjRelation("XPrintJobBroadcaster.XPrintJobListener", listener); - + return tEnv; } // finish method getTestEnvironment - + } // finish class SdDrawPage diff --git a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java index ab0f673fb471..b30ad68172be 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java index 4fc52490c97b..434e7ad6dc07 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXShape.java +++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java b/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java index 3f509d121827..18315f892b1f 100644 --- a/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java index 1760354e6108..18da8c9431f2 100644 --- a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java +++ b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java index 70a87965dbd6..32b34f507f74 100644 --- a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java +++ b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java index 5be24abdd3f2..217e2509d3a9 100644 --- a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java index f54d57ac1ace..7b4725fe98c7 100644 --- a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java b/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java index 81e0d459c0a3..b015a858a903 100644 --- a/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java +++ b/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java index 5ede3114c8f3..6992a80d208e 100644 --- a/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java index 07d2bd70e6d9..5c8730b7bcca 100644 --- a/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java index e593bdcdcda3..a3c5786f45f9 100644 --- a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index 4101e3a57b1a..9ec1040a110c 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 1698f4077d80..90e8f6ad3154 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,12 +132,12 @@ public class SmGraphicAccessible extends TestCase { final XAccessibleComponent xAC = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class, oObj); - + TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("EditOnly", + + tEnv.addObjRelation("EditOnly", "This method isn't supported in this dialog"); - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){ diff --git a/qadevOOo/tests/java/mod/_sm/SmModel.java b/qadevOOo/tests/java/mod/_sm/SmModel.java index e739c2e53e34..6e86243a0fde 100644 --- a/qadevOOo/tests/java/mod/_sm/SmModel.java +++ b/qadevOOo/tests/java/mod/_sm/SmModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java index 3b98986c9290..b6f5bcab66d4 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLImporter.java b/qadevOOo/tests/java/mod/_sm/XMLImporter.java index 635e104ec307..f598f28f093c 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java index f5308b47d8e0..3c721eda6d2b 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java index f9c04de22cea..2b9b3e8dd8e5 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index 5e546997cd01..9995169a3d37 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java index 06be0540f4ed..7b4731f13e14 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java index 09debfcacf45..062d45db0b24 100644 --- a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java index d592a65ad9e1..dbd42fbdcb4f 100644 --- a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java +++ b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java index 735382d54af2..e3af6664183a 100644 --- a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index 0025fa88f842..ce2717d787cc 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index 2801677d1cc1..4e7269343cc9 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java index 8ea8769962e6..f8f245d87ca0 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 6e8185db10cc..6b91678c75a7 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index bd9d950d15bf..59c5e8d5b70e 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index cffbe744c84a..ddefcd878fb9 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/Pipe.java b/qadevOOo/tests/java/mod/_stm/Pipe.java index 988efe50d1fe..3dc832a73f7c 100644 --- a/qadevOOo/tests/java/mod/_stm/Pipe.java +++ b/qadevOOo/tests/java/mod/_stm/Pipe.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_stm/Pump.java b/qadevOOo/tests/java/mod/_stm/Pump.java index 982223d8dab1..064932acf625 100644 --- a/qadevOOo/tests/java/mod/_stm/Pump.java +++ b/qadevOOo/tests/java/mod/_stm/Pump.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java index 145716aabe15..7c69e6a6b461 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java index 2a3f886b3e57..ba2284c587ef 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java index a7bcb00a2087..8365db8f9810 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java index d7bfd8efbb96..dd61867e0316 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java index 80f3265fae74..67d251a50b3a 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java index d6b8ac642ca2..97ee8193c792 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java index 440550a5b444..482cd7bda3dc 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java +++ b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pump.java b/qadevOOo/tests/java/mod/_streams.uno/Pump.java index dbccee2ee043..5e262d470d06 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/Pump.java +++ b/qadevOOo/tests/java/mod/_streams.uno/Pump.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 358819ee733d..f21ac75daaca 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index b953abde994e..e7efa1769be2 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ import com.sun.star.util.URL; public class AccessibleBrowseBoxHeaderBar extends TestCase { static XDesktop the_Desk; static XTextDocument xTextDoc; - + /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ @@ -86,19 +86,19 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } - + /** * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); - + if (xTextDoc != null) { xTextDoc.dispose(); } } - + /** * Creates a text document. Opens the DataSource browser. * Creates an instance of the service <code>com.sun.star.awt.Toolkit</code> @@ -122,14 +122,14 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); - + if (xTextDoc != null) { xTextDoc.dispose(); } - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); - + try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); @@ -138,93 +138,93 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document", e); } - + shortWait(); - + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); - + XController secondController = aModel1.getCurrentController(); - + XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( XDispatchProvider.class, secondController); - + XDispatch getting = null; - + log.println("opening DatasourceBrowser"); - + URL the_url = new URL(); the_url.Complete = ".component:DB/DataSourceBrowser"; getting = aProv.queryDispatch(the_url, "_beamer", 12); - + //am controller ein XSelectionSupplier->mit params rufen PropertyValue[] noArgs = new PropertyValue[0]; getting.dispatch(the_url, noArgs); - + PropertyValue[] params = new PropertyValue[3]; PropertyValue param1 = new PropertyValue(); param1.Name = "DataSourceName"; param1.Value = "Bibliography"; params[0] = param1; - + PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; - + PropertyValue param3 = new PropertyValue(); param3.Name = "Command"; param3.Value = "biblio"; params[2] = param3; - + shortWait(); - + XFrame the_frame1 = the_Desk.getCurrentFrame(); - + if (the_frame1 == null) { log.println("Current frame was not found !!!"); } - + XFrame the_frame2 = the_frame1.findFrame("_beamer", 4); - + the_frame2.setName("DatasourceBrowser"); - + XController xCont = the_frame2.getController(); - + XSelectionSupplier xSelect = (XSelectionSupplier) UnoRuntime.queryInterface( XSelectionSupplier.class, xCont); - + try { xSelect.select(params); } catch (com.sun.star.lang.IllegalArgumentException ex) { throw new StatusException("Could not select Biblio-Database", ex); } - + XInterface oObj = null; - + AccessibilityTools at = new AccessibilityTools(); - + XWindow xWindow = secondController.getFrame().getContainerWindow(); - + XAccessible xRoot = at.getAccessibleObject(xWindow); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); - + at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); log.println("ImplementationName: " + util.utils.getImplName(oObj)); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + shortWait(); - + XAccessibleComponent accComp = (XAccessibleComponent) UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); final Point point = accComp.getLocationOnScreen(); - + shortWait(); - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { @@ -237,10 +237,10 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { } } }); - + return tEnv; } - + /** * Sleeps for 0.5 sec. to allow StarOffice to react on <code> * reset</code> call. diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 2e7cb013e2ee..a59cf21fd863 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -191,10 +191,10 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { params[2] = param3; XController xCont = the_frame2.getController(); - + XSelectionSupplier xSelect = (XSelectionSupplier) UnoRuntime.queryInterface( XSelectionSupplier.class, xCont); - + try { xSelect.select(params); } catch (com.sun.star.lang.IllegalArgumentException ex) { @@ -208,7 +208,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.ROW_HEADER); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 6842fd6da8e2..8ee05967bd5d 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ import com.sun.star.util.URL; public class AccessibleBrowseBoxTable extends TestCase { static XDesktop the_Desk; static XTextDocument xTextDoc; - + /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ @@ -82,19 +82,19 @@ public class AccessibleBrowseBoxTable extends TestCase { DesktopTools.createDesktop( (XMultiServiceFactory)Param.getMSF())); } - + /** * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); - + if (xTextDoc != null) { xTextDoc.dispose(); } } - + /** * Creates a text document. Opens the DataSource browser. * Creates an instance of the service @@ -121,15 +121,15 @@ public class AccessibleBrowseBoxTable extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); - + if (xTextDoc != null) { xTextDoc.dispose(); } - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); - + try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); @@ -138,79 +138,79 @@ public class AccessibleBrowseBoxTable extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document", e); } - + shortWait(); - + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); - + XController secondController = aModel1.getCurrentController(); - + XDispatchProvider aProv = (XDispatchProvider)UnoRuntime.queryInterface( XDispatchProvider.class, secondController); - + XDispatch getting = null; - + log.println("opening DatasourceBrowser"); - + URL the_url = new URL(); the_url.Complete = ".component:DB/DataSourceBrowser"; getting = aProv.queryDispatch(the_url, "_beamer", 12); - + PropertyValue[] noArgs = new PropertyValue[0]; getting.dispatch(the_url, noArgs); - + shortWait(); - + XFrame the_frame1 = the_Desk.getCurrentFrame(); - + if (the_frame1 == null) { log.println("Current frame was not found !!!"); } - + XFrame the_frame2 = the_frame1.findFrame("_beamer", 4); XController xCont = the_frame2.getController(); - + the_frame2.setName("DatasourceBrowser"); - + final PropertyValue[] params = new PropertyValue[3]; PropertyValue param1 = new PropertyValue(); param1.Name = "DataSourceName"; param1.Value = "Bibliography"; params[0] = param1; - + PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; - + PropertyValue param3 = new PropertyValue(); param3.Name = "Command"; param3.Value = "biblio"; params[2] = param3; - + final XSelectionSupplier xSelect = (XSelectionSupplier) UnoRuntime.queryInterface( XSelectionSupplier.class, xCont); - - + + final Object[] initArgs = params; - + XInterface oObj = null; - + AccessibilityTools at = new AccessibilityTools(); - + XWindow xWindow = secondController.getFrame().getContainerWindow(); - + XAccessible xRoot = at.getAccessibleObject(xWindow); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE, "Table"); - + log.println("ImplementationName: " + util.utils.getImplName(oObj)); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { @@ -220,10 +220,10 @@ public class AccessibleBrowseBoxTable extends TestCase { } } }); - + return tEnv; } - + /** * Sleeps for 0.5 sec. to allow StarOffice to react on <code> * reset</code> call. diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 973f0bf9c324..549ef0a91b9b 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index 73d3a3bf8aff..09a5824c2a6d 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -139,7 +139,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -161,13 +161,13 @@ public class AccessibleIconChoiceCtrl extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -214,15 +214,15 @@ public class AccessibleIconChoiceCtrl extends TestCase { shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, + XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.PUSH_BUTTON, "Close"); accCloseButton = (XAccessibleAction) UnoRuntime.queryInterface( @@ -231,35 +231,35 @@ public class AccessibleIconChoiceCtrl extends TestCase { log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); - tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", + tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", new Boolean(true)); String[] expectedStateNames = new String[] { - "com.sun.star.accessibility.AccessibleStateType.ENABLED", - "com.sun.star.accessibility.AccessibleStateType.FOCUSABLE", - "com.sun.star.accessibility.AccessibleStateType.SHOWING", - "com.sun.star.accessibility.AccessibleStateType.VISIBLE", - "com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS", + "com.sun.star.accessibility.AccessibleStateType.ENABLED", + "com.sun.star.accessibility.AccessibleStateType.FOCUSABLE", + "com.sun.star.accessibility.AccessibleStateType.SHOWING", + "com.sun.star.accessibility.AccessibleStateType.VISIBLE", + "com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS", }; short[] expectedStates = new short[] { - com.sun.star.accessibility.AccessibleStateType.ENABLED, - com.sun.star.accessibility.AccessibleStateType.FOCUSABLE, - com.sun.star.accessibility.AccessibleStateType.SHOWING, - com.sun.star.accessibility.AccessibleStateType.VISIBLE, - com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS, + com.sun.star.accessibility.AccessibleStateType.ENABLED, + com.sun.star.accessibility.AccessibleStateType.FOCUSABLE, + com.sun.star.accessibility.AccessibleStateType.SHOWING, + com.sun.star.accessibility.AccessibleStateType.VISIBLE, + com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS, }; tEnv.addObjRelation("expectedStateNames", expectedStateNames); tEnv.addObjRelation("expectedStates", expectedStates); final XAccessibleSelection selection = (XAccessibleSelection) (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index 28ccb9859faf..c27c9eb7209f 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index c646aa1eaf25..a6a95185967d 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public class AccessibleTabBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -95,7 +95,7 @@ public class AccessibleTabBar extends TestCase { try { log.println("creating a calc document"); - xDoc = (XComponent) UnoRuntime.queryInterface(XComponent.class, + xDoc = (XComponent) UnoRuntime.queryInterface(XComponent.class, SOF.createCalcDoc( null)); } catch (com.sun.star.uno.Exception e) { @@ -118,14 +118,14 @@ public class AccessibleTabBar extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); - + log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - + final XWindow aWin = xWindow; - - tEnv.addObjRelation("EventProducer", + + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { aWin.setPosSize(100,100, 500, 500, PosSize.POSSIZE); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index 1e1b571881c2..791c27189f2e 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,11 +152,11 @@ public class AccessibleTabBarPage extends TestCase { UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet1"); XAccessibleContext acc = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet2"); XAccessibleComponent accComp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, acc); final Point point = accComp.getLocationOnScreen(); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index 1d367d97bc95..6f66b0c9f66a 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ public class AccessibleTabBarPageList extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -148,31 +148,31 @@ public class AccessibleTabBarPageList extends TestCase { shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); - tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", + tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", new Boolean(true)); XLayerSupplier oLS = (XLayerSupplier) UnoRuntime.queryInterface(XLayerSupplier.class, xDoc); XInterface oLM = oLS.getLayerManager(); final XLayerManager xLM = (XLayerManager) UnoRuntime.queryInterface(XLayerManager.class, oLM); - - - tEnv.addObjRelation("EventProducer", + + + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { xLM.insertNewByIndex(0); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index 6134bd1a3aef..e393b2c57a2c 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index c4ee3562d720..47554e907752 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -143,7 +143,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { * @see com.sun.star.accessibility.XAccessibleSelection * @see com.sun.star.accessibility.XAccessibleText */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -165,13 +165,13 @@ public class AccessibleTreeListBoxEntry extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XDispatch getting = null; @@ -200,7 +200,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { XInterface oObj = null; XInitialization xInit = (XInitialization) UnoRuntime.queryInterface( - XInitialization.class, + XInitialization.class, the_frame2.getController()); PropertyValue[] params = new PropertyValue[3]; @@ -218,12 +218,12 @@ public class AccessibleTreeListBoxEntry extends TestCase { param3.Name = "Command"; param3.Value = "select * from biblio"; params[2] = param3; - + XController xCont = the_frame2.getController(); - + XSelectionSupplier xSelect = (XSelectionSupplier) UnoRuntime.queryInterface( XSelectionSupplier.class, xCont); - + try { xSelect.select(params); } catch (com.sun.star.lang.IllegalArgumentException ex) { @@ -232,35 +232,35 @@ public class AccessibleTreeListBoxEntry extends TestCase { shortWait(); - AccessibilityTools at = new AccessibilityTools(); + AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = secondController.getFrame().getContainerWindow(); XAccessible xRoot = at.getAccessibleObject(xWindow); - + at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL, + + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL, "Bibliography"); - + log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); - + //adding ObjectRelation for XAccessibleText tEnv.addObjRelation("LimitedBounds", "true"); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { } }); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); tEnv.addObjRelation("XAccessibleText.Text", "Bibliography"); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index c77b82fcd6fa..90878c5a0c03 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 104b10d5c0b1..911d057de8c8 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,8 +68,8 @@ public class AccessibleEditableTextPara extends TestCase { TestParameters Param, PrintWriter log) { XInterface oObj = null; - - + + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); @@ -86,15 +86,15 @@ public class AccessibleEditableTextPara extends TestCase { XAccessibleEditableText et = (XAccessibleEditableText) UnoRuntime.queryInterface(XAccessibleEditableText.class, oObj); et.setText("AccessibleEditablePara"); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - + } log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - + final XAccessibleEditableText edText = (XAccessibleEditableText) - UnoRuntime.queryInterface(XAccessibleEditableText.class,oObj) ; - + UnoRuntime.queryInterface(XAccessibleEditableText.class,oObj) ; + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { @@ -102,7 +102,7 @@ public class AccessibleEditableTextPara extends TestCase { int l = new String("AccessibleEditablePara").length(); edText.deleteText(0, l); edText.setText("Event"); - edText.setText("AccessibleEditablePara"); + edText.setText("AccessibleEditablePara"); }catch(com.sun.star.lang.IndexOutOfBoundsException e) {} } }); @@ -146,7 +146,7 @@ public class AccessibleEditableTextPara extends TestCase { throw new StatusException( "Couldn't create document ", e ); } } - + /** * Sleeps for 0.5 sec. to allow StarOffice to react on <code> * reset</code> call. @@ -158,5 +158,5 @@ public class AccessibleEditableTextPara extends TestCase { log.println("While waiting :" + e) ; } } - + }
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index 3a48179223ea..54126337db9c 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index b541353c48b1..bf82b3012b51 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 9be5cfdac65b..37b4a8dc2599 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index fcd9ad664f84..fd742e4f9441 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { // creation of testobject here // first we write what we are intend to do to log file log.println( "creating a test environment" ); - + XMultiServiceFactory docMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xDoc); try { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index 1c705a9b3067..3e77577213ef 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 8979255a6c48..7dd6b8fd703b 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 41210cbe9617..c62ba90f1155 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java index 56ebf07d3729..a2fc8eb611c0 100644 --- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java +++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class GraphicExporter extends TestCase { * </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; XShape oShape = null; @@ -146,7 +146,7 @@ public class GraphicExporter extends TestCase { // create testobject here SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); - oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, + oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape); @@ -155,10 +155,10 @@ public class GraphicExporter extends TestCase { XComponent xComp = null; try { - oShapeProps.setPropertyValue("GraphicURL", + oShapeProps.setPropertyValue("GraphicURL", util.utils.getFullTestURL( "space-metal.jpg")); - xComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, + xComp = (XComponent) UnoRuntime.queryInterface(XComponent.class, oShape); XExporter xEx = (XExporter) UnoRuntime.queryInterface( @@ -180,7 +180,7 @@ public class GraphicExporter extends TestCase { final URL aURL = new URL(); aURL.Complete = util.utils.getOfficeTemp( - (XMultiServiceFactory) tParam.getMSF()) + + (XMultiServiceFactory) tParam.getMSF()) + "picture.jpg"; final XSimpleFileAccess fAcc; @@ -204,7 +204,7 @@ public class GraphicExporter extends TestCase { log.println("ImplName " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("MediaDescriptor", + tEnv.addObjRelation("MediaDescriptor", XMLTools.createMediaDescriptor( new String[] { "FilterName", "URL", "MediaType" @@ -217,7 +217,7 @@ public class GraphicExporter extends TestCase { tEnv.addObjRelation("NoFilter.cancel()", new Boolean(true)); final String hideMode = (String) tParam.get("soapi.test.hidewindows"); - tEnv.addObjRelation("XFilter.Checker", + tEnv.addObjRelation("XFilter.Checker", new ifc.document._XFilter.FilterChecker() { public boolean checkFilter() { try { diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index 15aa351c625a..7a227812f4ef 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,7 +145,7 @@ public class SvxDrawPage extends TestCase { * <code>com.sun.star.drawing.Line</code> service </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; XShape oShape = null; @@ -167,17 +167,17 @@ public class SvxDrawPage extends TestCase { oDP = (XDrawPages) oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); - oObj = (XDrawPage) AnyConverter.toObject(new Type(XDrawPage.class), + oObj = (XDrawPage) AnyConverter.toObject(new Type(XDrawPage.class), oDP.getByIndex(0)); SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); - oShape = SOF.createShape(xComp, 5000, 3500, 7500, 5000, + oShape = SOF.createShape(xComp, 5000, 3500, 7500, 5000, "Rectangle"); DrawTools.getShapes((XDrawPage) oObj).add(oShape); - XShape oShape1 = SOF.createShape(xComp, 5000, 5500, 5000, 5000, + XShape oShape1 = SOF.createShape(xComp, 5000, 5500, 5000, 5000, "Rectangle"); DrawTools.getShapes((XDrawPage) oObj).add(oShape1); } catch (com.sun.star.lang.WrappedTargetException e) { @@ -200,7 +200,7 @@ public class SvxDrawPage extends TestCase { //adding a controlButton to have a Form FormTools.insertControlShape( - (XComponent) UnoRuntime.queryInterface(XComponent.class, xDoc), + (XComponent) UnoRuntime.queryInterface(XComponent.class, xDoc), 3000, 4500, 15000, 1000, "CommandButton"); // relation for XShapes interface diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index f6cd2accc6ba..c6c22727e6f7 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java index 28a5cdcaaff6..a8d7b4feb6c7 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java index 6c3b3bc8bb8a..008fd1602193 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShape.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java index 0225dbab878f..ac204c5f277f 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java index b20595ec5f53..2e41e20917f6 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java index 9c38e394ff98..89f8df2391e1 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java index 09b4ecb72226..7a7d6d941977 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 8a7c1d0300b3..f2d0047eae2b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index 427c26046ff8..aa1bba14b7a7 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index 7e26f764f40e..f643841d1c59 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index 7ac67194b299..1e5f98b98604 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java index c7d7e8e13a7d..88e72c79d0e4 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,10 +52,10 @@ public class SvxUnoNumberingRules extends TestCase { (XMultiServiceFactory) tParam.getMSF()); } - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory docMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, xDrawDoc); XInterface oObj = null; @@ -70,9 +70,9 @@ public class SvxUnoNumberingRules extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println("Implementationname: " + util.utils.getImplName(oObj)); - + Object NewRules=null; - + try{ XIndexAccess xIA = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, oObj); NewRules = xIA.getByIndex(2); diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java index 611b0e203c8a..ce006623e82b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ public class SvxUnoText extends TestCase { oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - + XSimpleText text = (XSimpleText) UnoRuntime.queryInterface (XSimpleText.class, oShape) ; @@ -155,14 +155,14 @@ public class SvxUnoText extends TestCase { "com.sun.star.text.TextField.DateTime"); log.println( " adding InstCreator object" ); tEnv.addObjRelation( "XTEXTINFO", new InstCreator( xDrawDoc, tDsc ) ); - + // adding relation for XTextRangeMover tEnv.addObjRelation("RangeForMove", aRange); tEnv.addObjRelation("XTextRange", oObj); - + // adding relation for XTextRangeComapre tEnv.addObjRelation("TEXT", (XText) UnoRuntime.queryInterface(XText.class, oShape)) ; - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java index af72326d32fd..3ff28a8239eb 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java index 4e27561e01bc..36e5a4958399 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java index c4521c9aadcf..35bf9287dd28 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java index 30226c575931..605ac61fc209 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ public class SvxUnoTextField extends TestCase { } XTextCursor the_Cursor = null; - + // create testobject here try { diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java index ed6c61579b66..e5d626bc0c13 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java index d9ef393e966f..7ea4ebf6ccf6 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java index 4c91540d52c2..95c70509306f 100755 --- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java +++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class CharacterStyle extends TestCase { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); } - + /** * Creating a Testenvironment for the interfaces to be tested. * At first style families are gotten from a text document using @@ -201,7 +201,7 @@ public class CharacterStyle extends TestCase { short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude)); - return tEnv; + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java index 20e667cd4be5..f0903c99e693 100755 --- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ import util.utils; * @see com.sun.star.style.ConditionalParagraphStyle */ public class ConditionalParagraphStyle extends TestCase { - + XTextDocument xTextDoc; SOfficeFactory SOF = null; - + /** * Creates text document. */ @@ -146,7 +146,7 @@ public class ConditionalParagraphStyle extends TestCase { XNameContainer oSFNC = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, oSFNA); - + try { if ( oSFNC.hasByName("My Style") ) oSFNC.removeByName("My Style"); @@ -195,7 +195,7 @@ public class ConditionalParagraphStyle extends TestCase { String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); - return tEnv; + return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java index 5ece58f1a29c..9d003240d9fe 100644 --- a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java +++ b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index 25434add31cb..19a518cf9f67 100755 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ import util.utils; * @see com.sun.star.style.PageStyle */ public class PageStyle extends TestCase { - + XTextDocument xTextDoc; SOfficeFactory SOF = null; - + /** * Creates text document. */ @@ -115,7 +115,7 @@ public class PageStyle extends TestCase { log.println("Error: exception occured."); e.printStackTrace(log); throw new StatusException( "Couldn't create environment ", e ); - } + } try { log.print("Creating a user-defined style... "); @@ -140,7 +140,7 @@ public class PageStyle extends TestCase { XNameContainer oSFNC = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, oSFNA); - + try { if ( oSFNC.hasByName("My Style") ) oSFNC.removeByName("My Style"); @@ -195,7 +195,7 @@ public class PageStyle extends TestCase { String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); - return tEnv; + return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index 1c75183170d3..be55107c94f8 100755 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ import util.utils; * @see com.sun.star.style.ParagraphStyle */ public class ParagraphStyle extends TestCase { - + XTextDocument xTextDoc; SOfficeFactory SOF = null; - + /** * Creates text document. */ @@ -80,7 +80,7 @@ public class ParagraphStyle extends TestCase { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); } - + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XNameAccess oSFNA = null; @@ -186,7 +186,7 @@ public class ParagraphStyle extends TestCase { String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); - return tEnv; - } - + return tEnv; + } + } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index 3eb0aa20d8b5..e29891766ff0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class SwAccessibleDocumentPageView extends TestCase { TestParameters Param, PrintWriter log) { XInterface oObj = null; - + XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); @@ -98,10 +98,10 @@ public class SwAccessibleDocumentPageView extends TestCase { } catch ( com.sun.star.lang.IllegalArgumentException e ){ e.printStackTrace(log); throw new StatusException( "Couldn't insert lines", e ); - } - - XController xController = xTextDoc.getCurrentController(); - + } + + XController xController = xTextDoc.getCurrentController(); + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); @@ -125,7 +125,7 @@ public class SwAccessibleDocumentPageView extends TestCase { log.println("Couldn't change mode"); throw new StatusException(Status.failed("Couldn't change mode")); } - + shortWait(); AccessibilityTools at = new AccessibilityTools(); @@ -139,25 +139,25 @@ public class SwAccessibleDocumentPageView extends TestCase { log.println("ImplementationName " + utils.getImplName(oObj)); - TestEnvironment tEnv = new TestEnvironment(oObj); + TestEnvironment tEnv = new TestEnvironment(oObj); final XText the_text = oText; tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { - public void fireEvent() { + public void fireEvent() { String oldText = the_text.getString(); the_text.setString("EVENT FIRED"); shortWait(); the_text.setString(oldText); } - }); - + }); + return tEnv; - } - - + } + + /** * Sleeps for 1 sec. to allow StarOffice to react on <code> * reset</code> call. @@ -168,8 +168,8 @@ public class SwAccessibleDocumentPageView extends TestCase { } catch (InterruptedException e) { log.println("While waiting :" + e) ; } - } - + } + /** * Called while disposing a <code>TestEnvironment</code>. diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index 45d0e9a226d8..07d517003cd8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 51c28e2e68aa..1761aabdf3a2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 33cdc1e2fff8..c355b5d17d92 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index 3b9604124211..0a8ba7c23b0d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 9fc37c112980..db817c4b260b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index f70fa3e11ae1..d99a6dcfa4f1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,12 +110,12 @@ public class SwAccessiblePageView extends TestCase { e.printStackTrace(log); throw new StatusException( "Couldn't insert lines", e ); } - + // Enumeration XEnumerationAccess oEnumA = (XEnumerationAccess) UnoRuntime.queryInterface(XEnumerationAccess.class, oText ); XEnumeration oEnum = oEnumA.createEnumeration(); - + try { para = (XInterface) AnyConverter.toObject( new Type(XInterface.class),oEnum.nextElement()); @@ -134,7 +134,7 @@ public class SwAccessiblePageView extends TestCase { e.printStackTrace(log); log.println("Error: exception occured..."); } - + try { portP = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, port); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index 23e7014e46eb..9e32d3ae5aa0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public class SwAccessibleParagraphView extends TestCase { TestParameters Param, PrintWriter log) { XInterface oObj = null; - + XText oText = xTextDoc.getText(); oText.setString("XAccessibleText"); @@ -88,29 +88,29 @@ public class SwAccessibleParagraphView extends TestCase { oObj = at.SearchedContext; - log.println("ImplementationName " + utils.getImplName(oObj)); + log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - + final XText paraText = xTextDoc.getText(); tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { - public void fireEvent() { + public void fireEvent() { String old = paraText.getString(); paraText.setString("Just a line"); paraText.setString(old); } }); + + final String text = "XAccessibleText"; - final String text = "XAccessibleText"; - - tEnv.addObjRelation("XAccessibleText.Text", text); - + tEnv.addObjRelation("XAccessibleText.Text", text); + return tEnv; - } - + } + /** * Called while disposing a <code>TestEnvironment</code>. * Disposes text document. diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index b067b9a6293d..f9f511398691 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public class SwAccessibleTableCellView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment() */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XTextTable oTable = null; @@ -83,7 +83,7 @@ public class SwAccessibleTableCellView extends TestCase { oTable = SOF.createTextTable(xTextDoc); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); - throw new StatusException("Couldn't create TextTable : " + + throw new StatusException("Couldn't create TextTable : " + e.getMessage(), e); } @@ -91,11 +91,11 @@ public class SwAccessibleTableCellView extends TestCase { SOF.insertTextContent(xTextDoc, oTable); } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace(log); - throw new StatusException("Couldn't insert text content :" + + throw new StatusException("Couldn't insert text content :" + e.getMessage(), e); } - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); AccessibilityTools at = new AccessibilityTools(); @@ -113,10 +113,10 @@ public class SwAccessibleTableCellView extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleSelection accSel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, at.SearchedContext.getAccessibleParent()); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { accSel.selectAllAccessibleChildren(); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index d08e2cef7d50..e74ceaa7f315 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index a55f458de64b..8114d24b84f1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 676a475b099b..a6af6f769d00 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index 2f18e8eefc44..ab5c19e6d9b2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java index 00bad4ad1f62..978ea5b54176 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java index 9953196cfcbe..55befb374caf 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ import com.sun.star.uno.XInterface; public class SwXAutoTextEntry extends TestCase { XTextDocument xTextDoc; XAutoTextGroup oGroup; - + /** * Creates text document. */ @@ -91,7 +91,7 @@ public class SwXAutoTextEntry extends TestCase { throw new StatusException( "Couldn't create document", e ); } } - + /** * Removes added element from AutoTextGroup */ @@ -108,8 +108,8 @@ public class SwXAutoTextEntry extends TestCase { log.println( "disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); } - - + + /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service @@ -127,13 +127,13 @@ public class SwXAutoTextEntry extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { - + 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(); @@ -145,28 +145,28 @@ public class SwXAutoTextEntry extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create AutoTextContainer", e); } - + XNameAccess oContNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oContainer); - + String contNames[] = oContNames.getElementNames(); for (int i =0; i < contNames.length; i++){ log.println("ContainerNames[ "+ i + "]: " + contNames[i]); } - + try{ oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),oContNames.getByName("mytexts")); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't get AutoTextGroup", e); } - + oGroup = (XAutoTextGroup) UnoRuntime.queryInterface (XAutoTextGroup.class, oObj); String[] oENames = oGroup.getElementNames(); for (int i=0; i<oENames.length; i++) { log.println("AutoTextEntryNames[" + i + "]: " + oENames[i]); } - + XText oText = xTextDoc.getText(); oText.insertString(oText.getStart(), "New AutoText", true); XTextRange oTextRange = (XTextRange) oText; @@ -188,30 +188,30 @@ public class SwXAutoTextEntry extends TestCase { } catch ( com.sun.star.lang.IllegalArgumentException e ) { e.printStackTrace(log); } - + oObj = oEntry; - + log.println("Trying to use XText as TextRange in the method applyTo"); oEntry.applyTo(oTextRange); - + oTextRange = oText.createTextCursor(); log.println("Trying to use XTextCursor as TextRange in the method applyTo"); oEntry.applyTo(oTextRange); - + log.println( "creating a new environment for AutoTextEntry object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - + // adding relation for XText DefaultDsc tDsc = new DefaultDsc("com.sun.star.text.XTextContent", "com.sun.star.text.TextField.DateTime"); log.println( " adding InstCreator object" ); tEnv.addObjRelation( "XTEXTINFO", new InstCreator( xTextDoc, tDsc ) ); - + log.println( "adding TextDocument as mod relation to environment" ); tEnv.addObjRelation("TEXTDOC", xTextDoc); - + return tEnv; } // finish method getTestEnvironment - - + + } // finish class SwXAutoTextEntry diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java index 3e021d7267c9..4095e19e3725 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ import util.utils; */ public class SwXAutoTextGroup extends TestCase { XTextDocument xTextDoc; - + /** * Creates text document. */ @@ -88,7 +88,7 @@ public class SwXAutoTextGroup extends TestCase { throw new StatusException( "Couldn't create document", e ); } } - + /** * Disposes text document. */ @@ -96,11 +96,11 @@ public class SwXAutoTextGroup extends TestCase { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates an instance of the service - * <code>com.sun.star.text.AutoTextContainer</code>, then creates a new + * <code>com.sun.star.text.AutoTextContainer</code>, then creates a new * group into the container.<p> * Object relations created : * <ul> @@ -109,10 +109,10 @@ public class SwXAutoTextGroup extends TestCase { * </ul> */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + XInterface oObj = null; XAutoTextContainer oContainer; - + log.println( "creating a test environment" ); try { XMultiServiceFactory myMSF = (XMultiServiceFactory)Param.getMSF(); @@ -123,15 +123,15 @@ public class SwXAutoTextGroup extends TestCase { throw new StatusException("Couldn't create AutoTextContainer", e); } String myGroupName="myNewGroup2*1"; - + XAutoTextContainer xATC = (XAutoTextContainer) UnoRuntime.queryInterface(XAutoTextContainer.class, oContainer); - + try { log.println("removing element with name '" + myGroupName + "'"); xATC.removeByName(myGroupName); } catch (com.sun.star.container.NoSuchElementException e) { } - + try { log.println("adding element with name '" + myGroupName + "'"); xATC.insertNewByName(myGroupName); @@ -142,37 +142,37 @@ public class SwXAutoTextGroup extends TestCase { ex.printStackTrace(log); throw new StatusException("could not insert '"+myGroupName+"' into container",ex); } - - + + XNameAccess oContNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oContainer); - + if (Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)){ String contNames[] = oContNames.getElementNames(); for (int i =0; i < contNames.length; i++){ log.println("ContainerNames[ "+ i + "]: " + contNames[i]); } } - + try{ oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),oContNames.getByName(myGroupName)); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't get AutoTextGroup '"+myGroupName + "'", e); } - + log.println("ImplementationName " + utils.getImplName(oObj)); - + log.println( "creating a new environment for AutoTextGroup object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - + XText oText = xTextDoc.getText(); oText.insertString(oText.getStart(), "New AutoText", true); - + log.println( "adding TextRange as mod relation to environment" ); tEnv.addObjRelation("TextRange", oText); - + return tEnv; } // finish method getTestEnvironment - - + + } // finish class SwXAutoTextGroup diff --git a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java index 91c14dd2b0b6..adc5595d58fc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java index 12e7fa2403ff..feb3f8dabbb6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java index a28896ef7844..cec8afee207a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXCell.java b/qadevOOo/tests/java/mod/_sw/SwXCell.java index 367b59e02979..f05a79f1eb1d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCell.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCell.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java index a9a5dfff9bd4..7610618877e7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -157,9 +157,9 @@ public class SwXCellRange extends TestCase { NewData[4] = new Double[] {new Double(4),new Double(9),new Double(2.5),new Double(5)}; tEnv.addObjRelation("NewData",NewData); - + // com::sun::star::chart::XChartDataArray - tEnv.addObjRelation("CRDESC", + tEnv.addObjRelation("CRDESC", "Column and RowDescriptions can't be changed for this Object"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java index 582d2fbbfc23..544ec015dda2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java +++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,8 +98,8 @@ public class SwXChapterNumbering extends TestCase { XChapterNumberingSupplier oCNSupp = (XChapterNumberingSupplier) UnoRuntime.queryInterface(XChapterNumberingSupplier.class,xTextDoc); - oObj = oCNSupp.getChapterNumberingRules(); - + oObj = oCNSupp.getChapterNumberingRules(); + PropertyValue[] instance1 = null; try { instance1 = (PropertyValue[]) oCNSupp.getChapterNumberingRules().getByIndex(1); @@ -108,13 +108,13 @@ public class SwXChapterNumbering extends TestCase { } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); } - + //instance1[0].Value = new Short((short)5); - + TestEnvironment tEnv = new TestEnvironment( oObj ); - + tEnv.addObjRelation("INSTANCE1", instance1); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java index ab776da4c6e1..ec42193e731e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java index b8e0448d2d12..0fb1f22e78d5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java index 3fd780373e08..fbe2156932e5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java index 6a6d7f6480c0..306d8956737e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java index 7518b94309fc..603a01d53677 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java index 81a7e4b70447..83cef6f8fc4d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java index e2e7bac89b6c..8d4a14b2759b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java index 39ab7c74a009..1a21ad5cc25f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java index df6e541fd553..95c73e4d1249 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java index 661f3c9c055a..a9c7ee4908d1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java index 0c50c4c28014..ecb9b6494550 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXFrames.java b/qadevOOo/tests/java/mod/_sw/SwXFrames.java index ad4dd2eaa1c0..320ca60cd2cd 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFrames.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFrames.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java index dcf62875f97d..371e125780c3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ public class SwXHeadFootText extends TestCase { log.println( "adding InstCreator object" ); tEnv.addObjRelation( "XTEXTINFO", new InstCreator( xTextDoc, tDsc ) ); - + tEnv.addObjRelation( "TEXT", oObj); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java index aa339c2679b5..1fac0d2747d0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index 64327817ec02..b97baff7ec72 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ public class SwXMailMerge extends TestCase { XInterface oRowSet = null; Object oConnection = null; XJob Job = null; - + log.println(" instantiate MailMerge service"); try { oObj = (XInterface) ( (XMultiServiceFactory) Param.getMSF()).createInstance @@ -93,7 +93,7 @@ public class SwXMailMerge extends TestCase { } catch (Exception e) { throw new StatusException("Can't create object environment", e) ; } - + // <set some variables> String cTestDoc = utils.getFullTestURL("MailMerge.sxw"); //cMailMerge_DocumentURL = cTestDoc @@ -105,7 +105,7 @@ public class SwXMailMerge extends TestCase { sel[1] = new int[5]; Object[] myBookMarks = new Object[2]; // </set some variables> - + // <create XResultSet> log.println("create a XResultSet"); try { @@ -114,9 +114,9 @@ public class SwXMailMerge extends TestCase { } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); } - XPropertySet oRowSetProps = (XPropertySet) + XPropertySet oRowSetProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oRowSet); - XRowSet xRowSet = (XRowSet) + XRowSet xRowSet = (XRowSet) UnoRuntime.queryInterface(XRowSet.class, oRowSet); try { oRowSetProps.setPropertyValue("DataSourceName",cDataSourceName); @@ -136,13 +136,13 @@ public class SwXMailMerge extends TestCase { } catch (SQLException e) { throw new StatusException("Can't execute oRowSet", e); } - - XResultSet oResultSet = (XResultSet) + + XResultSet oResultSet = (XResultSet) UnoRuntime.queryInterface(XResultSet.class, oRowSet); - - - + + + // <create Bookmarks> log.println("create bookmarks"); try { @@ -156,22 +156,22 @@ public class SwXMailMerge extends TestCase { throw new StatusException("Cant get Bookmarks", e); } // </create Bookmarks> - + // <fill object with values> - + log.println("fill MailMerge with default connection"); - - XPropertySet oObjProps = (XPropertySet) + + XPropertySet oObjProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oObj); try { - oObjProps.setPropertyValue("ActiveConnection", getLocalXConnection(Param)); - oObjProps.setPropertyValue("DataSourceName", cDataSourceName); + oObjProps.setPropertyValue("ActiveConnection", getLocalXConnection(Param)); + oObjProps.setPropertyValue("DataSourceName", cDataSourceName); oObjProps.setPropertyValue("Command", cDataCommand); oObjProps.setPropertyValue("CommandType", new Integer(CommandType.TABLE)); oObjProps.setPropertyValue("OutputType", new Short(MailMergeType.FILE)); oObjProps.setPropertyValue("DocumentURL", cTestDoc); oObjProps.setPropertyValue("OutputURL", cOutputURL); - oObjProps.setPropertyValue("FileNamePrefix", "Author"); + oObjProps.setPropertyValue("FileNamePrefix", "Author"); oObjProps.setPropertyValue("FileNameFromColumn", new Boolean(false)); oObjProps.setPropertyValue("Selection", new Object[0]); @@ -185,15 +185,15 @@ public class SwXMailMerge extends TestCase { throw new StatusException("Can't set properties on oObj", e); } // </fill object with values> - - + + // <create object relations> Object[] vXJobArgs = new Object[4]; NamedValue[] vXJobArg0 = new NamedValue[8]; NamedValue[] vXJobArg1 = new NamedValue[7]; NamedValue[] vXJobArg2 = new NamedValue[10]; NamedValue[] vXJobArg3 = new NamedValue[0]; - + // first Arguments vXJobArg0[0] = new NamedValue("DataSourceName", cDataSourceName); vXJobArg0[1] = new NamedValue("Command", cDataCommand); @@ -226,13 +226,13 @@ public class SwXMailMerge extends TestCase { vXJobArg2[7] = new NamedValue("FileNamePrefix", "Identifier"); vXJobArg2[8] = new NamedValue("FileNameFromColumn", new Boolean(true)); vXJobArg2[9] = new NamedValue("Selection", myBookMarks); - + vXJobArgs[0] = vXJobArg0; vXJobArgs[1] = vXJobArg1; vXJobArgs[2] = vXJobArg2; vXJobArgs[3] = vXJobArg3; - - + + Job = (XJob) UnoRuntime.queryInterface(XJob.class, oObj); try{ Job.execute(vXJobArg2); @@ -241,11 +241,11 @@ public class SwXMailMerge extends TestCase { } catch ( Exception e){ System.out.println(e.toString()); } - + // <create XResultSet> log.println("create XResultSet"); - + try { oRowSet = (XInterface) ( (XMultiServiceFactory) Param.getMSF()).createInstance ("com.sun.star.sdb.RowSet"); @@ -253,9 +253,9 @@ public class SwXMailMerge extends TestCase { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); } oRowSetProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oRowSet); - + xRowSet = (XRowSet) UnoRuntime.queryInterface(XRowSet.class, oRowSet); - + try { oRowSetProps.setPropertyValue("DataSourceName",cDataSourceName); oRowSetProps.setPropertyValue("Command",cDataCommand); @@ -274,57 +274,57 @@ public class SwXMailMerge extends TestCase { } catch (SQLException e) { throw new StatusException("Can't execute oRowSet", e); } - - oResultSet = (XResultSet) + + oResultSet = (XResultSet) UnoRuntime.queryInterface(XResultSet.class, oRowSet); - + XResultSet oMMXResultSet = null; try { - oMMXResultSet = (XResultSet) - UnoRuntime.queryInterface(XResultSet.class, - ( (XInterface) - ( (XMultiServiceFactory) + oMMXResultSet = (XResultSet) + UnoRuntime.queryInterface(XResultSet.class, + ( (XInterface) + ( (XMultiServiceFactory) Param.getMSF()).createInstance("com.sun.star.sdb.RowSet"))); - + } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); } // </create object relations> - + TestEnvironment tEnv = new TestEnvironment(oObj) ; - + // <adding object relations> - + // com.sun.star.sdb.DataAccessDescriptor tEnv.addObjRelation("DataAccessDescriptor.XResultSet", oResultSet); tEnv.addObjRelation("DataAccessDescriptor.XConnection", getRemoteXConnection(Param)); - + // com.sun.star.text.MailMaerge tEnv.addObjRelation("MailMerge.XConnection", getRemoteXConnection(Param)); tEnv.addObjRelation("MailMerge.XResultSet", oMMXResultSet); - + // com.sun.star.text.XMailMergeBroadcaster tEnv.addObjRelation( "executeArgs", vXJobArg0); tEnv.addObjRelation( "Job", Job); - + // com.sun.star.task.XJob tEnv.addObjRelation("XJobArgs", vXJobArgs); - + // </adding object relations> - + return tEnv ; } - + private XConnection getRemoteXConnection(TestParameters Param){ - + 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" ); @@ -333,7 +333,7 @@ public class SwXMailMerge extends TestCase { String tmpDatabaseUrl = utils.getOfficeTempDir((XMultiServiceFactory)Param.getMSF()); databaseName = "NewDatabaseSource" + uniqueSuffix ; - + String tmpDatabaseFile = tmpDatabaseUrl + databaseName + ".odb"; System.out.println("try to delete '"+tmpDatabaseFile+"'"); utils.deleteFile(((XMultiServiceFactory) Param.getMSF()), tmpDatabaseFile); @@ -349,15 +349,15 @@ public class SwXMailMerge extends TestCase { UnoRuntime.queryInterface(XPropertySet.class, newSource); xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; - + DBTools dbt = new DBTools( (XMultiServiceFactory)Param.getMSF(), log ); // registering source in DatabaseContext log.println("register database '"+tmpDatabaseUrl+"' as '"+databaseName+"'" ); dbt.reRegisterDB(databaseName, newSource) ; - + uniqueSuffix++; Param.put("uniqueSuffix", new Integer(uniqueSuffix)); - + return dbt.connectToSource(newSource); } catch( Exception e ) { @@ -368,11 +368,11 @@ public class SwXMailMerge extends TestCase { throw new StatusException("could not register new database", e) ; } } - + private XConnection getLocalXConnection(TestParameters Param){ - + log.println("create local connection"); - + XInterface oDataCont = null; try { oDataCont = (XInterface)( (XMultiServiceFactory) Param.getMSF()).createInstance @@ -382,22 +382,22 @@ public class SwXMailMerge extends TestCase { } XNameAccess xNADataCont = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oDataCont); - + String[] dataNames = xNADataCont.getElementNames(); - + String dataName=""; for (int i = 0; i < dataNames.length; i++){ if (dataNames[i].startsWith("Biblio")) dataName=dataNames[i]; } - + try{ - + Object oDataBase = xNADataCont.getByName(dataName); XDataSource xDataSource = (XDataSource) UnoRuntime.queryInterface(XDataSource.class, oDataBase); - + return xDataSource.getConnection("",""); - + } catch ( NoSuchElementException e){ throw new StatusException("Couldn't get registered data base", e); } catch ( WrappedTargetException e){ @@ -405,34 +405,34 @@ public class SwXMailMerge extends TestCase { } catch ( SQLException e){ throw new StatusException("Couldn't get XConnection from registered data base", e); } - + } - + protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing connections..."); XMultiServiceFactory xMsf = (XMultiServiceFactory) Param.getMSF(); DBTools dbt = new DBTools( xMsf, log ); - + if (Param.containsKey("uniqueSuffix")){ int uniqueSuffix = Param.getInt("uniqueSuffix"); uniqueSuffix--; String databaseName = ""; while (uniqueSuffix >= 0){ - + databaseName = "NewDatabaseSource" + uniqueSuffix ; - + log.println("revoke '"+databaseName+"'"); - + try{ dbt.revokeDB(databaseName); } catch (com.sun.star.uno.Exception e){ } - + uniqueSuffix--; } } - - } + + } } diff --git a/qadevOOo/tests/java/mod/_sw/SwXModule.java b/qadevOOo/tests/java/mod/_sw/SwXModule.java index dea1cc05998f..c8398b9d7b9d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXModule.java +++ b/qadevOOo/tests/java/mod/_sw/SwXModule.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java index 72c7f759d9ff..30dbe80c7810 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java +++ b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -143,7 +143,7 @@ public class SwXNumberingRules extends TestCase { log.println("Error, exception occured..."); e.printStackTrace(log); } - + Object instance1 = null; try { @@ -167,10 +167,10 @@ public class SwXNumberingRules extends TestCase { } catch ( com.sun.star.lang.IllegalArgumentException e ) { log.println("Error, exception occured..."); e.printStackTrace(log); - } - + } + TestEnvironment tEnv = new TestEnvironment( oObj ); - + tEnv.addObjRelation("INSTANCE1", instance1); return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java index 5e31bc5f75ff..6bb88deb14b3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,17 +94,17 @@ import com.sun.star.util.XCloseable; */ public class SwXParagraph extends TestCase { XTextDocument xTextDoc; - + /** * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - + } - + protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -115,8 +115,8 @@ public class SwXParagraph extends TestCase { log.println("couldn't close document"); } } - - + + /** * Creating a Testenvironment for the interfaces to be tested. To obtain * test component, at first several paragraphs are inserted to a major text @@ -140,10 +140,10 @@ public class SwXParagraph extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - + if (xTextDoc != null) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -162,20 +162,20 @@ public class SwXParagraph extends TestCase { e.printStackTrace( log ); throw new StatusException( "Couldn't create document", e ); } - + XInterface oObj = null; XPropertySet paraP = null; XPropertySet portP = null; Object nRules = null; XInterface port = null; XInterface para = null; - + log.println( "creating a test environment" ); - - + + XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - + log.println( "inserting some lines" ); try { for (int i=0; i<5; i++){ @@ -197,12 +197,12 @@ public class SwXParagraph extends TestCase { e.printStackTrace(log); throw new StatusException( "Couldn't insert lines", e ); } - + // Enumeration XEnumerationAccess oEnumA = (XEnumerationAccess) UnoRuntime.queryInterface(XEnumerationAccess.class, oText ); XEnumeration oEnum = oEnumA.createEnumeration(); - + try { para = (XInterface) AnyConverter.toObject( new Type(XInterface.class),oEnum.nextElement()); @@ -221,7 +221,7 @@ public class SwXParagraph extends TestCase { e.printStackTrace(log); log.println("Error: exception occured..."); } - + try { portP = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, port); @@ -246,8 +246,8 @@ public class SwXParagraph extends TestCase { e.printStackTrace(log); throw new StatusException( "Couldn't get Paragraph", e ); } - - + + try { oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),oEnum.nextElement()); @@ -256,24 +256,24 @@ public class SwXParagraph extends TestCase { e.printStackTrace(log); throw new StatusException( "Couldn't get Paragraph", e ); } - - + + log.println( "creating a new environment for Paragraph object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - + log.println("adding ObjectRelation 'PARA' for CharacterProperties"); tEnv.addObjRelation("PARA", paraP); - + log.println("adding ObjectRelation 'PORTION' for CharacterProperties"); tEnv.addObjRelation("PORTION", portP); - + log.println("adding ObjectRelation 'NRULES' for ParagraphProperties"); tEnv.addObjRelation("NRULES", nRules); - + tEnv.addObjRelation("NoAttach","SwXParagraph"); - + return tEnv; } // finish method getTestEnvironment - + } // finish class SwXParagraph diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java index 9be419637935..144b76dcb151 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java index 0a9345ccc401..b95661e2308f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java index 56d2cca07516..ca2fb30118c2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java index 1ab4f7b370ce..a07d6993cadc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java index f3761738fd7b..bc5ff71ca784 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java index bf53b234bd97..13afc17e67ba 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXShape.java b/qadevOOo/tests/java/mod/_sw/SwXShape.java index bd516d22f46f..6ea0f8041574 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXShape.java +++ b/qadevOOo/tests/java/mod/_sw/SwXShape.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyle.java b/qadevOOo/tests/java/mod/_sw/SwXStyle.java index 8fc9bb8fa9aa..417080e22780 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyle.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyle.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java index d8a5b840ecb3..b9cce4d65048 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java index 75180338e316..436427b1fc27 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public class SwXStyleFamily extends TestCase { * </ul> */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + XNameAccess oSFNA = null; log.println( "Creating Test Environment..." ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java index 2ceaf704254b..eed656ee997a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java index ace59c91cc02..c4a970d4c1d2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ public class SwXTableColumns extends TestCase { UnoRuntime.queryInterface(XCellRange.class, oTable)); tEnv.addObjRelation("XIndexAccess.getByIndex.mustBeNull", new Boolean(true)); - + return tEnv; } // finish method getTestEnvironment diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java index 8d11e3607f44..69b06940d419 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java index cdb1b5d67830..f5ec370614db 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java index a7313943ce50..8d4cfd6a81f8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ public class SwXTextCursor extends TestCase { * {@link ifc.text._XTextRange} : major text of text document</li> * </ul> */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -157,19 +157,19 @@ public class SwXTextCursor extends TestCase { aText.insertString(textCursor, "" + (3 - i), false); for (int j = 0; j < 5; j++) { - aText.insertString(textCursor, "XTextCursor,XTextCursor", + aText.insertString(textCursor, "XTextCursor,XTextCursor", false); - aText.insertString(textCursor, "The quick brown fox ", + aText.insertString(textCursor, "The quick brown fox ", false); - aText.insertString(textCursor, "jumps over the lazy dog ", + aText.insertString(textCursor, "jumps over the lazy dog ", false); } - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); - aText.insertControlCharacter(textCursor, - ControlCharacter.LINE_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.LINE_BREAK, false); } } catch (com.sun.star.lang.IllegalArgumentException e) { @@ -189,11 +189,11 @@ public class SwXTextCursor extends TestCase { //Adding relation for util.XSortable final XParagraphCursor paragrCursor = (XParagraphCursor) UnoRuntime.queryInterface( - XParagraphCursor.class, + XParagraphCursor.class, oObj); final PrintWriter finalLog = log; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -205,32 +205,32 @@ public class SwXTextCursor extends TestCase { textCursor.gotoEnd(false); try { - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "4", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "b", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "3", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "a", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "23", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); aText.insertString(textCursor, "ab", false); - aText.insertControlCharacter(textCursor, - ControlCharacter.PARAGRAPH_BREAK, + aText.insertControlCharacter(textCursor, + ControlCharacter.PARAGRAPH_BREAK, false); } catch (com.sun.star.lang.IllegalArgumentException e) { out.println("Unexpected exception:" + e); @@ -247,10 +247,10 @@ public class SwXTextCursor extends TestCase { out.println(textCursor.getString()); } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); - + String ls = System.getProperty("line.separator"); String text = paragrCursor.getString(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java index db5c223f4f29..2630b5b2da88 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java index da2f53168863..f8e5a5d4881b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,13 +68,13 @@ public class SwXTextDocument extends TestCase { protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); DesktopTools.closeDoc(xSecondTextDoc); - DesktopTools.closeDoc(xTextDoc); + DesktopTools.closeDoc(xTextDoc); } /** * creating a Testenvironment for the interfaces to be tested */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { TestEnvironment tEnv = null; @@ -92,43 +92,43 @@ public class SwXTextDocument extends TestCase { try { for (int i = 0; i < 5; i++) { - oText.insertString(oCursor, "Paragraph Number: " + i, + oText.insertString(oCursor, "Paragraph Number: " + i, false); - oText.insertString(oCursor, - " The quick brown fox jumps over the lazy Dog: SwXParagraph", + oText.insertString(oCursor, + " The quick brown fox jumps over the lazy Dog: SwXParagraph", false); - oText.insertControlCharacter(oCursor, - ControlCharacter.PARAGRAPH_BREAK, + oText.insertControlCharacter(oCursor, + ControlCharacter.PARAGRAPH_BREAK, false); - oText.insertString(oCursor, - "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG: SwXParagraph", + oText.insertString(oCursor, + "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG: SwXParagraph", false); - oText.insertControlCharacter(oCursor, - ControlCharacter.PARAGRAPH_BREAK, + oText.insertControlCharacter(oCursor, + ControlCharacter.PARAGRAPH_BREAK, false); - oText.insertControlCharacter(oCursor, - ControlCharacter.LINE_BREAK, + oText.insertControlCharacter(oCursor, + ControlCharacter.LINE_BREAK, false); } for (int i = 0; i < 11; i++) { oText.insertString(oCursor, "xTextDoc ", false); - + } } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace(log); throw new StatusException("Couldn't insert lines", e); } - //insert two sections parent and child + //insert two sections parent and child XMultiServiceFactory oDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, xTextDoc); XInterface oTS; XTextSection xTS; XTextSectionsSupplier oTSSupp = (XTextSectionsSupplier) UnoRuntime.queryInterface( - XTextSectionsSupplier.class, + XTextSectionsSupplier.class, xTextDoc); XNameAccess oTSSuppName = oTSSupp.getTextSections(); @@ -148,29 +148,29 @@ public class SwXTextDocument extends TestCase { XInterface oTS2 = (XInterface) oDocMSF.createInstance( "com.sun.star.text.TextSection"); - oTSC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, + oTSC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, oTS2); oText.insertTextContent(oCursor, oTSC, false); XIndexAccess oTSSuppIndex = (XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, oTSSuppName); log.println( "getting a TextSection with the XTextSectionSupplier()"); - xTS = (XTextSection) UnoRuntime.queryInterface(XTextSection.class, + xTS = (XTextSection) UnoRuntime.queryInterface(XTextSection.class, oTSSuppIndex.getByIndex(0)); - XNamed xTSName = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed xTSName = (XNamed) UnoRuntime.queryInterface(XNamed.class, xTS); xTSName.setName("SwXTextSection"); log.println(" adding TextTable"); the_table = SOfficeFactory.createTextTable(xTextDoc, 6, 4); - XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class, + XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class, the_table); the_name.setName("SwXTextDocument"); - SOfficeFactory.insertTextContent(xTextDoc, + SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) the_table); log.println(" adding ReferenceMark"); @@ -185,33 +185,33 @@ public class SwXTextDocument extends TestCase { SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); log.println(" adding TextGraphic"); - WriterTools.insertTextGraphic(xTextDoc, oDocMSF, 5200, 4200, 4400, - 4000, "space-metal.jpg", + WriterTools.insertTextGraphic(xTextDoc, oDocMSF, 5200, 4200, 4400, + 4000, "space-metal.jpg", "SwXTextDocument"); log.println(" adding EndNote"); XInterface aEndNote = (XInterface) oDocMSF.createInstance( "com.sun.star.text.Endnote"); - oTC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, + oTC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, aEndNote); SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); log.println(" adding Bookmark"); - SOfficeFactory.insertTextContent(xTextDoc, + SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) SOfficeFactory.createBookmark( xTextDoc)); log.println(" adding DocumentIndex"); - oTC = SOfficeFactory.createIndex(xTextDoc, + oTC = SOfficeFactory.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); log.println(" adding TextFrame"); - XTextFrame frame = SOfficeFactory.createTextFrame(xTextDoc, 500, + XTextFrame frame = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); - oTC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, + oTC = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, frame); SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); @@ -241,9 +241,9 @@ public class SwXTextDocument extends TestCase { return tEnv; } - XModel model1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel model1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); - XModel model2 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel model2 = (XModel) UnoRuntime.queryInterface(XModel.class, xSecondTextDoc); XController cont1 = model1.getCurrentController(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java index 50e218b0d319..9df3327e13a4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ public class SwXTextEmbeddedObject extends TestCase { * @see TestParameters * @see PrintWriter */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; @@ -132,7 +132,7 @@ public class SwXTextEmbeddedObject extends TestCase { } XTextEmbeddedObjectsSupplier oTEOS = (XTextEmbeddedObjectsSupplier) UnoRuntime.queryInterface( - XTextEmbeddedObjectsSupplier.class, + XTextEmbeddedObjectsSupplier.class, xTextDoc); XNameAccess oEmObj = oTEOS.getEmbeddedObjects(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java index 51a3e8a45a12..342390180a54 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextField.java b/qadevOOo/tests/java/mod/_sw/SwXTextField.java index aabab6efe480..0b280929eedc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextField.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java index d0ba5c70af3c..009f50e570f5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java index 1b730500f37c..3c10f9b3cabf 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java index 64874119ca14..425faf20ef50 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ public class SwXTextFrame extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XTextFrame oFrame1 = null; @@ -109,7 +109,7 @@ public class SwXTextFrame extends TestCase { // AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, // 3 = frame/paragraph 4= at char - oPropSet.setPropertyValue("AnchorType", + oPropSet.setPropertyValue("AnchorType", TextContentAnchorType.AS_CHARACTER); oText = xTextDoc.getText(); oCursor = oText.createTextCursor(); @@ -126,10 +126,10 @@ public class SwXTextFrame extends TestCase { oText.insertTextContent(oCursor, the_content, true); XText oFrameText = oFrame1.getText(); - oFrameText.insertString(oFrameText.getStart(), "The FrameText", + oFrameText.insertString(oFrameText.getStart(), "The FrameText", true); - instance = SOF.createInstance(xTextDoc, + instance = SOF.createInstance(xTextDoc, "com.sun.star.text.TextFrame"); } catch (Exception Ex) { Ex.printStackTrace(log); @@ -142,12 +142,12 @@ public class SwXTextFrame extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("CONTENT", + tEnv.addObjRelation("CONTENT", (XTextContent) UnoRuntime.queryInterface( XTextContent.class, instance)); tEnv.addObjRelation("RANGE", xTextDoc.getText().createTextCursor()); - log.println("adding ObjRelation for XShape " + + log.println("adding ObjRelation for XShape " + "(get/setPosition won't work there)"); tEnv.addObjRelation("NoPos", "SwXTextFrame"); tEnv.addObjRelation("NoSetSize", "SwXTextFrame"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index ef304a631f9f..b79b4448e580 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index 9e45193586e2..b95cd8ba4eb9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ public class SwXTextGraphicObject extends TestCase { e.printStackTrace(); throw new StatusException("Couldn't insert text frame", e ); } - + log.println( "inserting graphic" ); try { @@ -195,7 +195,7 @@ public class SwXTextGraphicObject extends TestCase { tEnv.addObjRelation("CONTENT", (XTextContent) UnoRuntime.queryInterface(XTextContent.class,instance)); tEnv.addObjRelation("RANGE", xTextDoc.getText().createTextCursor()); - + //object relation for text.BaseFrameProperties tEnv.addObjRelation("TextFrame", xTextFrame); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java index 8b233ea5ceb5..76ab82f140e3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java index 3b581644cbe3..490f6531e618 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java index b591a6b45be8..da32557d1852 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java index 8b09a01dac9d..058e5f2f08da 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java index 5310ab00546a..cc49a1f4dcd7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java index d637bb23a252..ad72aeffee87 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java index c74f3a527323..48b1d9407584 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java index 0a672de3bdc8..3abdf4380855 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index c3bc78208b27..ca7d048181c7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,13 +81,13 @@ public class SwXTextTable extends TestCase { @param tParam TestParameters class which contains additional test parameters @param log PrintWriter class to log the test state and result - + @return TestEnvironment class - + @see TestParameters @see PrintWriter */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, + protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { // creation of testobject here XTextTable oObj = null; @@ -99,7 +99,7 @@ public class SwXTextTable extends TestCase { instance = SOF.createTextTable(xTextDoc); } catch (com.sun.star.uno.Exception uE) { uE.printStackTrace(log); - throw new StatusException("Couldn't create testobj : " + + throw new StatusException("Couldn't create testobj : " + uE.getMessage(), uE); } @@ -115,7 +115,7 @@ public class SwXTextTable extends TestCase { SOF.insertTextContent(xTextDoc, oObj); } catch (com.sun.star.uno.Exception uE) { uE.printStackTrace(log); - throw new StatusException("Couldn't create TextTable : " + + throw new StatusException("Couldn't create TextTable : " + uE.getMessage(), uE); } } @@ -151,7 +151,7 @@ public class SwXTextTable extends TestCase { //Adding relation for util.XSortable final PrintWriter finalLog = log; final XTextTable oTable = oObj; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -163,23 +163,23 @@ public class SwXTextTable extends TestCase { oTable.getCellByName("A1").setValue(4); XTextRange textRange = (XTextRange) UnoRuntime.queryInterface( - XTextRange.class, + XTextRange.class, oTable.getCellByName("A2")); textRange.setString("b"); oTable.getCellByName("A3").setValue(3); textRange = (XTextRange) UnoRuntime.queryInterface( - XTextRange.class, + XTextRange.class, oTable.getCellByName("A4")); textRange.setString("a"); oTable.getCellByName("A5").setValue(23); textRange = (XTextRange) UnoRuntime.queryInterface( - XTextRange.class, + XTextRange.class, oTable.getCellByName("A6")); textRange.setString("ab"); } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); @@ -201,7 +201,7 @@ public class SwXTextTable extends TestCase { if (!res) { out.println("Expected: 3, 4, 23"); - out.println("Getting: " + value[3] + ", " + + out.println("Getting: " + value[3] + ", " + value[4] + ", " + value[5]); } } else { @@ -211,7 +211,7 @@ public class SwXTextTable extends TestCase { if (!res) { out.println("Expected: 23, 4, 3"); - out.println("Getting: " + value[1] + ", " + + out.println("Getting: " + value[1] + ", " + value[2] + ", " + value[3]); } } @@ -222,9 +222,9 @@ public class SwXTextTable extends TestCase { if (!res) { out.println("Expected: 23, 3, 4, a, ab, b"); - out.println("Getting: " + value[0] + ", " + - value[1] + ", " + value[2] + - ", " + value[3] + ", " + + out.println("Getting: " + value[0] + ", " + + value[1] + ", " + value[2] + + ", " + value[3] + ", " + value[4] + ", " + value[5]); } } else { @@ -233,9 +233,9 @@ public class SwXTextTable extends TestCase { if (!res) { out.println("Expected: b, ab, a, 4, 3, 23"); - out.println("Getting: " + value[0] + ", " + - value[1] + ", " + value[2] + - ", " + value[3] + ", " + + out.println("Getting: " + value[0] + ", " + + value[1] + ", " + value[2] + + ", " + value[3] + ", " + value[4] + ", " + value[5]); } } @@ -251,7 +251,7 @@ public class SwXTextTable extends TestCase { } }); - tEnv.addObjRelation("CONTENT", + tEnv.addObjRelation("CONTENT", (XTextContent) UnoRuntime.queryInterface( XTextContent.class, instance)); tEnv.addObjRelation("RANGE", xTextDoc.getText().createTextCursor()); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java index 765dd4d6cea3..386e297eaa52 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,7 +113,7 @@ public class SwXTextTableCursor extends TestCase { log.println( "adding TextDocument as mod relation to environment" ); tEnv.addObjRelation("TEXTDOC", xTextDoc); - + tEnv.addObjRelation("STYLENAME1", "Table"); tEnv.addObjRelation("STYLENAME2", "Text"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java index 11df9282c49f..a2ada4632548 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java index daa8768d83c5..377bd14be2ae 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java index 891a953cb72e..281ef9e2dfd2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ import util.WriterTools; public class SwXTextView extends TestCase { XTextDocument xTextDoc; - + boolean debug = false; /** @@ -238,37 +238,37 @@ public class SwXTextView extends TestCase { XShape aShape = null; try{ log.println("adding contol shape '" + kindOfControl + "'"); - aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, kindOfControl); } catch (Exception e){ e.printStackTrace(log); - throw new StatusException("Couldn't create following control shape : '" + + throw new StatusException("Couldn't create following control shape : '" + kindOfControl + "': ", e); - + } - - + + log.println("adding relation for com.sun.star.view.XFormLayerAccess: XForm"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); - + try { - + XDrawPage xDP = WriterTools.getDrawPage(xTextDoc); if (xDP == null) log.println("ERROR: could not get DrawPage"); - + XNameContainer xForms = FormTools.getForms(xDP); if (xForms == null) log.println("ERROR: could not get Forms"); - + log.println("the draw page contains folowing elemtens:"); String[] elements = FormTools.getForms(WriterTools.getDrawPage(xTextDoc)).getElementNames(); for (int i = 0; i< elements.length; i++){ log.println("Element[" + i + "] :" + elements[i]); } - + myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), xForms.getByName("Standard")); if (myForm == null){ log.println("ERROR: could not get 'Standard' from drawpage!"); @@ -289,7 +289,7 @@ public class SwXTextView extends TestCase { } catch (NoSuchElementException ex) { log.println("ERROR: could not add ObjectRelation 'XFormLayerAccess.XForm': " + ex.toString()); } - + return tEnv; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java index a95e06573ea0..26aed37d1702 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java index 85cb5c3e642a..aaca842c3aab 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java index 898f3a441e98..f59512b9234f 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java index 565ecce877fe..f42de3699f0e 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java index b24c71bb66bd..66c55706f517 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLImporter.java b/qadevOOo/tests/java/mod/_sw/XMLImporter.java index 7fee85b07844..7ffd6710bf96 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java index 37f9594841d1..ed1661d27b11 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index aeab9166d41d..6deab9672dc9 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java index aa99852595df..fbea9eb7b3fe 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java index 4e9b47aaffd8..8529b08338bf 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java index 9b30cffb1b3b..0d7772a82f13 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java index f59fad454154..c8bde32a1564 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java index 9f3e35e9bac8..5b7f2fde1521 100644 --- a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java +++ b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java index dad98c0d7e24..5feb03fc795e 100644 --- a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java +++ b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java index 084834ff4d1c..917203287636 100644 --- a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java index 3c3845b40462..a55fe9a2d064 100644 --- a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java index ecea0b852e7a..824068f05b36 100644 --- a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java +++ b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index 1e9c0cbb69b0..ae39ac3ddb2d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ public class AccessibleButton extends lib.TestCase { * window) and finds accessible button 'OK' walking through the * accessible component tree. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); @@ -121,14 +121,14 @@ public class AccessibleButton extends lib.TestCase { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -139,10 +139,10 @@ public class AccessibleButton extends lib.TestCase { XAccessibleAction.class, oObj); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { System.out.println("Grabbing focus ... "); @@ -155,7 +155,7 @@ public class AccessibleButton extends lib.TestCase { tEnv.addObjRelation("XAccessibleText.Text", text.getText()); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); tEnv.addObjRelation("LimitedBounds", "yes"); @@ -209,7 +209,7 @@ public class AccessibleButton extends lib.TestCase { } public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController xController = aModel.getCurrentController(); @@ -218,10 +218,10 @@ public class AccessibleButton extends lib.TestCase { try { String aSlotID = ".uno:Zoom"; XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, msf.createInstance( "com.sun.star.util.URLTransformer")); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index 2ae69a72c246..f6f04297bdbf 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ public class AccessibleCheckBox extends TestCase { * window) and finds first accessible check box walking through the * accessible component tree. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); log.println("Creating text document"); @@ -136,21 +136,21 @@ public class AccessibleCheckBox extends TestCase { psDiag.start(); util.utils.shortWait(Param.getInt("ShortWait")); - + AccessibilityTools at = new AccessibilityTools(); util.utils.shortWait(Param.getInt("ShortWait")); log.println("Getting the active TopWindow"); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); action = (XAccessibleAction) UnoRuntime.queryInterface( @@ -163,10 +163,10 @@ public class AccessibleCheckBox extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { System.out.println("Grabbing focus ... "); @@ -179,7 +179,7 @@ public class AccessibleCheckBox extends TestCase { tEnv.addObjRelation("XAccessibleText.Text", text.getText()); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); tEnv.addObjRelation("LimitedBounds", "yes"); @@ -225,7 +225,7 @@ public class AccessibleCheckBox extends TestCase { } public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController xController = aModel.getCurrentController(); @@ -234,10 +234,10 @@ public class AccessibleCheckBox extends TestCase { try { String aSlotID = ".uno:InsertTable"; XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, msf.createInstance( "com.sun.star.util.URLTransformer")); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index 97879627d25d..755a5ce05007 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public class AccessibleComboBox extends TestCase { * finds AccessibleComboBox walking through the * accessible component tree. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -102,7 +102,7 @@ public class AccessibleComboBox extends TestCase { XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - DiagThread psDiag = new DiagThread(xTextDoc, + DiagThread psDiag = new DiagThread(xTextDoc, (XMultiServiceFactory) Param.getMSF()); psDiag.start(); @@ -114,21 +114,21 @@ public class AccessibleComboBox extends TestCase { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); XAccessibleSelection xAccSel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); try { @@ -139,7 +139,7 @@ public class AccessibleComboBox extends TestCase { util.utils.shortWait(Param.getInt("ShortWait")); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "AccessibleComboBox"); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -147,13 +147,13 @@ public class AccessibleComboBox extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); final XAccessibleComponent acomp1 = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, action); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { acomp1.grabFocus(); @@ -210,7 +210,7 @@ public class AccessibleComboBox extends TestCase { } public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController xController = aModel.getCurrentController(); @@ -219,10 +219,10 @@ public class AccessibleComboBox extends TestCase { try { String aSlotID = ".uno:FontDialog"; XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, msf.createInstance( "com.sun.star.util.URLTransformer")); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index fee8473550e9..df78b827624e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,19 +79,19 @@ public class AccessibleDropDownComboBox extends TestCase { * Finds AccessibleDropDownComboBox walking through the * accessible component tree of a writer document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentContainerWindow( - (XMultiServiceFactory) Param.getMSF(), + (XMultiServiceFactory) Param.getMSF(), xTextDoc); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, "", "AccessibleDropDownComboBox"); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -99,10 +99,10 @@ public class AccessibleDropDownComboBox extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleAction editAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, + XAccessibleAction.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index a42922a2f8f1..fd61a5c67396 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public class AccessibleDropDownListBox extends TestCase { * Finds AccessibleDropDownListBox walking through the * accessible component tree of a writer document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -89,14 +89,14 @@ public class AccessibleDropDownListBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) Param.getMSF(), + (XMultiServiceFactory) Param.getMSF(), xTextDoc); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, + + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, "", "AccessibleDropDownListBox"); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -105,7 +105,7 @@ public class AccessibleDropDownListBox extends TestCase { final XAccessibleAction acomp = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index e26481176e1e..d9f5282b2612 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ public class AccessibleEdit extends TestCase { * button 'Close' (for closing this dialog when disposing) * walking through the accessible component tree. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -111,13 +111,13 @@ public class AccessibleEdit extends TestCase { XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, oObj); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -148,12 +148,12 @@ public class AccessibleEdit extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); @@ -165,11 +165,11 @@ public class AccessibleEdit extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleEditableText edText = (XAccessibleEditableText) UnoRuntime.queryInterface( - XAccessibleEditableText.class, + XAccessibleEditableText.class, oObj); edText.setText("AccessibleEdit"); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { // buttonAccComp.grabFocus(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index 3bc7e81885c3..5fafb21fbe53 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public class AccessibleFixedText extends TestCase { * displays it. Then the text's accessible component is * obtained. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); @@ -97,23 +97,23 @@ public class AccessibleFixedText extends TestCase { try { dlgModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlDialogModel")); XControl dlgControl = (XControl) UnoRuntime.queryInterface( - XControl.class, + XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlDialog")); dlgControl.setModel(dlgModel); txtModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlFixedTextModel")); - txtControl = (XControl) UnoRuntime.queryInterface(XControl.class, + txtControl = (XControl) UnoRuntime.queryInterface(XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlFixedText")); @@ -124,12 +124,12 @@ public class AccessibleFixedText extends TestCase { xFT.setText("FxedText"); XControlContainer ctrlCont = (XControlContainer) UnoRuntime.queryInterface( - XControlContainer.class, + XControlContainer.class, dlgControl); ctrlCont.addControl("Text", txtControl); - xWinDlg = (XWindow) UnoRuntime.queryInterface(XWindow.class, + xWinDlg = (XWindow) UnoRuntime.queryInterface(XWindow.class, dlgControl); xWinDlg.setVisible(true); @@ -163,10 +163,10 @@ public class AccessibleFixedText extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - final XWindow xWin = (XWindow) UnoRuntime.queryInterface(XWindow.class, + final XWindow xWin = (XWindow) UnoRuntime.queryInterface(XWindow.class, txtControl); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { xWin.setEnable(false); @@ -179,7 +179,7 @@ public class AccessibleFixedText extends TestCase { tEnv.addObjRelation("XAccessibleText.Text", text.getText()); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); tEnv.addObjRelation("LimitedBounds", "yes"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java index 6fe2129995cc..cc8e718f965a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public class AccessibleList extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that list box is obtained. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -88,13 +88,13 @@ public class AccessibleList extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -125,7 +125,7 @@ public class AccessibleList extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -133,7 +133,7 @@ public class AccessibleList extends TestCase { at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); @@ -143,7 +143,7 @@ public class AccessibleList extends TestCase { oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); xAccSel.selectAccessibleChild(3); shortWait(); @@ -153,9 +153,9 @@ public class AccessibleList extends TestCase { log.println("# Getting the ListBox"); - XAccessibleContext parent = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PANEL, - "", + XAccessibleContext parent = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.PANEL, + "", "com.sun.star.comp.toolkit.AccessibleListBox"); log.println("# Getting the first child"); @@ -169,17 +169,17 @@ public class AccessibleList extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); final XAccessibleComponent acomp1 = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, action); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { System.out.println("Grabbing focus ... "); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java index 7b65e74152b1..8be8462e9064 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ public class AccessibleListBox extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that list box is obtained. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -112,13 +112,13 @@ public class AccessibleListBox extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -149,7 +149,7 @@ public class AccessibleListBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -158,7 +158,7 @@ public class AccessibleListBox extends TestCase { // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); @@ -168,7 +168,7 @@ public class AccessibleListBox extends TestCase { oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); xAccSel.selectAccessibleChild(3); shortWait(); @@ -176,10 +176,10 @@ public class AccessibleListBox extends TestCase { throw new StatusException("Can't switch to required tab", e); } - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "com.sun.star.comp.toolkit.AccessibleListBox"); - Object list = at.getAccessibleObjectForRole(at.SearchedAccessible, + Object list = at.getAccessibleObjectForRole(at.SearchedAccessible, AccessibleRole.LIST); log.println("ImplementationName " + utils.getImplName(oObj)); @@ -187,13 +187,13 @@ public class AccessibleListBox extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, list); final XAccessibleComponent acomp1 = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, action); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { System.out.println("Grabbing focus ... "); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java index ecbf43679ef8..97b2ce338ffb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public class AccessibleListItem extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that listbox item is obtained. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); @@ -109,13 +109,13 @@ public class AccessibleListItem extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -146,7 +146,7 @@ public class AccessibleListItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -154,7 +154,7 @@ public class AccessibleListItem extends TestCase { at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); @@ -164,7 +164,7 @@ public class AccessibleListItem extends TestCase { oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); xAccSel.selectAccessibleChild(3); shortWait(); @@ -172,21 +172,21 @@ public class AccessibleListItem extends TestCase { throw new StatusException("Can't switch to required tab", e); } - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LIST_ITEM,"Spr"); + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LIST_ITEM,"Spr"); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); tEnv.addObjRelation("LimitedBounds", "yes"); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { acomp.grabFocus(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index 4eaec80dcd81..d9da588e290a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public class AccessibleMenu extends TestCase { * Finds accessible component with role <code>MENU</code> * walking through the accessible component tree of a document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); @@ -112,7 +112,7 @@ public class AccessibleMenu extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext menubar = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext menubar = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); XInterface oObj = null; Object menu2 = null; @@ -132,7 +132,7 @@ public class AccessibleMenu extends TestCase { final XAccessibleAction act2 = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, menu2); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { @@ -158,10 +158,10 @@ public class AccessibleMenu extends TestCase { tEnv.addObjRelation("LimitedBounds", "yes"); - tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", + tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", new Boolean(false)); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index 2441bdaa7075..b0fcb29cfa32 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public class AccessibleMenuBar extends TestCase { * Finds accessible component with role <code>MENUBAR</code> * walking through the accessible component tree of a document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { shortWait(); @@ -101,10 +101,10 @@ public class AccessibleMenuBar extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { System.out.println("Grabbing focus ... "); @@ -112,10 +112,10 @@ public class AccessibleMenuBar extends TestCase { } }); - tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", + tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", new Boolean(false)); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index a41abe45e520..af41ba44b645 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class AccessibleMenuItem extends TestCase { * Finds first accessible component with role <code>MENUITEM</code> * walking through the accessible component tree of a document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -110,13 +110,13 @@ public class AccessibleMenuItem extends TestCase { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); try { @@ -142,7 +142,7 @@ public class AccessibleMenuItem extends TestCase { final XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { @@ -157,7 +157,7 @@ public class AccessibleMenuItem extends TestCase { tEnv.addObjRelation("XAccessibleText.Text", text.getText()); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "Can't change or select Text in MenuBarItem"); tEnv.addObjRelation("Destroy", new Boolean(true)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index f05bcb025803..77d5cf198b7a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public class AccessibleMenuSeparator extends TestCase { * and implementation name <code>AccessibleMenuSeparator</code> * walking through the accessible component tree of a document. */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { shortWait(); @@ -93,7 +93,7 @@ public class AccessibleMenuSeparator extends TestCase { XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); XAccessibleAction act = null; XInterface oObj = null; @@ -120,7 +120,7 @@ public class AccessibleMenuSeparator extends TestCase { final XAccessibleAction aAct = act; - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index f4b292c84b23..bc6b4d057dca 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,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 = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -75,7 +75,7 @@ public class AccessiblePopupMenu extends TestCase { * <code>createTestEnvironment</code> method. */ protected void cleanup(TestParameters Param, PrintWriter log) { - + log.println("release the popup menu"); try { Robot rob = new Robot(); @@ -87,7 +87,7 @@ public class AccessiblePopupMenu extends TestCase { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + log.println("disposing xTextDoc"); if (xTextDoc != null) { @@ -118,7 +118,7 @@ public class AccessiblePopupMenu extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -145,7 +145,7 @@ public class AccessiblePopupMenu extends TestCase { shortWait(tParam); - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XInterface oObj = null; @@ -153,7 +153,7 @@ public class AccessiblePopupMenu extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -176,14 +176,14 @@ public class AccessiblePopupMenu extends TestCase { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + shortWait(tParam); XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, toolkit); try { - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); xRoot = at.getAccessibleObject(xWindow); @@ -199,14 +199,14 @@ public class AccessiblePopupMenu extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); final XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index 53f60643f955..20812b1db4cb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,17 +95,17 @@ import util.SOfficeFactory; public class AccessibleRadioButton extends TestCase { private static XDesktop the_Desk; private static XTextDocument xTextDoc; - private static XAccessibleAction accCloseButton; - + private static XAccessibleAction accCloseButton; + /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); - } + } /** * Closes a Hyperlink dialog, disposes the document, if exists, created in @@ -159,7 +159,7 @@ public class AccessibleRadioButton extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -178,13 +178,13 @@ public class AccessibleRadioButton extends TestCase { util.utils.shortWait(2000); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -231,17 +231,17 @@ public class AccessibleRadioButton extends TestCase { util.utils.shortWait(2000); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); XAccessibleContext iconChoiceCtrl = at.getAccessibleObjectForRole( - xRoot, AccessibleRole.TREE, + xRoot, AccessibleRole.TREE, "IconChoiceControl"); XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, iconChoiceCtrl); try { @@ -252,37 +252,37 @@ public class AccessibleRadioButton extends TestCase { } at.printAccessibleTree(log,xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - - oObj = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.RADIO_BUTTON, + + oObj = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.RADIO_BUTTON, "Web"); - XAccessibleContext anotherButton = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.RADIO_BUTTON, + XAccessibleContext anotherButton = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.RADIO_BUTTON, "FTP"); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, + XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.PUSH_BUTTON, "Close"); - + accCloseButton = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, closeButton); + XAccessibleAction.class, closeButton); log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this component"); tEnv.addObjRelation("LimitedBounds", "yes"); final XAccessibleComponent acomp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { acomp.grabFocus(); @@ -291,14 +291,14 @@ public class AccessibleRadioButton extends TestCase { tEnv.addObjRelation("XAccessibleText.Text", "Web"); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "Can't change or select Text in AccessibleRadioButton"); XAccessibleValue anotherButtonValue = (XAccessibleValue) UnoRuntime.queryInterface( - XAccessibleValue.class, + XAccessibleValue.class, anotherButton); - tEnv.addObjRelation("XAccessibleValue.anotherFromGroup", + tEnv.addObjRelation("XAccessibleValue.anotherFromGroup", anotherButtonValue); return tEnv; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index a52a9fef5483..009fdefd2aaa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class AccessibleScrollBar extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -125,7 +125,7 @@ public class AccessibleScrollBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -153,7 +153,7 @@ public class AccessibleScrollBar extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -167,7 +167,7 @@ public class AccessibleScrollBar extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index 32dd630370a3..0f6cca0ed753 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ public class AccessibleStatusBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -163,7 +163,7 @@ public class AccessibleStatusBar extends TestCase { final XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, toolkit); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { Rectangle newPosSize = xWindow.getPosSize(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index 446d0deb4f42..ad682c79d974 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public class AccessibleStatusBarItem extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -126,7 +126,7 @@ public class AccessibleStatusBarItem extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -149,7 +149,7 @@ public class AccessibleStatusBarItem extends TestCase { throw new StatusException("Couldn't create document", e); } - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XInterface oObj = null; @@ -158,13 +158,13 @@ public class AccessibleStatusBarItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentContainerWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext statusbar = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext statusbar = at.getAccessibleObjectForRole(xRoot, AccessibleRole.STATUS_BAR); try { @@ -177,7 +177,7 @@ public class AccessibleStatusBarItem extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "Can't change or select Text in StatusBarItem"); tEnv.addObjRelation("XAccessibleText", secondItem); @@ -185,7 +185,7 @@ public class AccessibleStatusBarItem extends TestCase { final XTextDocument doc = xTextDoc; - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { doc.getText().setString("AccessibleStatusBarItem"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index 488c8a39c7d1..615fd7e52a89 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,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 = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -148,7 +148,7 @@ public class AccessibleTabControl extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleSelection */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -172,13 +172,13 @@ public class AccessibleTabControl extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -225,16 +225,16 @@ public class AccessibleTabControl extends TestCase { shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, + XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.PUSH_BUTTON, "Close"); accCloseButton = (XAccessibleAction) UnoRuntime.queryInterface( @@ -245,10 +245,10 @@ public class AccessibleTabControl extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleSelection selection = (XAccessibleSelection) (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, + XAccessibleSelection.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { @@ -259,10 +259,10 @@ public class AccessibleTabControl extends TestCase { } }); - tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", + tEnv.addObjRelation("XAccessibleSelection.OneAlwaysSelected", new Boolean(true)); - tEnv.addObjRelation("XAccessibleSelection.multiSelection", + tEnv.addObjRelation("XAccessibleSelection.multiSelection", new Boolean(false)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index 318c2a96b8dd..6d458de73581 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,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 = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -141,7 +141,7 @@ public class AccessibleTabPage extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -178,13 +178,13 @@ public class AccessibleTabPage extends TestCase { shortWait(); - XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XController secondController = aModel1.getCurrentController(); XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, secondController); XURLTransformer urlTransf = null; @@ -231,18 +231,18 @@ public class AccessibleTabPage extends TestCase { shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, + XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.PUSH_BUTTON, "Close"); accCloseButton = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, closeButton); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB); log.println("ImplementationName: " + util.utils.getImplName(oObj)); @@ -253,7 +253,7 @@ public class AccessibleTabPage extends TestCase { tEnv.addObjRelation("LimitedBounds", "toolkit.AccessibleTabPage"); XAccessibleComponent accComp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, oObj); final Point point = accComp.getLocationOnScreen(); @@ -261,13 +261,13 @@ public class AccessibleTabPage extends TestCase { XInterface xEventInt = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Variables"); final XAccessibleComponent eventAccComp = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, + XAccessibleComponent.class, xEventInt); - - tEnv.addObjRelation("EventProducer", + + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { - eventAccComp.grabFocus(); + eventAccComp.grabFocus(); } }); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index c02017508695..ed352e6e7183 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ import util.SOfficeFactory; 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>). */ @@ -83,20 +83,20 @@ public class AccessibleToolBox extends TestCase { DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } - + /** * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); - + if (xTextDoc != null) { util.DesktopTools.closeDoc(xTextDoc); ; } } - + /** * Creates a text document. * Then obtains an accessible object with @@ -120,16 +120,16 @@ public class AccessibleToolBox extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); - + if (xTextDoc != null) { util.DesktopTools.closeDoc(xTextDoc); } - + XMultiServiceFactory msf = (XMultiServiceFactory) tParam.getMSF(); - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(msf); - + try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); @@ -138,40 +138,40 @@ public class AccessibleToolBox extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create document", e); } - + XInterface oObj = null; - + XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - + AccessibilityTools at = new AccessibilityTools(); XAccessible xRoot = at.getAccessibleObject(xWindow); - + at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - + oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TOOL_BAR); - + log.println("ImplementationName: " + util.utils.getImplName(oObj)); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("LimitedBounds", "yes"); - + XAccessible acc = at.getAccessibleObject(oObj); XAccessible child = null; - + try { child = acc.getAccessibleContext().getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { } - + util.dbg.printInterfaces(child); - + final XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( XAccessibleAction.class, child); - + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { @@ -182,7 +182,7 @@ public class AccessibleToolBox extends TestCase { } } }); - + return tEnv; } } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index d6ecc3ce7cc8..f4e25f0f590a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public class AccessibleToolBoxItem extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -133,7 +133,7 @@ public class AccessibleToolBoxItem extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -154,7 +154,7 @@ public class AccessibleToolBoxItem extends TestCase { throw new StatusException("Couldn't create document", e); } - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XInterface oObj = null; @@ -162,31 +162,31 @@ public class AccessibleToolBoxItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentContainerWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.TOGGLE_BUTTON, + oObj = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.TOGGLE_BUTTON, "Bold"); log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("EditOnly", + tEnv.addObjRelation("EditOnly", "This method isn't supported in this dialog"); tEnv.addObjRelation("LimitedBounds", "yes"); final XAccessibleAction oAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, + XAccessibleAction.class, oObj); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index 95f4f7ccb19d..9dce17e1407b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ public class AccessibleWindow extends TestCase { * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ protected void initialize(TestParameters Param, PrintWriter log) { - the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, + the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( (XMultiServiceFactory) Param.getMSF())); } @@ -136,7 +136,7 @@ public class AccessibleWindow extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, + protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); @@ -163,7 +163,7 @@ public class AccessibleWindow extends TestCase { throw new StatusException("Couldn't create document", e); } - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XInterface oObj = null; @@ -171,7 +171,7 @@ public class AccessibleWindow extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + (XMultiServiceFactory) tParam.getMSF(), aModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -187,7 +187,7 @@ public class AccessibleWindow extends TestCase { final XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( XExtendedToolkit.class, toolkit); - tEnv.addObjRelation("EventProducer", + tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { XWindow xWin = (XWindow) UnoRuntime.queryInterface( @@ -197,7 +197,7 @@ public class AccessibleWindow extends TestCase { newPosSize.Height = newPosSize.Height - 20; newPosSize.X = newPosSize.X + 20; newPosSize.Y = newPosSize.Y + 20; - xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, + xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, newPosSize.Height, PosSize.POSSIZE); } }); diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java index 5b4a0ed704e1..1dbe1cf66cd2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ import util.utils; public class MutableTreeDataModel extends TestCase { private static XTextDocument xTextDoc; private static XInterface oObj = null; - + /** * Creates StarOffice Writer document. */ @@ -55,42 +55,42 @@ public class MutableTreeDataModel extends TestCase { xTextDoc = WriterTools.createTextDoc( (XMultiServiceFactory) tParam.getMSF()); } - + /** * Disposes StarOffice Writer document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + util.DesktopTools.closeDoc(xTextDoc); } - + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + try { oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( "com.sun.star.awt.tree.MutableTreeDataModel"); } catch (Exception e) { } - + log.println( "creating a new environment for MutableTreeDataModel object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", "toolkit.MutableTreeDataModel"); log.println("ImplementationName: " + utils.getImplName(oObj)); - + tEnv.addObjRelation("XTreeDataModelListenerEvent", new XTreeDataModelListenerEvent()); - + return tEnv; } // finish method getTestEnvironment - + public class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{ - + public void fireEvent(){ - + XMutableTreeDataModel xModel = (XMutableTreeDataModel) UnoRuntime.queryInterface(XMutableTreeDataModel.class, oObj); XMutableTreeNode node = xModel.createNode("EventNode", true); try { @@ -99,7 +99,7 @@ public class MutableTreeDataModel extends TestCase { log.println("ERROR: could not preform event: " + ex.toString()); ex.printStackTrace(); } - + } } } // finish class UnoControlListBoxModel diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java index 39c258c9ffd6..6382c7c3e1e5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public class MutableTreeNode extends TestCase { private static XMultiServiceFactory mxMSF; private static PrintWriter log; private static boolean debug = false; - + /** * Creates StarOffice Writer document. */ @@ -65,20 +65,20 @@ public class MutableTreeNode extends TestCase { // log.println("creating a textdocument"); // xTextDoc = WriterTools.createTextDoc(mxMSF); } - + /** * Disposes StarOffice Writer document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + util.DesktopTools.closeDoc(xTextDoc); } - + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMutableTreeNode xNode; - + try { mXTreeDataModel = (XMutableTreeDataModel) UnoRuntime.queryInterface(XMutableTreeDataModel.class, mxMSF.createInstance("com.sun.star.awt.tree.MutableTreeDataModel")); @@ -86,47 +86,47 @@ public class MutableTreeNode extends TestCase { throw new StatusException(Status.failed("ERROR: could not create instance of" + " 'com.sun.star.awt.tree.MutableTreeDataModel'")); } - + xNode = mXTreeDataModel.createNode("UnoTreeControl", false); - + String sDisplayValue = "UnoTreeControl"; String sExpandedGraphicURL = "private:graphicrepository/sd/res/triangle_down.png"; String sCollapsedGraphicURL = "private:graphicrepository/sd/res/triangle_right.png"; String sNodeGraphicURL = "private:graphicrepository/sw/imglst/nc20010.png"; - + xNode.setDisplayValue( sDisplayValue); xNode.setDataValue(sDisplayValue); xNode.setExpandedGraphicURL(sExpandedGraphicURL); xNode.setCollapsedGraphicURL(sCollapsedGraphicURL); xNode.setNodeGraphicURL(sNodeGraphicURL); xNode.setHasChildrenOnDemand(true); - + fillNode(xNode); - + TestEnvironment tEnv = new TestEnvironment(xNode); - + tEnv.addObjRelation("OBJNAME", "toolkit.MutableTreeDataModel"); log.println("ImplementationName: " + utils.getImplName(oObj)); - + tEnv.addObjRelation("XTreeNode_DisplayValue", sDisplayValue); tEnv.addObjRelation("XTreeNode_ExpandedGraphicURL", sExpandedGraphicURL); tEnv.addObjRelation("XTreeNode_CollapsedGraphicURL", sCollapsedGraphicURL); tEnv.addObjRelation("XTreeNode_NodeGraphicURL", sNodeGraphicURL); - - tEnv.addObjRelation("XMutableTreeNode_NodeToAppend", + + tEnv.addObjRelation("XMutableTreeNode_NodeToAppend", mXTreeDataModel.createNode("XMutableTreeNode_NodeToAppend", true)); - + tEnv.addObjRelation("XMutableTreeNodeCreator", new XMutableTreeNodeCreator(){ public XMutableTreeNode createNode(String name){ return mXTreeDataModel.createNode(name, true); } }); - + return tEnv; } // finish method getTestEnvironment - + private void fillNode( XMutableTreeNode xNode ){ - + if( xNode.getChildCount() == 0 ) { String sParentPath = (String) xNode.getDataValue(); @@ -140,14 +140,14 @@ public class MutableTreeNode extends TestCase { } XSimpleFileAccess sA = (XSimpleFileAccess) UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); - + dirlist(officeUserPath, xNode); } } - + private void dirlist(String dir, XMutableTreeNode xNode){ - + Object fileacc = null; try { fileacc = mxMSF.createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); @@ -181,7 +181,7 @@ public class MutableTreeNode extends TestCase { } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } - + try { xNode.appendChild( xChildNode ); } catch (com.sun.star.lang.IllegalArgumentException ex) { diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java index c7bd67265305..bcba3d88c00f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabController.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class TabController extends TestCase { ; } - public TestEnvironment createTestEnvironment(TestParameters param, + public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; XControl xCtrl1 = null; @@ -83,20 +83,20 @@ public class TabController extends TestCase { // create object relations - FormTools.insertForm(xTextDoc, + FormTools.insertForm(xTextDoc, FormTools.getForms(WriterTools.getDrawPage( xTextDoc)), "MyForm"); - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "CommandButton", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "CommandButton", "UnoControlButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel model = aShape.getControl(); XControlAccess access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); try { @@ -107,7 +107,7 @@ public class TabController extends TestCase { XForm form = null; try { - form = (XForm) AnyConverter.toObject(new Type(XForm.class), + form = (XForm) AnyConverter.toObject(new Type(XForm.class), (FormTools.getForms( WriterTools.getDrawPage( xTextDoc))) diff --git a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java index 3ba6305c2be9..d3fd2693605b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,17 +63,17 @@ public class TabControllerModel extends TestCase { ; } - public TestEnvironment createTestEnvironment(TestParameters param, + public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; log.println("inserting some ControlShapes"); - XControlShape shape1 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 1000, + XControlShape shape1 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 1000, "CommandButton"); - XControlShape shape2 = FormTools.createControlShape(xTextDoc, 5000, - 3500, 7500, 5000, + XControlShape shape2 = FormTools.createControlShape(xTextDoc, 5000, + 3500, 7500, 5000, "TextField"); try { @@ -81,7 +81,7 @@ public class TabControllerModel extends TestCase { "com.sun.star.awt.TabControllerModel"); } catch (Exception e) { e.printStackTrace(log); - throw new StatusException("Couldn't create " + + throw new StatusException("Couldn't create " + "TabControllerModel", e); } @@ -89,7 +89,7 @@ public class TabControllerModel extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("OBJNAME", + tEnv.addObjRelation("OBJNAME", "stardiv.vcl.controlmodel.TabController"); tEnv.addObjRelation("Model1", shape1.getControl()); tEnv.addObjRelation("Model2", shape2.getControl()); diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index edca76e5e682..a8bfc06720e7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ public class Toolkit extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates <code>com.sun.star.awt.Toolkit</code> service. */ - public TestEnvironment createTestEnvironment(TestParameters Param, + public TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; @@ -90,8 +90,8 @@ public class Toolkit extends TestCase { XWindow win = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CommandButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -100,10 +100,10 @@ public class Toolkit extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); XController cntrlr = (XController) UnoRuntime.queryInterface( - XController.class, + XController.class, xTextDoc.getCurrentController()); //now get the toolkit @@ -120,7 +120,7 @@ public class Toolkit extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't get toolkit", e); } - + XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, xTextDoc); log.println(" creating a new environment for toolkit object"); @@ -130,7 +130,7 @@ public class Toolkit extends TestCase { log.println("Implementation Name: " + utils.getImplName(oObj)); tEnv.addObjRelation("WINPEER", the_win); - + tEnv.addObjRelation("XModel", xModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java index fac722977e95..8c7028134d64 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ public class UnoControlButton extends TestCase { util.DesktopTools.closeDoc(xTD2); } - public TestEnvironment createTestEnvironment(TestParameters Param, + public TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -92,10 +92,10 @@ public class UnoControlButton extends TestCase { XWindow anotherWindow = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "CommandButton", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "CommandButton", "UnoControlButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -104,7 +104,7 @@ public class UnoControlButton extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the ButtonControl for the needed Object relations diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java index a46b8abee959..4159f6106d9c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public class UnoControlButtonModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java index a2b8c167e2c4..c079ed8ac6ac 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public class UnoControlCheckBox extends TestCase { util.DesktopTools.closeDoc(xTD2); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -93,10 +93,10 @@ public class UnoControlCheckBox extends TestCase { XWindow anotherWindow = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "CheckBox", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "CheckBox", "UnoControlCheckBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -105,7 +105,7 @@ public class UnoControlCheckBox extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the CheckBoxControl for the needed Object relations @@ -137,7 +137,7 @@ public class UnoControlCheckBox extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // adding object relation for XItemListener - ifc.awt._XItemListener.TestItemListener listener = + ifc.awt._XItemListener.TestItemListener listener = new ifc.awt._XItemListener.TestItemListener(); XCheckBox check = (XCheckBox) UnoRuntime.queryInterface( XCheckBox.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java index 76773c6d74ac..a30435534417 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public class UnoControlCheckBoxModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java index 6bc357321d53..4240274d66c4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public class UnoControlComboBox extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -87,18 +87,18 @@ util.DesktopTools.closeDoc(xTextDoc); XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "ComboBox", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "ComboBox", "UnoControlComboBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -107,7 +107,7 @@ util.DesktopTools.closeDoc(xTextDoc); //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the ComboBoxControl for the needed Object relations @@ -139,14 +139,14 @@ util.DesktopTools.closeDoc(xTextDoc); tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java index 4ee5eef572ab..e24744546411 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlComboBoxModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java index 3b2b83380c04..57eddf415d74 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ public class UnoControlContainer extends TestCase { util.DesktopTools.closeDoc(xTD2); } - public TestEnvironment createTestEnvironment(TestParameters param, + public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { // create Object Relations ------------------------------------------- XInterface oObj = null; @@ -106,7 +106,7 @@ public class UnoControlContainer extends TestCase { // create 3 XControls // create first XControl - shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) shape); model = shape.getControl(); @@ -122,7 +122,7 @@ public class UnoControlContainer extends TestCase { // create second XControl - shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) shape); model = shape.getControl(); @@ -138,7 +138,7 @@ public class UnoControlContainer extends TestCase { // create third XControl - shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "CommandButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) shape); model = shape.getControl(); @@ -154,10 +154,10 @@ public class UnoControlContainer extends TestCase { // create XToolkit, XWindowPeer, XDevice //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "CommandButton", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "CommandButton", "UnoControlButton"); WriterTools.getDrawPage(xTD2).add((XShape) aShape); @@ -166,7 +166,7 @@ public class UnoControlContainer extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTD2.getCurrentController()); //get the ButtonControl for the needed Object relations @@ -213,7 +213,7 @@ public class UnoControlContainer extends TestCase { "creating a new environment for UnoControlContainer object"); TestEnvironment tEnv = new TestEnvironment(oObj); - + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oObj); Rectangle ps = xWindow.getPosSize(); xWindow.setPosSize(ps.X+10, ps.Y+10, ps.Width+10, ps.Height+10, PosSize.POSSIZE); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java index cf7104282237..847ed1e0c17f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ import util.utils; public class UnoControlContainerModel extends TestCase { - public TestEnvironment createTestEnvironment(TestParameters param, + public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; @@ -49,7 +49,7 @@ public class UnoControlContainerModel extends TestCase { "com.sun.star.awt.UnoControlContainerModel"); } catch (Exception e) { e.printStackTrace(log); - throw new StatusException("Couldn't create " + + throw new StatusException("Couldn't create " + "UnoControlContainerModel", e); } @@ -57,7 +57,7 @@ public class UnoControlContainerModel extends TestCase { "creating a new environment for UnoControlContainer object"); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("OBJNAME", + tEnv.addObjRelation("OBJNAME", "stardiv.vcl.controlmodel.ControlContainer"); System.out.println("ImplementationName: " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java index 455c4765bef0..064d9914b786 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlCurrencyField extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlCurrencyField extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "CurrencyField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "CurrencyField", "UnoControlCurrencyField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlCurrencyField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the CurrencyFieldControl for the needed Object relations @@ -141,14 +141,14 @@ public class UnoControlCurrencyField extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java index e2c696b53ac2..606a8ac631be 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlCurrencyFieldModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -71,12 +71,12 @@ public class UnoControlCurrencyFieldModel extends TestCase { } catch (Exception e) { } - log.println("creating a new environment for " + + log.println("creating a new environment for " + "UnoControlCurrencyFieldModel object"); TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("OBJNAME", + tEnv.addObjRelation("OBJNAME", "stardiv.vcl.controlmodel.CurrencyField"); System.out.println("ImplementationName: " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java index 073f262a0c12..bb0c947e58e3 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public class UnoControlDateField extends TestCase { util.DesktopTools.closeDoc(xTD2); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -93,10 +93,10 @@ public class UnoControlDateField extends TestCase { XWindow anotherWindow = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "DateField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "DateField", "UnoControlDateField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -105,7 +105,7 @@ public class UnoControlDateField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the DateFieldControl for the needed Object relations @@ -154,7 +154,7 @@ public class UnoControlDateField extends TestCase { tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java index 0144d0759b0d..9a4cee1ab823 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlDateFieldModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java index d621681a75a4..37464599ff6b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public class UnoControlDialog extends TestCase { * for Control, adds to Dialog a button, sets its size and * sets the dialog visible. <p> */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); @@ -116,23 +116,23 @@ public class UnoControlDialog extends TestCase { try { dlgModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlDialogModel")); XControl dlgControl = (XControl) UnoRuntime.queryInterface( - XControl.class, + XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlDialog")); dlgControl.setModel(dlgModel); XControlModel butModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButtonModel")); - butControl = (XControl) UnoRuntime.queryInterface(XControl.class, + butControl = (XControl) UnoRuntime.queryInterface(XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButton")); @@ -141,34 +141,34 @@ public class UnoControlDialog extends TestCase { // creating additional controls for XUnoControlContainer tabControl1 = (XTabController) UnoRuntime.queryInterface( - XTabController.class, + XTabController.class, xMSF.createInstance( "com.sun.star.awt.TabController")); tabControl2 = (XTabController) UnoRuntime.queryInterface( - XTabController.class, + XTabController.class, xMSF.createInstance( "com.sun.star.awt.TabController")); // creating additional controls for XControlContainer butModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButtonModel")); - butControl1 = (XControl) UnoRuntime.queryInterface(XControl.class, + butControl1 = (XControl) UnoRuntime.queryInterface(XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButton")); butControl1.setModel(butModel); butModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButtonModel")); - butControl2 = (XControl) UnoRuntime.queryInterface(XControl.class, + butControl2 = (XControl) UnoRuntime.queryInterface(XControl.class, xMSF.createInstance( "com.sun.star.awt.UnoControlButton")); @@ -177,7 +177,7 @@ public class UnoControlDialog extends TestCase { ctrlCont = (XControlContainer) UnoRuntime.queryInterface( XControlContainer.class, dlgControl); - xWinDlg = (XWindow) UnoRuntime.queryInterface(XWindow.class, + xWinDlg = (XWindow) UnoRuntime.queryInterface(XWindow.class, dlgControl); xWinDlg.setVisible(true); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index 558ea9f07d95..3f17f765d2dd 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public class UnoControlDialogModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface dialogModel = null; @@ -92,23 +92,23 @@ public class UnoControlDialogModel extends TestCase { dialogModel = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( "com.sun.star.awt.UnoControlDialogModel"); - // create the dialog model and set the properties + // create the dialog model and set the properties XPropertySet xPSetDialog = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, dialogModel); xPSetDialog.setPropertyValue("PositionX", new Integer(100)); xPSetDialog.setPropertyValue("PositionY", new Integer(100)); xPSetDialog.setPropertyValue("Width", new Integer(150)); xPSetDialog.setPropertyValue("Height", new Integer(100)); - xPSetDialog.setPropertyValue("Title", + xPSetDialog.setPropertyValue("Title", new String("Runtime Dialog Demo")); - // get the service manager from the dialog model + // get the service manager from the dialog model xMultiServiceFactory = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, + XMultiServiceFactory.class, dialogModel); - // create the button model and set the properties + // create the button model and set the properties Object buttonModel = xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlButtonModel"); XPropertySet xPSetButton = (XPropertySet) UnoRuntime.queryInterface( @@ -121,7 +121,7 @@ public class UnoControlDialogModel extends TestCase { xPSetButton.setPropertyValue("TabIndex", new Short((short) 0)); xPSetButton.setPropertyValue("Label", new String("Click Me")); - // create the label model and set the properties + // create the label model and set the properties Object labelModel = xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlFixedTextModel"); XPropertySet xPSetLabel = (XPropertySet) UnoRuntime.queryInterface( @@ -134,22 +134,22 @@ public class UnoControlDialogModel extends TestCase { xPSetLabel.setPropertyValue("TabIndex", new Short((short) 1)); xPSetLabel.setPropertyValue("Label", _labelPrefix); - // insert the control models into the dialog model + // insert the control models into the dialog model XNameContainer xNameCont = (XNameContainer) UnoRuntime.queryInterface( - XNameContainer.class, + XNameContainer.class, dialogModel); xNameCont.insertByName(_buttonName, buttonModel); xNameCont.insertByName(_labelName, labelModel); - // create the dialog control and set the model + // create the dialog control and set the model XControl dialog = (XControl) UnoRuntime.queryInterface( - XControl.class, + XControl.class, ((XMultiServiceFactory) Param.getMSF()).createInstance( "com.sun.star.awt.UnoControlDialog")); XControl xControl = (XControl) UnoRuntime.queryInterface( XControl.class, dialog); XControlModel xControlModel = (XControlModel) UnoRuntime.queryInterface( - XControlModel.class, + XControlModel.class, dialogModel); xControl.setModel(xControlModel); } catch (Exception e) { @@ -167,13 +167,13 @@ public class UnoControlDialogModel extends TestCase { try { // XNameReplace - tEnv.addObjRelation("INSTANCE1", + tEnv.addObjRelation("INSTANCE1", xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlFixedTextModel")); //XContainer - tEnv.addObjRelation("INSTANCE", + tEnv.addObjRelation("INSTANCE", xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlFixedTextModel")); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java index e6460fc72d55..80750544d649 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlEdit extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlEdit extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "TextField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "TextField", "UnoControlEdit"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlEdit extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the EditControl for the needed Object relations @@ -140,14 +140,14 @@ public class UnoControlEdit extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java index 4df1e7ee86cc..0f05e3725cd9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlEditModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java index ecf4c7170243..c326ee873cb4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlFileControl extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlFileControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "FileControl", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "FileControl", "UnoControlFileControl"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlFileControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the FileControlControl for the needed Object relations @@ -141,14 +141,14 @@ public class UnoControlFileControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java index 31153036da95..cefb7d072d13 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlFileControlModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java index 986f3acd9a2c..4deaef81360d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class UnoControlFixedLineModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java index 7ee0369ad4ea..14d3c8f2b73f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public class UnoControlFixedText extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -87,18 +87,18 @@ public class UnoControlFixedText extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "FixedText", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "FixedText", "UnoControlFixedText"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -107,7 +107,7 @@ public class UnoControlFixedText extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the FixedTextControl for the needed Object relations @@ -140,7 +140,7 @@ public class UnoControlFixedText extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java index 6bbf6f0cadb1..195dbdfb6984 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlFixedTextModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java index 62b6169895bc..4511f65323e3 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public class UnoControlFormattedField extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -89,18 +89,18 @@ public class UnoControlFormattedField extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "DatabaseFormattedField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "DatabaseFormattedField", "UnoControlFormattedField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -112,7 +112,7 @@ public class UnoControlFormattedField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the EditControl for the needed Object relations @@ -146,14 +146,14 @@ public class UnoControlFormattedField extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java index 549ddd82ef7d..035196df0ab9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlFormattedFieldModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -76,7 +76,7 @@ public class UnoControlFormattedFieldModel extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("OBJNAME", + tEnv.addObjRelation("OBJNAME", "stardiv.vcl.controlmodel.FormattedField"); System.out.println("ImplementationName: " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java index ef1377289fea..97d81ec52427 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public class UnoControlGroupBox extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -87,18 +87,18 @@ public class UnoControlGroupBox extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "GroupBox", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "GroupBox", "UnoControlGroupBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -107,7 +107,7 @@ public class UnoControlGroupBox extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the GroupBoxControl for the needed Object relations @@ -139,7 +139,7 @@ public class UnoControlGroupBox extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java index a960cd91c607..3bb46d8baaf2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlGroupBoxModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java index e8611f9aee4c..efe32e3423f0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlImageControl extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,10 +88,10 @@ public class UnoControlImageControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "DatabaseImageControl", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "DatabaseImageControl", "UnoControlImageControl"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); @@ -101,8 +101,8 @@ public class UnoControlImageControl extends TestCase { XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, the_Model); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -111,7 +111,7 @@ public class UnoControlImageControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the ImageControlControl for the needed Object relations @@ -148,7 +148,7 @@ public class UnoControlImageControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java index ab69c310038c..be142c1ebc58 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ import util.utils; public class UnoControlImageControlModel extends TestCase { - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java index 85e9abd9058c..4e919ba14698 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlListBox extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlListBox extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "ListBox", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "ListBox", "UnoControlListBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlListBox extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the ListBoxControl for the needed Object relations @@ -141,14 +141,14 @@ public class UnoControlListBox extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // adding object relation for XItemListener - ifc.awt._XItemListener.TestItemListener listener = + ifc.awt._XItemListener.TestItemListener listener = new ifc.awt._XItemListener.TestItemListener(); - XListBox list = (XListBox) UnoRuntime.queryInterface(XListBox.class, + XListBox list = (XListBox) UnoRuntime.queryInterface(XListBox.class, oObj); list.addItemListener(listener); tEnv.addObjRelation("TestItemListener", listener); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java index d567bb50bb8a..785527f631c2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlListBoxModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java index f9ac8e3b2d61..ac836abbaab7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ public class UnoControlNumericField extends TestCase { } } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -95,18 +95,18 @@ public class UnoControlNumericField extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "NumericField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "NumericField", "UnoControlNumericField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -115,7 +115,7 @@ public class UnoControlNumericField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the NumericFieldControl for the needed Object relations @@ -148,22 +148,22 @@ public class UnoControlNumericField extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); textComp.addTextListener(listener); tEnv.addObjRelation("TestTextListener", listener); - + tEnv.addObjRelation("XTextComponent.onlyNumbers", ""); - + log.println("ImplementationName: " + utils.getImplName(oObj)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java index 003f36fd0791..79746cc576ef 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public class UnoControlNumericFieldModel extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java index e3c514312b50..b89817e89c11 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlPatternField extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlPatternField extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "PatternField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "PatternField", "UnoControlPatternField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlPatternField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the PatternFieldControl for the needed Object relations @@ -141,14 +141,14 @@ public class UnoControlPatternField extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java index 2b77d40d0b15..11ebe24aac59 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ import util.utils; public class UnoControlPatternFieldModel extends TestCase { - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java index 39e9dca50035..d582c08c2c57 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public class UnoControlProgressBarModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java index 3b8eb313a3fa..3dea66cdb65f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public class UnoControlRadioButton extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -87,18 +87,18 @@ public class UnoControlRadioButton extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "RadioButton", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "RadioButton", "UnoControlRadioButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -107,7 +107,7 @@ public class UnoControlRadioButton extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the RadioButtonControl for the needed Object relations @@ -140,7 +140,7 @@ public class UnoControlRadioButton extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java index 4805f9f4c61a..0db72e0d2db5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ import util.utils; public class UnoControlRadioButtonModel extends TestCase { - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java index bf9a1b6492b8..0ca3e0e7eb82 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public class UnoControlScrollBarModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java index 04161dca61c2..9547f723414e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public class UnoControlTimeField extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -88,18 +88,18 @@ public class UnoControlTimeField extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "TimeField", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "TimeField", "UnoControlTimeField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -108,7 +108,7 @@ public class UnoControlTimeField extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the TimeFieldControl for the needed Object relations @@ -141,14 +141,14 @@ public class UnoControlTimeField extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java index 91472cd01e4b..4b47fe41b475 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ import util.utils; public class UnoControlTimeFieldModel extends TestCase { - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java index e12d323a5a8f..640365fdb855 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,24 +69,24 @@ public class UnoScrollBarControl extends TestCase { try { log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); - + log.println("maximize the window size"); XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc); XFrame xFrame = xModel.getCurrentController().getFrame(); XWindow xWin = xFrame.getContainerWindow(); - + Toolkit tk = Toolkit.getDefaultToolkit(); Dimension dim = tk.getScreenSize(); - + Rectangle newPosSize = xWin.getPosSize(); newPosSize.Width = new Double(dim.getWidth()).intValue(); newPosSize.Height = new Double(dim.getHeight()).intValue(); newPosSize.X = 0; newPosSize.Y = 0; - + xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, - newPosSize.Height, com.sun.star.awt.PosSize.POSSIZE); - + newPosSize.Height, com.sun.star.awt.PosSize.POSSIZE); + } catch (com.sun.star.uno.Exception e) { // Some exception occures.FAILED e.printStackTrace(log); @@ -100,7 +100,7 @@ public class UnoScrollBarControl extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -110,18 +110,18 @@ public class UnoScrollBarControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "ScrollBar", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "ScrollBar", "UnoControlScrollBar"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -130,7 +130,7 @@ public class UnoScrollBarControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the ScrollBarControl for the needed Object relations @@ -167,7 +167,7 @@ public class UnoScrollBarControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java index 332cf133568f..a4ba99c437ec 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ public class UnoSpinButtonControl extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -78,18 +78,18 @@ public class UnoSpinButtonControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, - 4500, 15000, - 10000, - "SpinButton", + XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000, + 4500, 15000, + 10000, + "SpinButton", "UnoControlSpinButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -98,7 +98,7 @@ public class UnoSpinButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //get the SpinButtonControl for the needed Object relations @@ -135,7 +135,7 @@ public class UnoSpinButtonControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java index fff32d4aeb3d..7cf20b8e0656 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ public class UnoSpinButtonControlModel extends TestCase { * Creates an instance of the service * <code>com.sun.star.awt.UnoControlSpinButtonModel</code>. */ - public synchronized TestEnvironment createTestEnvironment(TestParameters Param, + public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; @@ -60,7 +60,7 @@ public class UnoSpinButtonControlModel extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("OBJNAME", + tEnv.addObjRelation("OBJNAME", "com.sun.star.awt.UnoControlSpinButtonModel"); System.out.println("ImplementationName: " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index 5be41be69f27..4a8dc03800e9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,14 +67,14 @@ public class UnoTreeControl extends TestCase { 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); @@ -84,24 +84,24 @@ public class UnoTreeControl extends TestCase { throw new StatusException("Couldn't create document", e); } } - + protected void cleanup(TestParameters tParam, PrintWriter log) { // log.println(" disposing xTextDoc "); -// +// // util.DesktopTools.closeDoc(xTextDoc); } - + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { String sTreeControlName = "UnoTreeControl-Test"; mxMSF = (XMultiServiceFactory) Param.getMSF(); XInterface oObj = null; XMutableTreeNode xNode = null; - + try { - + mXTreeDataModel = (XMutableTreeDataModel ) - UnoRuntime.queryInterface(XMutableTreeDataModel.class, + UnoRuntime.queryInterface(XMutableTreeDataModel.class, mxMSF.createInstance("com.sun.star.awt.tree.MutableTreeDataModel")); xNode = mXTreeDataModel.createNode("UnoTreeControl", false); @@ -111,92 +111,92 @@ public class UnoTreeControl extends TestCase { xNode.setCollapsedGraphicURL( "private:graphicrepository/sd/res/triangle_right.png"); fillNode(xNode); - + mXTreeDataModel.setRoot(xNode); - + XControlModel xDialogModel = (XControlModel) UnoRuntime.queryInterface(XControlModel.class, mxMSF.createInstance("com.sun.star.awt.UnoControlDialogModel")); - + XPropertySet xDialogPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); - xDialogPropertySet.setPropertyValue( "PositionX", new Integer(50) ); - xDialogPropertySet.setPropertyValue( "PositionY", new Integer(50) ); - xDialogPropertySet.setPropertyValue( "Width", new Integer(256) ); - xDialogPropertySet.setPropertyValue( "Height", new Integer(256) ); - xDialogPropertySet.setPropertyValue( "Title", "Tree Control Test"); - + xDialogPropertySet.setPropertyValue( "PositionX", new Integer(50) ); + xDialogPropertySet.setPropertyValue( "PositionY", new Integer(50) ); + xDialogPropertySet.setPropertyValue( "Width", new Integer(256) ); + xDialogPropertySet.setPropertyValue( "Height", new Integer(256) ); + xDialogPropertySet.setPropertyValue( "Title", "Tree Control Test"); + XMultiServiceFactory xDialogMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xDialogModel); - + XControlModel xTreeControlModel = (XControlModel) UnoRuntime.queryInterface(XControlModel.class, xDialogMSF.createInstance("com.sun.star.awt.tree.TreeControlModel")); - + XPropertySet XTreeControlModelSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTreeControlModel); XTreeControlModelSet.setPropertyValue( "SelectionType",com.sun.star.view.SelectionType.NONE); - XTreeControlModelSet.setPropertyValue( "PositionX", new Integer(3 )); - XTreeControlModelSet.setPropertyValue( "PositionY", new Integer(3 )); - XTreeControlModelSet.setPropertyValue( "Width", new Integer(253)); - XTreeControlModelSet.setPropertyValue( "Height", new Integer(253) ); - XTreeControlModelSet.setPropertyValue( "DataModel", mXTreeDataModel ); + XTreeControlModelSet.setPropertyValue( "PositionX", new Integer(3 )); + XTreeControlModelSet.setPropertyValue( "PositionY", new Integer(3 )); + XTreeControlModelSet.setPropertyValue( "Width", new Integer(253)); + XTreeControlModelSet.setPropertyValue( "Height", new Integer(253) ); + XTreeControlModelSet.setPropertyValue( "DataModel", mXTreeDataModel ); XTreeControlModelSet.setPropertyValue( "ShowsRootHandles",new Boolean (false)); - XTreeControlModelSet.setPropertyValue( "ShowsHandles", new Boolean (false)); - XTreeControlModelSet.setPropertyValue( "RootDisplayed", new Boolean (true)); - XTreeControlModelSet.setPropertyValue( "Editable", new Boolean (true )); - + XTreeControlModelSet.setPropertyValue( "ShowsHandles", new Boolean (false)); + XTreeControlModelSet.setPropertyValue( "RootDisplayed", new Boolean (true)); + XTreeControlModelSet.setPropertyValue( "Editable", new Boolean (true )); + XNameContainer xDialogModelContainer = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); - + xDialogModelContainer.insertByName( sTreeControlName, xTreeControlModel); - + XControl xDialogControl = (XControl) UnoRuntime.queryInterface(XControl.class, mxMSF.createInstance("com.sun.star.awt.UnoControlDialog")); - + xDialogControl.setModel( xDialogModel ); - - XToolkit xToolkit = (XToolkit) UnoRuntime.queryInterface(XToolkit.class, + + XToolkit xToolkit = (XToolkit) UnoRuntime.queryInterface(XToolkit.class, mxMSF.createInstance("com.sun.star.awt.Toolkit" )); - + xDialogControl.createPeer( xToolkit, null ); - + // get the peers of the sub controls from the dialog peer container XControlContainer xDialogContainer = (XControlContainer) UnoRuntime.queryInterface(XControlContainer.class ,xDialogControl); - + XTreeControl xTreeControl = (XTreeControl) UnoRuntime.queryInterface(XTreeControl.class, xDialogContainer.getControl( sTreeControlName )); - + xTreeControl.expandNode(xNode); oObj = xTreeControl; XDialog xDialog = (XDialog) UnoRuntime.queryInterface(XDialog.class, xDialogControl); - + execurteDialog aDialog = new execurteDialog(xDialog); - + aDialog.start(); - -// xDialog.execute(); - + +// xDialog.execute(); + } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("XTreeControl_Node", xNode); //com.sun.star.view.XSelectionSupplier try { - + System.out.println("count of children: " + xNode.getChildCount()); tEnv.addObjRelation("Selections", new Object[]{xNode.getChildAt(0), xNode}); } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { log.println("ERROR: could not add object relation 'Selections' because 'xNode.getChildAt(1) failed: " + ex.toString()); } - - tEnv.addObjRelation("Comparer", + + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XMutableTreeNode xNode1 = (XMutableTreeNode) UnoRuntime.queryInterface( @@ -207,10 +207,10 @@ public class UnoTreeControl extends TestCase { } catch (com.sun.star.lang.IllegalArgumentException ex) { ex.printStackTrace(); } - + XMutableTreeNode xNode2 = (XMutableTreeNode) UnoRuntime.queryInterface( XMutableTreeNode.class, xNode2a); - + if (((String) xNode1.getDataValue()).equals((String)xNode2.getDataValue())) { return 0; } @@ -219,12 +219,12 @@ public class UnoTreeControl extends TestCase { } }); System.out.println("ImplementationName: " + utils.getImplName(oObj)); - + return tEnv; } // finish method getTestEnvironment - + private void fillNode( XMutableTreeNode xNode ){ - + if( xNode.getChildCount() == 0 ) { String sParentPath = (String) xNode.getDataValue(); @@ -238,14 +238,14 @@ public class UnoTreeControl extends TestCase { } XSimpleFileAccess sA = (XSimpleFileAccess) UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); - + dirlist(officeUserPath, xNode); } } - + private void dirlist(String dir, XMutableTreeNode xNode){ - + Object fileacc = null; try { fileacc = mxMSF.createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); @@ -279,21 +279,21 @@ public class UnoTreeControl extends TestCase { } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } - + try { xNode.appendChild( xChildNode ); } catch (com.sun.star.lang.IllegalArgumentException ex) { ex.printStackTrace(); } } - + private class execurteDialog extends Thread{ private XDialog mXDialog; - + public execurteDialog(XDialog xDialog){ mXDialog = xDialog; } - + public void run() { mXDialog.endExecute(); } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java index f8da7cd2082d..5f6fecef11b6 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ import util.utils; public class UnoTreeModel extends TestCase { private static XTextDocument xTextDoc; - + /** * Creates StarOffice Writer document. */ @@ -51,34 +51,34 @@ public class UnoTreeModel extends TestCase { xTextDoc = WriterTools.createTextDoc( (XMultiServiceFactory) tParam.getMSF()); } - + /** * Disposes StarOffice Writer document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + util.DesktopTools.closeDoc(xTextDoc); } - + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - + try { oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( "com.sun.star.awt.tree.TreeControlModel"); } catch (Exception e) { } - + log.println( "creating a new environment for TreeControlModel object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", "com.sun.star.awt.tree.TreeControlModel"); System.out.println("ImplementationName: " + utils.getImplName(oObj)); - + return tEnv; } // finish method getTestEnvironment } // finish class UnoControlListBoxModel diff --git a/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java b/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java index 7fb784e7d26b..e6bd253e2447 100644 --- a/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java index 4abc6230275d..ce278a2095f2 100644 --- a/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java index 1df5afb6733e..fcf8a696d5e1 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java index 12fec3fc7fa3..aa22b68d851c 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucb/UcbStore.java b/qadevOOo/tests/java/mod/_ucb/UcbStore.java index 459e068fab5b..2e0489037ff4 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbStore.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbStore.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java index 42391e5f83e7..9f886179647e 100644 --- a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java +++ b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java index 6e4d8b4b3708..6dccbf02020d 100644 --- a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,8 +70,8 @@ public class CHelpContentProvider extends TestCase { //Adding ObjRelation for XContentProvider tEnv.addObjRelation("FACTORY",CIF); - tEnv.addObjRelation("CONTENT1", "vnd.sun.star.help://swriter?System=WIN&Language=de&Query=text&HitCount=120&Scope=Heading"); - tEnv.addObjRelation("CONTENT2", + tEnv.addObjRelation("CONTENT1", "vnd.sun.star.help://swriter?System=WIN&Language=de&Query=text&HitCount=120&Scope=Heading"); + tEnv.addObjRelation("CONTENT2", util.utils.getFullTestURL("SwXTextEmbeddedObject.sdw")); return tEnv; diff --git a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java index 1caf45ea4777..b5b3395cb8bb 100644 --- a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java index edab6d30166e..1258ec52be1a 100644 --- a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java +++ b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java index ec709d5158ac..bb80761d6725 100644 --- a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java index 675c9502b54a..ce1901254d7f 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java index 366fd30eef41..a54f1bc8a151 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java index 3d9668f82567..021cdadc7cc3 100644 --- a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java index 6b6e86557476..d17b4f5be065 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java index 5935fae84abb..5dba0063dd75 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java index 3d184a87f946..af878cdf1755 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java index 2df8d47fbee9..4dec44420321 100644 --- a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java index 8adc3de640fe..46758c6e3d22 100644 --- a/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java index 59f18de31344..ebea2c62b679 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index 6fe4765389da..93d9de99b214 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 5e48b073fc9f..4801b2a4c893 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index c0edd4f82cda..ccea9da56f1b 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index 83a422df9128..52b3b3ce03d8 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index 4405b5c5ac60..ce399da29702 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index 7bd02228203d..01f89d61ad68 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ public class XMLStylesImporter extends TestCase { log.println( "creating a test environment" ); XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; - + try { oInt = xMSF.createInstance ("com.sun.star.comp.Chart.XMLStylesImporter") ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index f628a1c11b8f..b0f38f3d741c 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java index b6e948aa6312..96d68e2218cc 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java index 1b468c8a373c..996fc2c7c062 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java index 563b948d875f..93d3d3787ef2 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java index 4cfc5a72acaf..b572027f3857 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java index 244b7c9e3591..ff76e821a1b9 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java index ee6a4cf35d2b..a1f70a0223fc 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java index b7716acd0957..30ea302140c0 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java index 9caf84ef2d94..bd4180571506 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java index 19c95803428a..2466d4dcfa7e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java index ec6d6104da7a..defe48794929 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java index bb919b651ae0..8de42bcb3bdb 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java index cfb3d1117021..18fab3f93505 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java index 0675533906f1..4028f0661400 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java index a71443adbcc5..fd7a4f871c76 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java index 154f1380a9cc..7c69de6e1df4 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index 31aad6b65034..69a3a45eda39 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java index 75d0661630bd..114d20670f03 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java index db0b45e3ae8b..aeca441c26e5 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java index f67141c2e1fd..8635b1bdd0ad 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl index 83c370e11a18..11267990f01c 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl +++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,16 +25,16 @@ * ************************************************************************/ -#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ +#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ #define _com_sun_star_comp_smoketest_TestExtension_idl_ - -#include <com/sun/star/lang/XServiceInfo.idl> - + +#include <com/sun/star/lang/XServiceInfo.idl> + module com { module sun { module star { module comp { module smoketest { // example service, XServiceInfo is implemented here for demonstration - // issues. XServiceInfo must be implemented by all components. + // issues. XServiceInfo must be implemented by all components. service TestExtension: ::com::sun::star::lang::XServiceInfo; };};};};}; -#endif +#endif diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java index c08c719116ae..45168e800aa5 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public class TestExtension { */ static private final String __serviceName = "com.sun.star.comp.smoketest.TestExtension"; - + /** The initial component contextr, that gives access to * the service manager, supported singletons, ... * It's often later used @@ -65,7 +65,7 @@ public class TestExtension { * It's often later used */ private XMultiComponentFactory m_xMCF; - + /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param xmultiservicefactoryInitialization A special service factory * could be introduced while initializing. @@ -73,13 +73,13 @@ public class TestExtension { public _TestExtension(XComponentContext xCompContext) { try { m_cmpCtx = xCompContext; - m_xMCF = m_cmpCtx.getServiceManager(); + m_xMCF = m_cmpCtx.getServiceManager(); } catch( Exception e ) { e.printStackTrace(); } } - + /** This method returns an array of all supported service names. * @return Array of supported service names. */ @@ -95,7 +95,7 @@ public class TestExtension { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } - + /** This method returns true, if the given service will be * supported by the component. * @param sServiceName Service name. @@ -104,16 +104,16 @@ public class TestExtension { public boolean supportsService( String sServiceName ) { return sServiceName.equals( __serviceName ); } - + /** Return the class name of the component. * @return Class name of the component. */ public String getImplementationName() { return _TestExtension.class.getName(); - } + } } - - + + /** * Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> @@ -127,11 +127,11 @@ public class TestExtension { public static XSingleComponentFactory __getComponentFactory(String sImplName) { XSingleComponentFactory xFactory = null; - + if ( sImplName.equals( _TestExtension.class.getName() ) ) xFactory = Factory.createComponentFactory(_TestExtension.class, _TestExtension.getServiceNames()); - + return xFactory; } @@ -162,5 +162,5 @@ public class TestExtension { * your component using these objects. */ } - + } diff --git a/smoketestoo_native/data/Events.xml b/smoketestoo_native/data/Events.xml index 6536c1c5eafc..956a1ee40e2e 100644 --- a/smoketestoo_native/data/Events.xml +++ b/smoketestoo_native/data/Events.xml @@ -36,7 +36,7 @@ Sub ClickSaveTest if not OptionsDlg.cbSaveTest.Value then OptionsDlg.cbOpenTest.Value = false OptionsDlg.cbOpenTest.Enabled = false - else + else OptionsDlg.cbOpenTest.Enabled = true end If End Sub @@ -45,7 +45,7 @@ Sub ClickCutTest if not OptionsDlg.cbCutTest.Value then OptionsDlg.cbPasteTest.Value = false OptionsDlg.cbPasteTest.Enabled = false - else + else OptionsDlg.cbPasteTest.Enabled = true end If End Sub diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml index 364d2e2efcfb..43d0a14e6734 100644 --- a/smoketestoo_native/data/Global.xml +++ b/smoketestoo_native/data/Global.xml @@ -131,11 +131,11 @@ Sub Main if bShowTable then call ClearDoc (gOutPutDoc) end If - + call ClearStatus - + Call Test_10er.Main - + if bShowTable then call CreateStatusTable2 call CreateStatusTable @@ -155,7 +155,7 @@ Sub CreateStatusTable tableHeaders(cStMath) = "Math" tableHeaders(cStHTML) = "HTML" tableHeaders(cStJava) = "Java" - + dim tableColums(5) as string tableColums(cDocNew) = "new" tableColums(cDocCut) = "cut" @@ -163,60 +163,60 @@ Sub CreateStatusTable tableColums(cDocSaveOpen8) = "V8.0" tableColums(cDocSaveOpenXML) = "XML" tableColums(cDocSaveOpen50) = "V5.0" -' tableColums(cDocClose) = "close" - +' tableColums(cDocClose) = "close" + aDoc = gOutPutDoc - + xText = aDoc.Text xCursor = xText.createTextCursor() - -' xCursor.gotoStart(FALSE) -' xCursor.GoRight (2, False) -' SetParagraphBreak (xCursor) -' SetParagraphBreak (xCursor) + +' xCursor.gotoStart(FALSE) +' xCursor.GoRight (2, False) +' SetParagraphBreak (xCursor) +' SetParagraphBreak (xCursor) xCursor.gotoStart(FALSE) xCursor.GoRight (4, False) SetParagraphBreak (xCursor) xCursor.GoRight (1, False) SetParagraphBreak (xCursor) xCursor.GoRight (1, False) - + table = aDoc.createInstance("com.sun.star.text.TextTable") table.initialize(7,9) table.Name = "StTab1" xText.insertTextContent(xCursor, table, FALSE) - + tableCursor = table.createCursorByCellName(table.CellNames(0)) tableCursor.gotoStart(FALSE) tableCursor.goRight(1,FALSE) - + for i% = 0 to 7 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableHeaders(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey - + tableCursor.goRight(1,FALSE) next i% - + xCursor.gotoStart(FALSE) -' SetParagraphBreak (xCursor) -' SetParagraphBreak (xCursor) - - tableCursor.gotoStart(FALSE) +' SetParagraphBreak (xCursor) +' SetParagraphBreak (xCursor) + + tableCursor.gotoStart(FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.BackTransparent = False xCell.BackColor = cCoGrey - + for i% = 0 to 5 tableCursor.goDown(1,FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% @@ -229,7 +229,7 @@ Sub CreateStatusTable2 tableHeaders(cStExtension-9) = "Extension" tableHeaders(3) = "" tableHeaders(4) = "" - + dim tableColums(5) as string tableColums(cDBService ) = "services" tableColums(cDBOpen ) = "open" @@ -237,47 +237,47 @@ Sub CreateStatusTable2 tableColums(cDBDelete ) = "delete" tableColums(cDBSeek ) = "seek" tableColums(cDBClose ) = "close" - + dim tableColums2(3) as string tableColums2(cEXTService ) = "services" tableColums2(cEXTInstall ) = "install" tableColums2(cEXTUninstall ) = "uninstall" - + aDoc = gOutPutDoc - + xText = aDoc.Text xCursor = xText.createTextCursor() - + xCursor.gotoStart(FALSE) xCursor.GoRight (4, False) SetParagraphBreak (xCursor) SetParagraphBreak (xCursor) xCursor.gotoEnd(FALSE) - + table = aDoc.createInstance("com.sun.star.text.TextTable") table.initialize(7,6) table.Name = "StTab2" 'table.RelativeWidth =500 - + xText.insertTextContent(xCursor, table, FALSE) - + tableCursor = table.createCursorByCellName(table.CellNames(0)) tableCursor.gotoStart(FALSE) tableCursor.goRight(1,FALSE) - + for i% = 0 to 5 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableHeaders(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey - + tableCursor.goRight(1,FALSE) next i% - + tableCursor.gotoStart(FALSE) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.BackTransparent = False @@ -288,20 +288,20 @@ Sub CreateStatusTable2 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% - + tableCursor.gotoStart(FALSE) tableCursor.goRight(2,FALSE) - + for i% = 0 to 3 tableCursor.goDown(1,FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums2(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% @@ -312,27 +312,27 @@ Sub CreateDocState aDoc = gOutPutDoc table = aDoc.TextTables.GetByIndex (1) 'table = aDoc.TextTables.GetByName ("StTab1") - + for j% = 0 to 7 for i% = 0 to 5 sRangeName = GetRangeName(j%, i%+1) - + tableCursor = table.createCursorByCellName(sRangeName) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) - + xCell.BackTransparent = False - + if gErrorState (j%, i%) = cLogTrue then xCell.BackColor = cCoGreen else if gErrorState (j%, i%) = cLogFalse then xCell.BackColor = cCoRed else - xCell.BackColor = cCoGrey + xCell.BackColor = cCoGrey + end If end If - end If - + next i% next j% end Sub @@ -341,27 +341,27 @@ Sub CreateSecondState aDoc = gOutPutDoc table = aDoc.TextTables.GetByIndex (0) 'table = aDoc.TextTables.GetByName ("StTab2") - + for j% = 0 to cMaxErrorStates-9 for i% = 0 to 5 sRangeName = GetRangeName(j%, i%+1) - + tableCursor = table.createCursorByCellName(sRangeName) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) - + xCell.BackTransparent = False - + if gErrorState (j%+9, i%) = cLogTrue then xCell.BackColor = cCoGreen else if gErrorState (j%+9, i%) = cLogFalse then xCell.BackColor = cCoRed else - xCell.BackColor = cCoGrey - end If + xCell.BackColor = cCoGrey + end If end If - + next i% next j% end Sub @@ -375,45 +375,45 @@ Sub SetStatus (nDocType as Integer, nAction as Integer, bState as Boolean) Dim nState as integer nStatusType = GetStatusType (nDocType) If nStatusType = cStNone then Exit Sub - - if bState then + + if bState then nState = cLogTrue else nState = cLogFalse end If - + gErrorState (nStatusType, nAction) = nState end Sub Function GetStatusType (nDocType as Integer) as Integer Select Case ( nDocType ) - case frmWriter - GetStatusType = cStWriter ' Textdokument + case frmWriter + GetStatusType = cStWriter ' Textdokument case frmCalc - GetStatusType = cStCalc 'Tabellendokument + GetStatusType = cStCalc 'Tabellendokument case frmMessage - GetStatusType = cStMessage 'Nachricht + GetStatusType = cStMessage 'Nachricht case frmImpress - GetStatusType = cStPraesentation 'Präsentation + GetStatusType = cStPraesentation 'Präsentation case frmDraw GetStatusType = cStZeichnen 'Zeichnen case frmMath - GetStatusType = cStMath 'Formel + GetStatusType = cStMath 'Formel case frmImage - GetStatusType = cStBild 'Bild + GetStatusType = cStBild 'Bild case frmHyperText - GetStatusType = cStHTML 'Hypertext-Dokument + GetStatusType = cStHTML 'Hypertext-Dokument case frmChart - GetStatusType = cStChart 'Diagramm + GetStatusType = cStChart 'Diagramm case frmJava GetStatusType = cStJava 'Java case frmDataBase - GetStatusType = cStDataBase 'DataBase + GetStatusType = cStDataBase 'DataBase case frmExtension GetStatusType = cStExtension 'Extension case else GetStatusType = cStNone - end Select + end Select end Function Sub SetParagraphBreak (aCursor as Object) @@ -456,13 +456,13 @@ Sub SetGlobalOptionsDialog () Const sLibName = cTest10Modul Const sDialogName = cOptionsDialogName - + REM get library and input stream provider oLibContainer = DialogLibraries - + REM load the library oLibContainer.loadLibrary( sLibName ) - + oLib = oLibContainer.getByName( sLibName ) oInputStreamProvider = oLib.getByName( sDialogName ) @@ -479,9 +479,9 @@ Sub ShowOptionsDlg REM show the dialog gOptionsDialog.execute() - + ' jetzt läuft der Dialog, bis ein Button gedrückt wird - + Select Case (gDlgState) case cDlgOk call SetOptions () @@ -489,7 +489,7 @@ Sub ShowOptionsDlg call SetOptions () call StartTestByOptions () end Select - + gOptionsDialog.dispose() end Sub @@ -503,9 +503,9 @@ Sub SetOptions SetUserFieldState (cUserFieldTestHTML, -(gOptionsDialog.getControl("cbHTMLTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestMath, -(gOptionsDialog.getControl("cbMathTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestChart, -(gOptionsDialog.getControl("cbChartTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestJava, -(gOptionsDialog.getControl("cbJavaTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc) + SetUserFieldState (cUserFieldTestJava, -(gOptionsDialog.getControl("cbJavaTest").getState), gOutPutDoc) + SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc) + SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestOpenSave50, -(gOptionsDialog.getControl("cbSaveOpen50Test").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc) @@ -592,7 +592,7 @@ Sub StartTestByOptions ClearDocFull (gOutPutDoc) gOutPutDoc.dispose 'StarDesktop.Terminate - + 'EnableReschedule( false ) 'DispatchSlot( 5300 ) stop @@ -661,18 +661,18 @@ Sub DispatchSlot(SlotID as Integer) oUrl.Complete = "slot:" & CStr(SlotID) oTrans.parsestrict(oUrl) - oDisp = StarDesktop.queryDispatch(oUrl, "_self", 0) + oDisp = StarDesktop.queryDispatch(oUrl, "_self", 0) oDisp.dispatch(oUrl, oArg()) End Sub Sub LoadLibrary( LibName As String ) - + dim args(1) dim arg as new com.sun.star.beans.PropertyValue arg.Name = "LibraryName" arg.Value = LibName args(0) = arg - + dim url as new com.sun.star.util.URL dim trans as object trans = createUnoService("com.sun.star.util.URLTransformer" ) @@ -682,7 +682,7 @@ Sub LoadLibrary( LibName As String ) dim disp as object disp = StarDesktop.currentFrame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub ExecuteSlot( SlotNr As String, oDoc as Object ) @@ -690,14 +690,14 @@ Sub ExecuteSlot( SlotNr As String, oDoc as Object ) dim url as new com.sun.star.util.URL dim trans as object dim disp as object - + trans = createUnoService("com.sun.star.util.URLTransformer" ) url.Complete = "slot:" + SlotNr trans.parsestrict( url ) - + disp = oDoc.CurrentController.Frame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub CutText (oDoc as Object) @@ -713,7 +713,7 @@ Sub DelAllUserFields (aDoc as Object) Dim aElements as Variant Dim i% Dim aFieldMasters, aFieldMaster as Object - Dim sElement$ + Dim sElement$ aFieldMasters = aDoc.TextFieldMasters aElements = aFieldMasters.ElementNames for i = 0 to UBound(aElements) @@ -722,7 +722,7 @@ Sub DelAllUserFields (aDoc as Object) aFieldMaster = aFieldMasters.GetByName(sElement$) aFieldMaster.Dispose endif - next + next end Sub Function GetUserFieldState (sName as String, aDoc as Object) as boolean @@ -761,7 +761,7 @@ Function ReadUserField(sFieldName as String, aDoc as Object) as String ReadUserField = aMasters.GetByName (cUnoUserField+cUnoSeparator+sFieldName).Content else ReadUserField = "" - end If + end If End Function Sub WriteUserField(sValue as String, sFieldName as String, aDoc as Object, optional aCursor as Object) @@ -769,10 +769,10 @@ Sub WriteUserField(sValue as String, sFieldName as String, aDoc as Object, optio aMasters = aDoc.TextFieldMasters if aMasters.HasByName (cUnoUserField+cUnoSeparator+sFieldName) then aUserField = aMasters.GetByName (cUnoUserField+cUnoSeparator+sFieldName) - else + else aUserField = aDoc.CreateInstance (cUnoUserField) aUserField.Name = sFieldName - end if + end if aUserField.Content = sValue End Sub diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketestoo_native/data/Test_10er.xml index 636dc2129120..5563ce1b4894 100644 --- a/smoketestoo_native/data/Test_10er.xml +++ b/smoketestoo_native/data/Test_10er.xml @@ -91,7 +91,7 @@ Sub DeleteAllSavedFiles() sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw or cFltXML) If FileExists (sFileName) then Kill (sFileName) - End If + End If sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter or cFlt50) If FileExists (sFileName) then Kill (sFileName) @@ -119,22 +119,22 @@ Sub DeleteAllLogFiles() End If If FileExists (sWorkPath+sSCLogFileName) then Kill (sWorkPath+sSCLogFileName) - End If + End If If FileExists (sWorkPath+sSDLogFileName) then Kill (sWorkPath+sSDLogFileName) - End If + End If If FileExists (sWorkPath+sSMathLogFileName) then Kill (sWorkPath+sSMathLogFileName) - End If + End If If FileExists (sWorkPath+sSImDLogFileName) then Kill (sWorkPath+sSImDLogFileName) - End If + End If If FileExists (sWorkPath+sSChartLogFileName) then Kill (sWorkPath+sSChartLogFileName) - End If + End If If FileExists (sWorkPath+sSHptLogFileName) then Kill (sWorkPath+sSHptLogFileName) - End If + End If If FileExists (sWorkPath+sSMessageLogFileName) then Kill (sWorkPath+sSMessageLogFileName) End If @@ -156,8 +156,8 @@ Function OpenLogDat (sFileName as String) as Integer Dim LocaleFileChannel% If FileExists (sWorkPath+sFileName) then Kill (sWorkPath+sFileName) - End If - LocaleFileChannel% = Freefile + End If + LocaleFileChannel% = Freefile Open sWorkPath+sFileName For Output As LocaleFileChannel% OpenLogDat = LocaleFileChannel% end Function @@ -201,11 +201,11 @@ DIM nStrPos as Long sWorkPath = GetWorkPath sWorkPathURL = GetWorkURL - + if GetSystem (sWorkPath) = "windows" then sWorkPath = ConvertPathToWin (sWorkPath) end if - + 'search ExtensionURL sDocURL = gOutPutDoc.URL CompatibilityMode(true) @@ -234,7 +234,7 @@ DIM nStrPos as Long end if if bMakeChartTest then call MakeChartTest (frmChart) - end if + end if if bMakeMathTest then call MakeNewDoc (frmMath) end if @@ -247,13 +247,13 @@ DIM nStrPos as Long if bMakeExtensionTest then call Test_Ext.TestExtensions (frmExtension) end if - + Close #MainFileChannel end Sub Sub WriteTestSequence (FileChannel as integer) Print #FileChannel, "Sequence of testing" - + if bMakeWriterTest then WriteTests ("writer : ", true, FileChannel) end if @@ -271,7 +271,7 @@ Sub WriteTestSequence (FileChannel as integer) end if if bMakeChartTest then WriteTests ("chart : ", false, FileChannel) - end if + end if if bMakeMathTest then WriteTests ("math : ", false, FileChannel) end if @@ -284,13 +284,13 @@ Sub WriteTestSequence (FileChannel as integer) if bMakeExtensionTest then WriteExtensionTests ("Extension : ", FileChannel) end if - + Print #FileChannel end Sub Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "new" if bTestAll then @@ -319,33 +319,33 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) sWriteStr = sWriteStr + ", open 5.0" end if end if - + sWriteStr = sWriteStr + ", close" - + Print #nFileChannel, sWriteStr end Sub Sub WriteDBTests (sText as string, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "open / services" sWriteStr = sWriteStr + ", insert" sWriteStr = sWriteStr + ", delete" sWriteStr = sWriteStr + ", seek" sWriteStr = sWriteStr + ", close" - + Print #nFileChannel, sWriteStr end Sub Sub WriteExtensionTests (sText as string, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "services" sWriteStr = sWriteStr + ", install" sWriteStr = sWriteStr + ", uninstall" - + Print #nFileChannel, sWriteStr end Sub @@ -354,7 +354,7 @@ Sub MakeDocTest (FilterType as Integer) Dim sFileNameXML$, sFileName50$, sFileName8$ Dim bError as Boolean Dim nCurrentAction as Integer - + On Local Error GoTo DOCTESTERROR nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) @@ -366,7 +366,7 @@ Sub MakeDocTest (FilterType as Integer) if not IsNull (oDoc) then nCurrentAction = cDocCut call CutAndPaste(FilterType, oDoc) -' bError = oDoc.CurrentController.frame.close +' bError = oDoc.CurrentController.frame.close nCurrentAction = cDocSaveOpen8 if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then sFileName8 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt8) @@ -381,68 +381,68 @@ Sub MakeDocTest (FilterType as Integer) if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then sFileName50 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt50) SaveDoc (sFileName50, oDoc, GetDocFilter(FilterType or cFlt50)) - end if -' oDoc.dispose + end if +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) -' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) -' SetStatus (FilterType, cDocClose, bError) +' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) +' SetStatus (FilterType, cDocClose, bError) nCurrentAction = cDocSaveOpen8 if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then oDoc = LoadDoc (sFileName8) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, MainFileChannel) SetStatus (FilterType, cDocSaveOpen8, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - + nCurrentAction = cDocSaveOpenXML if bMakeSaveOpenXMLTest and IsFilterAvailable (FilterType or cFltXML) then oDoc = LoadDoc (sFileNameXML) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, MainFileChannel) SetStatus (FilterType, cDocSaveOpenXML, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - + nCurrentAction = cDocSaveOpen50 if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then oDoc = LoadDoc (sFileName50) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, MainFileChannel) SetStatus (FilterType, cDocSaveOpen50, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - end If + end If Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DOCTESTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -450,7 +450,7 @@ Sub MakeDocTest (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -462,26 +462,26 @@ Sub MakeNewDoc (FilterType as Integer) nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) nCurrentAction = cDocNew -' oDoc = Documents.Add(GetDocFilter(FilterType)) +' oDoc = Documents.Add(GetDocFilter(FilterType)) oDoc = LoadDoc ("private:factory/" + GetDocFilter(FilterType or cFltNewDoc)) LogState (not IsNull (oDoc), GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) LogState (not IsNull (oDoc), GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, not IsNull (oDoc)) if not IsNull (oDoc) then nCurrentAction = cDocClose -' oDoc.dispose +' oDoc.dispose oDoc.close (true) -' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) -' SetStatus (FilterType, cDocClose, bError) - end If +' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) +' SetStatus (FilterType, cDocClose, bError) + end If Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DOCTESTERROR2: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -489,7 +489,7 @@ Sub MakeNewDoc (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -513,7 +513,7 @@ Sub MakeChartTest (FilterType as Integer) LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, bError) -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) else @@ -524,9 +524,9 @@ Sub MakeChartTest (FilterType as Integer) Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + CHARTTESTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -534,7 +534,7 @@ Sub MakeChartTest (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -543,17 +543,17 @@ Sub LogState (bState as Boolean, sText as String, nLocaleFileChannel as integer) Print #nLocaleFileChannel, sText+" -> ok" else Print #nLocaleFileChannel, sText+" -> error" - end If + end If end Sub Function GetDocEndings (DocType as Integer) as String Select Case ( DocType ) case frmWriter or cFlt8 - GetDocEndings = "odt" ' Textdokument + GetDocEndings = "odt" ' Textdokument case frmCalc or cFlt8 - GetDocEndings = "ods" 'Tabellendokument + GetDocEndings = "ods" 'Tabellendokument case frmImpress or cFlt8 - GetDocEndings = "odp" 'PrÕsentation + GetDocEndings = "odp" 'PrÕsentation case frmDraw or cFlt8 GetDocEndings = "odg" 'Zeichen case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML @@ -567,42 +567,42 @@ Function GetDocEndings (DocType as Integer) as String case frmDraw or cFlt50 GetDocEndings = "sda" 'Zeichen 5.0 case frmWriter or cFltXML - GetDocEndings = "sxw" ' Textdokument + GetDocEndings = "sxw" ' Textdokument case frmCalc or cFltXML - GetDocEndings = "sxc" 'Tabellendokument + GetDocEndings = "sxc" 'Tabellendokument case frmImpress or cFltXML - GetDocEndings = "sxi" 'PrÕsentation + GetDocEndings = "sxi" 'PrÕsentation case frmDraw or cFltXML GetDocEndings = "sxd" 'Zeichen case else GetDocEndings = "" - end Select + end Select end Function Function GetDocFilter (DocType as Integer) as String Select Case ( DocType ) - case frmWriter or cFlt8 - GetDocFilter = "writer8" ' Textdokument + case frmWriter or cFlt8 + GetDocFilter = "writer8" ' Textdokument case frmCalc or cFlt8 - GetDocFilter = "calc8" 'Tabellendokument + GetDocFilter = "calc8" 'Tabellendokument case frmImpress or cFlt8 - GetDocFilter = "impress8" 'Präsentation + GetDocFilter = "impress8" 'Präsentation case frmDraw or cFlt8 GetDocFilter = "draw8" 'Zeichen case frmMath or cFlt8 GetDocFilter = "math8" 'Formel - + case frmWriter or cFltXML - GetDocFilter = "StarOffice XML (Writer)" ' Textdokument + GetDocFilter = "StarOffice XML (Writer)" ' Textdokument case frmCalc or cFltXML - GetDocFilter = "StarOffice XML (Calc)" 'Tabellendokument + GetDocFilter = "StarOffice XML (Calc)" 'Tabellendokument case frmImpress or cFltXML - GetDocFilter = "StarOffice XML (Impress)" 'Präsentation + GetDocFilter = "StarOffice XML (Impress)" 'Präsentation case frmDraw or cFltXML GetDocFilter = "StarOffice XML (Draw)" 'Zeichen case frmMath or cFltXML - GetDocFilter = "StarOffice XML (Math)" 'Formel - + GetDocFilter = "StarOffice XML (Math)" 'Formel + case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML GetDocFilter = "HTML" 'Hypertext-Dokument case frmWriter or cFlt50 @@ -615,69 +615,69 @@ Function GetDocFilter (DocType as Integer) as String GetDocFilter = "StarDraw 5.0" 'Zeichen 5.0 case frmMath or cFlt50 GetDocFilter = "StarMath 5.0" 'Formel 5.0 - + case frmWriter or cFltNewDoc - GetDocFilter = "swriter" ' Textdokument + GetDocFilter = "swriter" ' Textdokument case frmCalc or cFltNewDoc - GetDocFilter = "scalc" 'Tabellendokument + GetDocFilter = "scalc" 'Tabellendokument case frmMessage or cFltNewDoc - GetDocFilter = "Message" 'Nachricht + GetDocFilter = "Message" 'Nachricht case frmImpress or cFltNewDoc - GetDocFilter = "simpress" 'Präsentation + GetDocFilter = "simpress" 'Präsentation case frmDraw or cFltNewDoc GetDocFilter = "sdraw" 'Zeichen case frmMath or cFltNewDoc - GetDocFilter = "smath" 'Formel + GetDocFilter = "smath" 'Formel case frmImage or cFltNewDoc - GetDocFilter = "simage" 'Bild + GetDocFilter = "simage" 'Bild case frmHyperText or cFltNewDoc GetDocFilter = "swriter/web" 'Hypertext-Dokument case frmChart or cFltNewDoc - GetDocFilter = "schart" 'Diagramm + GetDocFilter = "schart" 'Diagramm case else GetDocFilter = "" - end Select + end Select end Function Function GetLogFileName (DocType as Integer) as String Select Case ( DocType ) - case frmWriter - GetLogFileName = sSWLogFileName ' Textdokument + case frmWriter + GetLogFileName = sSWLogFileName ' Textdokument case frmCalc - GetLogFileName = sSCLogFileName 'Tabellendokument + GetLogFileName = sSCLogFileName 'Tabellendokument case frmMessage - GetLogFileName = sSMessageLogFileName 'Nachricht + GetLogFileName = sSMessageLogFileName 'Nachricht case frmImpress - GetLogFileName = sSDLogFileName 'PrÕsentation + GetLogFileName = sSDLogFileName 'PrÕsentation case frmDraw GetLogFileName = sSDrawLogFileName 'Zeichnen case frmMath - GetLogFileName = sSMathLogFileName 'Formel + GetLogFileName = sSMathLogFileName 'Formel case frmImage - GetLogFileName = sSImDLogFileName 'Bild + GetLogFileName = sSImDLogFileName 'Bild case frmHyperText - GetLogFileName = sSHptLogFileName 'Hypertext-Dokument + GetLogFileName = sSHptLogFileName 'Hypertext-Dokument case frmChart - GetLogFileName = sSChartLogFileName 'Diagramm + GetLogFileName = sSChartLogFileName 'Diagramm case frmJava GetLogFileName = sJavaLogFileName 'Java case frmDataBase - GetLogFileName = sSDBLogFileName 'Database + GetLogFileName = sSDBLogFileName 'Database case frmExtension - GetLogFileName = sExtLogFileName 'Extension + GetLogFileName = sExtLogFileName 'Extension case else GetLogFileName = "" - end Select + end Select end Function Function GetErrorMessageOnAction (nAction as Integer) as String Select Case ( nAction ) - case cDocNew - GetErrorMessageOnAction = cMessageNewDoc + case cDocNew + GetErrorMessageOnAction = cMessageNewDoc case cDocCut - GetErrorMessageOnAction = cMessageCutObj + GetErrorMessageOnAction = cMessageCutObj case cDocPaste - GetErrorMessageOnAction = cMessagePasteObj + GetErrorMessageOnAction = cMessagePasteObj case cDocSaveOpen8 GetErrorMessageOnAction = cMessageSaveOpen8Doc case cDocSaveOpenXML @@ -688,7 +688,7 @@ Function GetErrorMessageOnAction (nAction as Integer) as String GetErrorMessageOnAction = cMessageCloseDoc case else GetErrorMessageOnAction = "" - end Select + end Select end Function Function IsFilterAvailable (FilterType as Integer) as boolean @@ -705,10 +705,10 @@ Function TestJava (FilterType as Integer) as boolean LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, FileChannel) LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, not IsNull (oObj)) - + Print #FileChannel, "---" Close #FileChannel% - + TestJava = not IsNull (oObj) End Function @@ -721,17 +721,17 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) Select Case ( DocType ) case frmWriter Dim oCursor as Object - + sText = "AutomaticText" oText = oDoc.GetText oCursor = oText.CreateTextCursor oText.InsertString(oCursor, sText, true) ' Cursor selektiert den Text oView = oDoc.getCurrentController oView.Select(oCursor) - + if bMakeCutTest then call CutText (oDoc) - + if oText.GetString = "" Then bCutState = True else @@ -741,10 +741,10 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) end if - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if oText.GetString = sText Then bPasteState = True else @@ -757,16 +757,16 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) case frmCalc DIM oCell as Object - + sText = "AutomaticText" oCell = oDoc.Sheets(0).GetCellByPosition(0, 0) oCell.String = sText oView = oDoc.getCurrentController oView.Select(oCell) - + if bMakeCutTest then call CutText (oDoc) - + if oCell.String = "" Then bCutState = True else @@ -776,10 +776,10 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) end if - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if oCell.String = sText Then bPasteState = True else @@ -796,7 +796,7 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) Dim xSize as Object Dim xPoint as Object Dim bObjState as Boolean - + xSize = CreateUnoStruct ("com.sun.star.awt.Size") xPoint = CreateUnoStruct ("com.sun.star.awt.Point") xSize.Width = 2000 @@ -804,29 +804,29 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) xPoint.x = 10000 xPoint.y = 10000 oPage = oDoc.DrawPages(0) - + if DocType = frmImpress Then oPage.Layout = 20 ' set page layot to none end If - + oRect = oDoc.CreateInstance("com.sun.star.drawing.RectangleShape") oRect.Size = xSize oRect.Position = xPoint oPage.add(oRect) - + oView = oDoc.getCurrentController oView.Select(oRect) - + ' Prüft ob überhaupt ein Object angelegt wurde if oPage.count = 1 Then bObjState = True else bObjState = False end If - - if bMakeCutTest then + + if bMakeCutTest then call CutText (oDoc) - + if (oPage.count = 0) and bObjState Then bCutState = True else @@ -835,13 +835,13 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) SetStatus (DocType, cDocCut, bCutState) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) - end if + end if wait (1000) 'wait after cut - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if (oPage.count = 1) and bObjState Then bPasteState = True else @@ -855,17 +855,17 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) case frmImage case frmHyperText case frmChart - end Select + end Select end Sub Sub LoadLibrary( LibName as String ) - + dim args(1) dim arg as new com.sun.star.beans.PropertyValue arg.Name = "LibraryName" arg.Value = LibName args(0) = arg - + dim url as new com.sun.star.util.URL dim trans as object trans = createUnoService("com.sun.star.util.URLTransformer" ) @@ -875,7 +875,7 @@ Sub LoadLibrary( LibName as String ) dim disp as object disp = StarDesktop.currentFrame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub LoadDoc (DocName as String) as Object @@ -886,7 +886,7 @@ Sub LoadDoc (DocName as String) as Object if Left(DocName, 5 ) <> "file:" then trans.parsestrict( url ) endif - + Dim aPropArray(0) as Object aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue") aPropArray(0).Name = "OpenFlags" @@ -894,7 +894,7 @@ Sub LoadDoc (DocName as String) as Object dim doc as object dim noargs() - doc = StarDesktop.loadComponentFromURL( url.Complete, "_blank", 0, aPropArray() ) ' XModel + doc = StarDesktop.loadComponentFromURL( url.Complete, "_blank", 0, aPropArray() ) ' XModel LoadDoc = doc End Sub @@ -906,16 +906,16 @@ Sub SaveDoc (DocName as String, oDoc as Object, sFilterName as string ) if Left(DocName, 5 ) <> "file:" then trans.parsestrict( url ) endif - + if not (sFilterName = "") then Dim aPropArray(0) as Object aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue") aPropArray(0).Name = "FilterName" aPropArray(0).Value = sFilterName - + oDoc.storeAsURL( url.Complete, aPropArray() ) else MessageBox "Filtername is unknown!" - end if + end if end Sub </script:module> diff --git a/smoketestoo_native/data/Test_DB.xml b/smoketestoo_native/data/Test_DB.xml index ebb53cf0181c..37fdc0948955 100644 --- a/smoketestoo_native/data/Test_DB.xml +++ b/smoketestoo_native/data/Test_DB.xml @@ -45,23 +45,23 @@ Const sTestString = "Automatical Test" On Local Error GoTo DBERROR - + nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) nCurrentAction = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoDatabaseContext - + oDBContext = CreateUnoService(cUnoDatabaseContext) sDBName="Bibliography" 'Names of Databases - + nCurrentAction = cDBOpen sCurrentMessage = cMessageDatabaseOpen - + oDataSource = oDBContext.GetByName(sDBName) sTable=oDataSource.Tables.ElementNames(0) oDBConnection = oDBContext.GetByName(sDBName).GetConnection("","") - + LogState (not IsNull (oDBConnection), "Database "+ cMessageDatabaseOpen, FileChannel) LogState (not IsNull (oDBConnection), "Database "+ cMessageDatabaseOpen, MainFileChannel) SetStatus (FilterType, cDBOpen, not IsNull (oDBConnection)) @@ -69,9 +69,9 @@ Const sTestString = "Automatical Test" Close #FileChannel% Exit Sub End If - + ' Database is open now - + nCurrentAction = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoRowSet oRowSet = createUnoService(cUnoRowSet) @@ -86,10 +86,10 @@ Const sTestString = "Automatical Test" LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService, MainFileChannel) SetStatus (FilterType, cDBService, not IsNull (oRowSet)) End If - + nCurrentAction = cDBInsert sCurrentMessage = cMessageDatabaseInsert - + oRowSet.ActiveConnection = oDBConnection oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND @@ -101,16 +101,16 @@ Const sTestString = "Automatical Test" oRowSet.insertRow() nRowCount=oRowSet.RowCount - + oRowSet.moveToCurrentRow() - + bResult = (oRowSet.getString(5) = sTestString) LogState (bResult, "Database "+ cMessageDatabaseInsert, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseInsert, MainFileChannel) SetStatus (FilterType, cDBInsert, bResult) - + 'delete only if insert passed - + if (bResult) Then nCurrentAction = cDBDelete sCurrentMessage = cMessageDatabaseDelete @@ -123,10 +123,10 @@ Const sTestString = "Automatical Test" LogState (bResult, "Database "+ cMessageDatabaseDelete, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseDelete, MainFileChannel) SetStatus (FilterType, cDBDelete, bResult) - End If + End If ' read other record - + nCurrentAction = cDBSeek sCurrentMessage = cMessageDatabaseSeek oRowSet.first() @@ -134,7 +134,7 @@ Const sTestString = "Automatical Test" LogState (bResult, "Database "+ cMessageDatabaseSeek, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseSeek, MainFileChannel) SetStatus (FilterType, cDBSeek, bResult) - + nCurrentAction = cDBClose sCurrentMessage = cMessageDatabaseClose oDBConnection.Dispose() @@ -145,9 +145,9 @@ Const sTestString = "Automatical Test" Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DBERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDBOpen, False) Exit Sub else @@ -155,7 +155,7 @@ Const sTestString = "Automatical Test" LogState (False, "Database "+ sCurrentMessage, MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub </script:module> diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketestoo_native/data/Test_Ext.xml index 31d27dc7a4a7..9235b9600af9 100644 --- a/smoketestoo_native/data/Test_Ext.xml +++ b/smoketestoo_native/data/Test_Ext.xml @@ -41,15 +41,15 @@ Dim sImplementationNameString as String sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension" On Local Error GoTo EXTERROR - + nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - + sCurrentMessage = cMessageExtensionService nCurrentAction = cEXTService - 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for - 'adding the extension. The implementation is in + 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for + 'adding the extension. The implementation is in 'javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment) @@ -68,14 +68,14 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q sCurrentMessage = cMessageExtensionInstall nCurrentAction = cEXTInstall - + 'Add the extension. We must provide a file URL here. 'By passing "user" we determine that the actions we perform on 'XExtensionManager only affect the user installation. To modify the share installation one would pass "share". Dim props() as Object ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, "user", obj_null, cmdEnv) - + 'Check if the extension has been added by creating a service which is contained in the extension. oTestExtension = createUnoService(cUnoSmoketestTestExtension) bResult = (oTestExtension.getImplementationName = sImplementationNameString) @@ -89,7 +89,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q sCurrentMessage = cMessageExtensionUninstall nCurrentAction = cEXTUninstall - + 'Remove the package ext_mgr.removeExtension("org.openoffice.legacy." + cExtensionFileName, cExtensionFileName, "user",obj_null, cmdEnv) @@ -100,13 +100,13 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, FileChannel) LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, MainFileChannel) SetStatus (FilterType, cEXTUninstall, IsNull (oTestExtension)) - + Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error EXTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cEXTService, False) Exit Sub else @@ -114,7 +114,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q LogState (False, "Extension "+ sCurrentMessage, MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml index 4428a95f551b..59791c0509d2 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml @@ -7,9 +7,9 @@ <import file="nbproject/build-uno-impl.xml"/> <!-- - There exist several targets which are by default empty and which can be - used for execution of your tasks. These targets are usually executed - before and after some main targets. They are: + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: -pre-init: called before initialization of project properties -post-init: called after initialization of project properties @@ -37,12 +37,12 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. + For list of available properties check the imported + nbproject/build-impl.xml file. Another way to customize the build is by overriding existing main targets. - The targets of interest are: + The targets of interest are: -init-macrodef-javac: defines macro for javac compilation -init-macrodef-junit: defines macro for junit execution @@ -50,7 +50,7 @@ -init-macrodef-java: defines macro for class execution -do-jar-with-manifest: JAR building (if you are using a manifest) -do-jar-without-manifest: JAR building (if you are not using a manifest) - run: execution of project + run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation @@ -62,10 +62,10 @@ </exec> </target> - Notice that the overridden target depends on the jar target and not only on - the compile target as the regular run target does. Again, for a list of available + Notice that the overridden target depends on the jar target and not only on + the compile target as the regular run target does. Again, for a list of available properties which you can use, check the target you are overriding in the - nbproject/build-impl.xml file. + nbproject/build-impl.xml file. --> diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml index f01ad79df06e..5a2c591b6ad1 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml @@ -28,9 +28,9 @@ is divided into following sections: </condition> </fail> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> - <!-- + <!-- ====================== - INITIALIZATION SECTION + INITIALIZATION SECTION ====================== --> <target name="-pre-init"> diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml index 25b3f25f86c7..3e75cd5f5f47 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml @@ -13,18 +13,18 @@ <target name="-uno-project-init" depends="-do-init"> <property file="nbproject/project-uno.properties"/> <property name="build.uno.version" value="2.0.6"/> - + <!-- set variablers from SDK and Office --> <echo message="setting up UNO environment ..."/> <property name="office.unopkg" value="${office.program.dir}${file.separator}unopkg"/> <property name="office.soffice" value="${office.program.dir}${file.separator}soffice"/> - - <property name="sdk.idl.dir" location="${oo.sdk.dir}${file.separator}idl"/> + + <property name="sdk.idl.dir" location="${oo.sdk.dir}${file.separator}idl"/> <property name="sdk.idlc" value="${sdk.bin.dir}${file.separator}idlc"/> <property name="sdk.regmerge" value="${ure.bin.dir}${file.separator}regmerge"/> <property name="sdk.javamaker" value="${sdk.bin.dir}${file.separator}javamaker"/> - <dirname property="project.dir" file="build.xml"/> + <dirname property="project.dir" file="build.xml"/> <property name="uno.package.name" value="${project.dir}${file.separator}${dist.dir}${file.separator}${project.name}.oxt"/> <property name="src.dir.absolute" value="${project.dir}${file.separator}${src.dir}"/> @@ -34,10 +34,10 @@ <property name="idl.out.rdb" value="${idl.out}/rdb"/> <property name="idl.rdb.name" value="types.rdb"/> <property name="idl.rdb.fullpath" value="${idl.out.rdb}/${idl.rdb.name}"/> - + <property name="images.base.dir" value="${build.dir}/img"/> <property name="build.registry.dir" value="${build.dir}/cpreg"/> - + <mkdir dir="${idl.out}"/> <mkdir dir="${idl.out.urd}"/> <mkdir dir="${idl.out.rdb}"/> @@ -53,50 +53,50 @@ <!-- handle images --> <target name="-uno-images-condition" description="check images" depends="-uno-project-init"> <available file="${images.dir}" type="dir" property="images.required"/> - </target> - + </target> + <target name="images" description="copy images" depends="-uno-images-condition" if="images.required"> <mkdir dir="${images.base.dir}/${images.dir}"/> <copy todir="${images.base.dir}/${images.dir}"> <fileset dir="${images.dir}"/> </copy> - </target> - + </target> + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> <!-- handle xcu/xcs files with package names --> - + <target name="-uno-registryfiles-condition" description="check xcu and xcs files" depends="-uno-project-init"> <available file="${registry.dir}" type="dir" property="xcuxcs.required"/> - </target> - + </target> + <target name="registry" description="copy registry files" depends="-uno-registryfiles-condition" if="xcuxcs.required"> <mkdir dir="${build.registry.dir}/${registry.dir}"/> <copy todir="${build.registry.dir}/${registry.dir}"> <fileset dir="${registry.dir}" includes="**/*.xcu,**/*.xcs"/> </copy> - </target> - + </target> + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + <target name="-uno-idl-idlc-condition" description="check idlc dependencies" depends="-uno-project-init"> <uptodate property="idlc.notRequired" targetfile ="${build.dir}/idlc.compile"> <srcfiles dir= "${src.dir}" includes="**/*.idl"/> </uptodate> - </target> - + </target> + <!-- compile UNO idl files: execution --> <target name="-uno-idl-idlc" description="Compile the IDL Conditionally" depends="-uno-idl-idlc-condition" unless="idlc.notRequired"> <apply executable="${sdk.idlc}" dir="${office.program.dir}" failonerror="true"> <env key="PATH" path="${office.tool.path}"/> - <env key="LD_LIBRARY_PATH" path="${office.tool.path}"/> + <env key="LD_LIBRARY_PATH" path="${office.tool.path}"/> <env key="DYLD_LIBRARY_PATH" path="${office.tool.path}"/> <arg value="-C"/> <arg value="-O"/> <arg value="${idl.out.urd}"/> <arg value="-I"/> <arg value="${src.dir.absolute}"/> - <arg value="-I"/> - <arg value="${sdk.idl.dir}"/> + <arg value="-I"/> + <arg value="${sdk.idl.dir}"/> <fileset dir="${src.dir}" includes="**/*.idl" casesensitive="yes" id="idl.list.id"/> </apply> <!-- list for copying idl files in own jar --> @@ -113,11 +113,11 @@ <!-- merge urd files: execution --> <target name="-uno-idl-regmerge" description="Merge urd Files Conditionally" depends="-uno-idl-idlc,-uno-idl-idlc-condition" unless="idlc.notRequired"> <!-- to only extract the new files, delete the old rdb --> - <delete file="${idl.rdb.fullpath}"/> + <delete file="${idl.rdb.fullpath}"/> <apply executable="${sdk.regmerge}" dir="${office.program.dir}" failonerror="true"> <env key="PATH" path="${office.tool.path}"/> <env key="LD_LIBRARY_PATH" path="${office.tool.path}"/> - <env key="DYLD_LIBRARY_PATH" path="${office.tool.path}"/> + <env key="DYLD_LIBRARY_PATH" path="${office.tool.path}"/> <arg file="${idl.rdb.fullpath}"/> <arg value="/UCR"/> <fileset dir="${idl.out.urd}" includes="**/*.urd" casesensitive="yes"/> @@ -130,14 +130,14 @@ <target name="-uno-idl-javamaker-condition" description="check if rdb was created" depends="-uno-idl-regmerge,-uno-idl-idlc-condition"> <available file="${idl.rdb.name}" filepath="${idl.out.rdb}" property="javamaker.Required"/> </target> - + <!-- generate Java class files from type library: execution --> <target name="-uno-idl-javamaker" depends="-uno-idl-regmerge,-uno-idl-idlc-condition,-uno-idl-javamaker-condition" if="javamaker.Required" unless="idlc.notRequired"> <echo message="generating java class files from rdb..."/> <exec executable="${sdk.javamaker}" dir="${office.program.dir}" failonerror="true"> - <env key="PATH" path="${office.tool.path}"/> + <env key="PATH" path="${office.tool.path}"/> <env key="LD_LIBRARY_PATH" path="${office.tool.path}"/> - <env key="DYLD_LIBRARY_PATH" path="${office.tool.path}"/> + <env key="DYLD_LIBRARY_PATH" path="${office.tool.path}"/> <arg value="-BUCR"/> <arg value="-O"/> <arg value="${idl.classes.dir}"/> @@ -153,11 +153,11 @@ <touch file="${build.dir}/idlc.compile"/> <echo message="build UNO idl files finished"/> </target> - + <!-- the main target, called in recursive builds --> <target name="uno-idl-compile" description="Compiles UNO idl files" depends="-uno-idl-result"/> - <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> <target name="jar" depends="-uno-project-init,uno-idl-compile,-jar-idl-types,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-openoffice-manifest,-post-jar"> <jar basedir="${build.classes.dir}" compress="true" filesonly="true" manifest="${build.dir}/MANIFEST.MF" jarfile="${dist.jar}" excludes="**/*.xml,**/*.txt,${idl.file.list},${build.classes.excludes}"/> @@ -173,7 +173,7 @@ </target> <target name="-do-openoffice-manifest" depends="-copy-user-manifest,-external-jars,-do-registration,-do-class-path"/> - + <!-- macro for checking manifest entries from a user manifest --> <macrodef name="check-manifest-entry"> <attribute name="entry.name"/> @@ -182,7 +182,7 @@ <condition property="@{condition.property.name}"> <and> <!-- if file does not exist, "isfileselected" is not executed --> - <!-- necessary construct because available is not allowed here + <!-- necessary construct because available is not allowed here but should be according to documentation --> <istrue value="${build.manifest.exists}"/> <!-- produces an error if file is not there --> @@ -193,28 +193,28 @@ </condition> </sequential> </macrodef> - + <!-- enter the class path with external jars, if external jars exit and the user did not enter his own --> <target name="-do-class-path" depends="-external-jars,-check-class-path" unless="class.path.exists"> <manifest file="${build.dir}/MANIFEST.MF" mode="update"> - <attribute name="Class-Path" value="${external.jars}"/> - </manifest> + <attribute name="Class-Path" value="${external.jars}"/> + </manifest> </target> <target name="-check-class-path"> <check-manifest-entry condition.property.name="class.path.exists" entry.name="Class-Path"/> </target> - + <!-- enter idl type definitions if it exists and if the user did not overwrite it --> <target name="-do-uno-types" depends="-do-empty-unopath,-do-idl-unopath"/> <target name="-do-idl-unopath" depends="-check-uno-types" if="own.idl.files" unless="uno.path.exists"> <manifest file="${build.dir}/MANIFEST.MF" mode="update"> - <attribute name="UNO-Type-Path" value="${idl_types.jar}"/> - </manifest> + <attribute name="UNO-Type-Path" value="${idl_types.jar}"/> + </manifest> </target> <target name="-do-empty-unopath" depends="-check-uno-types" if="no.idl.files" unless="uno.path.exists"> <manifest file="${build.dir}/MANIFEST.MF" mode="update"> - <attribute name="UNO-Type-Path" value=""/> - </manifest> + <attribute name="UNO-Type-Path" value=""/> + </manifest> </target> <target name="-check-uno-types"> <property file="${idl.out}/idl_list.properties"/> @@ -228,12 +228,12 @@ </not> </condition> </target> - + <!-- enter the registration classes unless the user did not enter his own. Do nothing when the project is old --> - <target name="-do-registration" depends="-do-central-registration,-check-registration-classes-name" + <target name="-do-registration" depends="-do-central-registration,-check-registration-classes-name" if="new.project.registration" unless="do.no.registration"> <manifest file="${build.dir}/MANIFEST.MF" mode="update"> - <section name="${slash.registration.class}"> + <section name="${slash.registration.class}"> <attribute name="RegistrationClasses" value="${registration.classname}"/> </section> </manifest> @@ -247,7 +247,7 @@ </or> </condition> </target> - + <!-- enter the registration class name unless the user did not enter his own. Do nothing when the project is old --> <target name="-do-central-registration" depends="-check-registration-class-name,-do-old-project-registration" if="new.project.registration" unless="registration.class.exists"> <property name="regclass.properties" value="${build.dir}/regclass.properties"/> @@ -264,7 +264,7 @@ <target name="-check-registration-class-name"> <check-manifest-entry condition.property.name="registration.class.exists" entry.name="RegistrationClassName"/> </target> - + <!-- Do the registration for older projects without a central registration class --> <target name="-do-old-project-registration" depends="-check-for-old-project" if="old.project.registration" unless="registration.class.exists"> <manifest file="${build.dir}/MANIFEST.MF" mode="update"> @@ -294,7 +294,7 @@ <isfalse value="${old.project.registration}"/> </condition> </target> - + <!-- copy the user manifest if it exists --> <target name="-copy-user-manifest" depends="-check-user-manifest" if="user.manifest.exists"> <copy file="manifest.mf" tofile="${build.dir}/MANIFEST.MF" overwrite="true"/> @@ -303,10 +303,10 @@ <target name="-check-user-manifest"> <available file="manifest.mf" property="user.manifest.exists"/> </target> - + <!-- handle the class path for external jar files unless there is a user overwrite --> <target name="-external-jars" depends="-rm-external-jars,-add-external-jars"/> - + <target name="-add-external-jars" depends="-external-jars-condition" if="do.externalJars"> <!-- get property external.jars for classpath from props file --> <property file="${dist.dir}/${external.jar.dir}/jars.properties"/> @@ -316,17 +316,17 @@ <!-- empty property, if no jars --> <property name="external.jars" value=""/> </target> - + <target name="-external-jars-condition"> <available file="${dist.dir}/${external.jar.dir}" type="dir" property="do.externalJars"/> </target> - + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + <target name="-delete-uno-package"> <delete failonerror="false" file="${uno.package.name}"/> </target> - + <target name="-pre-uno-package"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -335,7 +335,7 @@ <target name="-license-exists"> <available file="${project.dir}/${licenses.dir}" type="dir" property="do.license"/> </target> - + <!-- test for licenses dir is necessary because zipfileset fails if dir not there --> <target name="-uno-package-with-license" depends="-license-exists" if="do.license"> <zip update="true" destfile="${uno.package.name}"> @@ -346,7 +346,7 @@ <target name="-description-exists"> <available file="${project.dir}/${description.dir}" type="dir" property="do.description"/> </target> - + <!-- test for description dir is necessary because zipfileset fails if dir not there --> <target name="-uno-package-with-description" depends="-description-exists" if="do.description"> <zip update="true" destfile="${uno.package.name}"> @@ -357,25 +357,25 @@ <target name="-help-exists"> <available file="${project.dir}/${help.dir}" type="dir" property="do.help"/> </target> - + <!-- test for help dir is necessary because zipfileset fails if dir not there --> <target name="-uno-package-with-help" depends="-help-exists" if="do.help"> <zip update="true" destfile="${uno.package.name}"> <zipfileset dir="${help.dir}" includes="${help.content.extensions}" prefix="${help.dir}"/> </zip> - </target> - + </target> + <target name="-dialogs-exists"> <available file="${project.dir}/${dialogs.dir}" type="dir" property="do.dialogs"/> </target> - + <!-- test for dialogs dir is necessary because zipfileset fails if dir not there --> <target name="-uno-package-with-dialogs" depends="-dialogs-exists" if="do.dialogs"> <zip update="true" destfile="${uno.package.name}"> <zipfileset dir="${dialogs.dir}" includes="${dialog.content.extensions}" prefix="dialogs"/> </zip> - </target> - + </target> + <target name="-do-uno-package" description="Creates UNO extension pacakge" depends="-uno-package-with-license,-uno-package-with-help,-uno-package-with-dialogs,-uno-package-with-description"> <echo message="creating UNO extension package ..."/> <zip update="true" destfile="${uno.package.name}"> @@ -388,7 +388,7 @@ <zipfileset dir="${src.dir}" includes="uno-extension-manifest.xml" fullpath="META-INF/manifest.xml"/> </zip> </target> - + <target name="-post-uno-package"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -396,19 +396,19 @@ <target name="uno-package" description="Creates UNO extension pacakge" depends="jar,images,registry,-delete-uno-package,-pre-uno-package,-do-uno-package,-post-uno-package"/> - <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> + <!-- <target name="uno-deploy" description="Deploys UNO extension package" depends="uno-package"> <echo message="deploying UNO extension package ..."/> <echo message="${office.unopkg} gui -f ${uno.package.name}"/> <echo message="${office.soffice} ${uno.package.name}"/> <exec executable="${office.soffice}" dir="${office.program.dir}" failonerror="true"> <arg file="${uno.package.name}"/> - </exec> + </exec> </target> --> - - <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> + <target name="uno-run" description="Run OpenOffice.org" depends="uno-package,-run-oo"/> <!-- subtargets for different office versions --> @@ -424,9 +424,9 @@ <arg value="${office.startup.options}"/> </exec> </target> - - <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + + <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> + <target name="uno-debug" description="Debugss UNO extension package in Target Office" depends="uno-package,-oo-debug"/> <target name="-oo-debug"> @@ -458,5 +458,5 @@ <env key="JAVA_TOOL_OPTIONS" value=""-Xdebug" "-Xrunjdwp:transport=dt_socket,address=${jpda.address}""/> </exec> </target> - + </project> diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java index 599850e00ef1..fe4ee300d29d 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java @@ -48,14 +48,14 @@ import java.util.logging.Logger; */ public class ToolPanelUIElement extends ComponentBase implements XUIElement { - + protected final XFrame m_docFrame; protected final XWindow m_parentWindow; private XWindow m_panelRootWindow = null; private Object m_toolPanel = null; XComponentContext context = null; - - + + protected ToolPanelUIElement( XComponentContext _context, final XFrame i_docFrame, final XWindow i_parentWindow ) { context = _context; @@ -102,7 +102,7 @@ public class ToolPanelUIElement extends ComponentBase implements XUIElement { return "TaskPaneComponentUI"; } - + // ComponentBase overridables protected void postDisposing() @@ -115,7 +115,7 @@ public class ToolPanelUIElement extends ComponentBase implements XUIElement XComponent panelWindowComp = UnoRuntime.queryInterface( XComponent.class, m_panelRootWindow ); panelWindowComp.dispose(); m_panelRootWindow = null; - + } m_toolPanel = null; } @@ -142,7 +142,7 @@ public class ToolPanelUIElement extends ComponentBase implements XUIElement UnoRuntime.queryInterface( XWindowPeer.class, m_parentWindow ), null ); - + } catch ( final Exception e ) { diff --git a/testautomation/global/input/java/Clock.java b/testautomation/global/input/java/Clock.java index d99baaf603a7..50348de629fa 100755 --- a/testautomation/global/input/java/Clock.java +++ b/testautomation/global/input/java/Clock.java @@ -1,21 +1,21 @@ /* * Copyright (c) 2004 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * -Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * -Redistribution in binary form must reproduct the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the distribution. - * + * * Neither the name of Sun Microsystems, Inc. or the names of contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * This software is provided "AS IS," without a warranty of any kind. ALL * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE @@ -27,14 +27,14 @@ * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN * IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that Software is not designed, licensed or intended for * use in the design, construction, operation or maintenance of any nuclear * facility. */ /* - * @(#)Clock.java 1.13 03/12/19 + * @(#)Clock.java 1.13 03/12/19 */ import java.util.*; @@ -51,7 +51,7 @@ import java.text.*; public class Clock extends Applet implements Runnable { private volatile Thread timer; // The thread that displays clock private int lastxs, lastys, lastxm, - lastym, lastxh, lastyh; // Dimensions used to draw hands + lastym, lastxh, lastyh; // Dimensions used to draw hands private SimpleDateFormat formatter; // Formats the date displayed private String lastdate; // String to hold date displayed private Font clockFaceFont; // Font for number display on clock @@ -63,7 +63,7 @@ public class Clock extends Applet implements Runnable { public void init() { int x,y; lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0; - formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss yyyy", + formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss yyyy", Locale.getDefault()); currentDate = new Date(); lastdate = formatter.format(currentDate); @@ -99,7 +99,7 @@ public class Clock extends Applet implements Runnable { String today; currentDate = new Date(); - + formatter.applyPattern("s"); try { s = Integer.parseInt(formatter.format(currentDate)); @@ -111,14 +111,14 @@ public class Clock extends Applet implements Runnable { m = Integer.parseInt(formatter.format(currentDate)); } catch (NumberFormatException n) { m = 10; - } + } formatter.applyPattern("h"); try { h = Integer.parseInt(formatter.format(currentDate)); } catch (NumberFormatException n) { h = 10; } - + // Set position of the ends of the hands xs = (int) (Math.cos(s * Math.PI / 30 - Math.PI / 2) * 45 + xcenter); ys = (int) (Math.sin(s * Math.PI / 30 - Math.PI / 2) * 45 + ycenter); @@ -128,7 +128,7 @@ public class Clock extends Applet implements Runnable { + xcenter); yh = (int) (Math.sin((h*30 + m / 2) * Math.PI / 180 - Math.PI / 2) * 30 + ycenter); - + // Get the date to print at the bottom formatter.applyPattern("EEE MMM dd HH:mm:ss yyyy"); today = formatter.format(currentDate); @@ -142,16 +142,16 @@ public class Clock extends Applet implements Runnable { } if (xm != lastxm || ym != lastym) { g.drawLine(xcenter, ycenter-1, lastxm, lastym); - g.drawLine(xcenter-1, ycenter, lastxm, lastym); + g.drawLine(xcenter-1, ycenter, lastxm, lastym); } if (xh != lastxh || yh != lastyh) { g.drawLine(xcenter, ycenter-1, lastxh, lastyh); - g.drawLine(xcenter-1, ycenter, lastxh, lastyh); + g.drawLine(xcenter-1, ycenter, lastxh, lastyh); } // Draw date and hands g.setColor(numberColor); - g.drawString(today, 5, 125); + g.drawString(today, 5, 125); g.drawLine(xcenter, ycenter, xs, ys); g.setColor(handColor); g.drawLine(xcenter, ycenter-1, xm, ym); @@ -171,20 +171,20 @@ public class Clock extends Applet implements Runnable { g.setColor(handColor); g.drawArc(xcenter-50, ycenter-50, 100, 100, 0, 360); g.setColor(numberColor); - g.drawString("9", xcenter-45, ycenter+3); + g.drawString("9", xcenter-45, ycenter+3); g.drawString("3", xcenter+40, ycenter+3); g.drawString("12", xcenter-5, ycenter-37); g.drawString("6", xcenter-3, ycenter+45); // Draw date and hands g.setColor(numberColor); - g.drawString(lastdate, 5, 125); + g.drawString(lastdate, 5, 125); g.drawLine(xcenter, ycenter, lastxs, lastys); g.setColor(handColor); g.drawLine(xcenter, ycenter-1, lastxm, lastym); g.drawLine(xcenter-1, ycenter, lastxm, lastym); g.drawLine(xcenter, ycenter-1, lastxh, lastyh); - g.drawLine(xcenter-1, ycenter, lastxh, lastyh); + g.drawLine(xcenter-1, ycenter, lastxh, lastyh); } public void start() { @@ -212,14 +212,14 @@ public class Clock extends Applet implements Runnable { + "Author: Rachel Gollub, 1995 \n" + "An analog clock."; } - + public String[][] getParameterInfo() { String[][] info = { - {"bgcolor", "hexadecimal RGB number", + {"bgcolor", "hexadecimal RGB number", "The background color. Default is the color of your browser."}, - {"fgcolor1", "hexadecimal RGB number", + {"fgcolor1", "hexadecimal RGB number", "The color of the hands and dial. Default is blue."}, - {"fgcolor2", "hexadecimal RGB number", + {"fgcolor2", "hexadecimal RGB number", "The color of the second hand and numbers. Default is dark gray."} }; return info; diff --git a/testautomation/tools/analyze/make_summary.pl b/testautomation/tools/analyze/make_summary.pl index f3509f72fbb8..328bfa10948f 100755 --- a/testautomation/tools/analyze/make_summary.pl +++ b/testautomation/tools/analyze/make_summary.pl @@ -3,7 +3,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ # #************************************************************************* # -# short description : +# short description : # This Perl sciprt summarizes the number of errors and warnings in # the set of *.res files of qatesttool. #************************************************************************* @@ -43,7 +43,7 @@ sub usage { $0 file... Description: - This Perl sciprt summarizes the number of errors and warnings + This Perl sciprt summarizes the number of errors and warnings reported in a set of the *.res files produced by qatesttool. Examples: diff --git a/testautomation/tools/analyze/translate_res_file.pl b/testautomation/tools/analyze/translate_res_file.pl index a69908cad1ec..f8a100cc534a 100755 --- a/testautomation/tools/analyze/translate_res_file.pl +++ b/testautomation/tools/analyze/translate_res_file.pl @@ -3,7 +3,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,8 +27,8 @@ # #************************************************************************* # -# short description : -# This Perl sciprt translates *.res files of qatesttool into human +# short description : +# This Perl sciprt translates *.res files of qatesttool into human # readable format #************************************************************************* @@ -49,7 +49,7 @@ sub usage { --with-color outputs colored translated messages using ANSI color sequence code Description: - This Perl sciprt translates *.res files produced by qatesttool + This Perl sciprt translates *.res files produced by qatesttool into human readable text file format. Examples: @@ -92,7 +92,7 @@ $BaseDir = undef; sub substitution { my ($file, $lineno, $line) = @_; - my ($id, $arg1, $arg2, $arg3) = + my ($id, $arg1, $arg2, $arg3) = ($line =~ m/\%ResId=([0-9]+)\% (?:\%Arg1=(.+?)\%)? (?:\%Arg2=(.+?)\%)? @@ -205,7 +205,7 @@ sub load_app_srs { $x = $1; $fallback = $text if ($x eq "en-US"); $text = $2 if ($x eq $lang); - } + } } close FH; } diff --git a/testautomation/tools/hid/hid.pl b/testautomation/tools/hid/hid.pl index 3a36b02cb31e..b512edaa44bd 100755 --- a/testautomation/tools/hid/hid.pl +++ b/testautomation/tools/hid/hid.pl @@ -1,6 +1,6 @@ #************************************************************************** # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ for (@ary) { @ary = @ary[ sort{ # sort @longnum[$a] <=> @longnum[$b] || - @longname[$a] cmp @longname[$b] + @longname[$a] cmp @longname[$b] }0..$#ary ]; @@ -82,7 +82,7 @@ for (@ary) { @ary = grep( !/^ *$/, @ary); -# to insert the constant entries at the beginning, read it and write it out +# to insert the constant entries at the beginning, read it and write it out open (CON,"<".@ARGV[2]) || die "Can't find constant entries-file: const.txt (third argument)"; @const=( <CON> ); close CON; diff --git a/testautomation/tools/run_tests/run_tests.sh b/testautomation/tools/run_tests/run_tests.sh index 0c4dc85bcc1f..e8aa4d700e1a 100755 --- a/testautomation/tools/run_tests/run_tests.sh +++ b/testautomation/tools/run_tests/run_tests.sh @@ -2,7 +2,7 @@ #************************************************************************* #* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ # # Owner : andreschnabel@openoffice.org # -# short description : run several testscripts on unix +# short description : run several testscripts on unix # list of scripts to run is read from stdin # this script has been derived from former ooo_releasetests.sh # @@ -54,7 +54,7 @@ function GetValueFromSection () { $AWK -v sVarName="$1" -v sSectionName="$2" \ 'BEGIN { bInSection = 0} - { if ( index ($0 ,"[" sSectionName "]") > 0 ) + { if ( index ($0 ,"[" sSectionName "]") > 0 ) bInSection = 1 else if ( (bInSection == 1) && (substr ($0,1,1) == "[") ) bInSection = 0 @@ -62,9 +62,9 @@ function GetValueFromSection () sub(/\r$/,"") print substr ($0,index ($0 ,"=") + 1) } - }' < "$3" + }' < "$3" } - + #------------------------------------------------------------------------ #--- the main script starts here --- #------------------------------------------------------------------------ @@ -89,11 +89,11 @@ case `uname -s` in esac # if sLocation is not set manuall try to get the location form testtoolrc -if [ -z "$sLocation" ] +if [ -z "$sLocation" ] then # first read the profile sProfile=`GetValueFromSection CurrentProfile Misc "$testtoolrc"` - # then read the BaseDir for the profile + # then read the BaseDir for the profile sLocation=`GetValueFromSection BaseDir "$sProfile" "$testtoolrc"` sLocation="$sLocation/" fi @@ -147,10 +147,10 @@ while read x ; do echo "Running soffices' processes: " # kill office, if exists - `$KILLOFFICEALL` - + `$KILLOFFICEALL` + echo "****************************************************" - x=`echo "$x"|sed s/[[:blank:]]*$//` #cut all trailing blanks + x=`echo "$x"|sed s/[[:blank:]]*$//` #cut all trailing blanks sTest="$sLocation$x" if [ -f "$sTest" ]; then @@ -173,7 +173,7 @@ do fi ######### wait until Testtool has finished & closed - while [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; + while [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; do sleep 5 i=$((i+5)) @@ -189,7 +189,7 @@ do fi done -echo "Duration:" $((i/60)) "min" $((i%60)) "sec " +echo "Duration:" $((i/60)) "min" $((i%60)) "sec " echo "****************************************************" echo "************ FINISHED ************" diff --git a/testautomation/xml/optional/input/docbook/note.001.xml b/testautomation/xml/optional/input/docbook/note.001.xml index 214c5466b175..bd0f09b7e7f2 100755 --- a/testautomation/xml/optional/input/docbook/note.001.xml +++ b/testautomation/xml/optional/input/docbook/note.001.xml @@ -10,9 +10,9 @@ </author> </articleinfo> -<note> -<title>Who can do this</title> -<para>All operators</para> -</note> +<note> +<title>Who can do this</title> +<para>All operators</para> +</note> </article> diff --git a/testgraphical/prechecks/softwaretests.pl b/testgraphical/prechecks/softwaretests.pl index f591fa139879..32f24117353b 100644 --- a/testgraphical/prechecks/softwaretests.pl +++ b/testgraphical/prechecks/softwaretests.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ sub prepare() $sPath .= "/" . $sEnv; chdir ($sPath); cwd(); - $sPath = getcwd(); + $sPath = getcwd(); my $sInpath = $ENV{INPATH}; $sPath .= "/" . $sInpath . "/misc"; $sGlobalIniFile = "$sPath/pathes.ini"; @@ -128,7 +128,7 @@ sub searchForFileInPath($$) $sep = ';'; } my @path = split($sep, $sPathList); - + my $sPath; my $startdir; my $bFound = 0; @@ -139,7 +139,7 @@ sub searchForFileInPath($$) foreach $startdir (@path) { my $nCount = 0; - # + # # IMPORTANT: leave out windir path. # if ($OSNAME eq "MSWin32" || $OSNAME eq "cygwin") @@ -160,7 +160,7 @@ sub searchForFileInPath($$) cwd(); my $myfile; while ($myfile = readdir(DIR)) # get filename - { + { if (-f $myfile ) # is it a file? { $nCount ++; @@ -173,7 +173,7 @@ sub searchForFileInPath($$) } } closedir(DIR); - print " ($nCount)\n" if ($verbose); + print " ($nCount)\n" if ($verbose); } if ($bFound == 1) { @@ -403,7 +403,7 @@ sub checkForImageMagick() { # next try, search image magick in $PROGRAMFILES my $sPrograms = unixpath($ENV{PROGRAMFILES}); - + if (! $sPrograms) { print "There exist no \$PROGRAMFILES path, wrong Windows version?\n"; @@ -413,10 +413,10 @@ sub checkForImageMagick() { local *DIR; if (opendir (DIR, $sPrograms)) # open program directory - { + { my $myfile; while ($myfile = readdir(DIR)) # get a filename - { + { if ($myfile =~ /ImageMagick/) { $sImageMagickPath = $sPrograms . "/" . $myfile; @@ -436,7 +436,7 @@ sub checkForImageMagick() } } } - + } if ( -e "$sImageMagickPath/$sImageMagickExe" ) { @@ -457,7 +457,7 @@ sub checkForJava6() { $javaexe = $ENV{JAVA6}; } - + if ($OSNAME eq "linux" || $OSNAME eq "cygwin") { # search for imagemagick @@ -498,8 +498,8 @@ sub checkForJava6() if ( $ENV{JAVA6} ) { $javaexe = $ENV{JAVA6}; - } - + } + if (! -e $javaexe) { print "Java not found.\n"; @@ -509,7 +509,7 @@ sub checkForJava6() { print "Found Java: '$javaexe'\n" if ($verbose); insertPath("java.exe", $javaexe); - } + } } else { @@ -520,7 +520,7 @@ sub checkForJava6() # different checks print "Environment '$OSNAME'\n" if ($verbose); -if ($printerdriver) +if ($printerdriver) { checkForPSDriver(); } @@ -548,7 +548,7 @@ sub print_usage(*) print(HANDLE <<END_OF_USAGE); -Usage: $tool_name [OPTIONS] +Usage: $tool_name [OPTIONS] -ghostscript Try to find ghostscript in your environment -imagemagick Try to find imagemagick diff --git a/testgraphical/qa/graphical/Test.java b/testgraphical/qa/graphical/Test.java index 8c633dede44c..cf7ae074f45b 100644 --- a/testgraphical/qa/graphical/Test.java +++ b/testgraphical/qa/graphical/Test.java @@ -35,7 +35,7 @@ import java.io.File; public final class Test { @org.junit.Before - public void setUp() throws Exception + public void setUp() throws Exception { connection.setUp(); } @@ -62,7 +62,7 @@ public final class Test { { sShow = "-show"; } - + final String sComparePath = FileHelper.appendPath(sPRJ, "source"); final String sCompareName = FileHelper.appendPath(sComparePath, "compare.pl"); @@ -72,7 +72,7 @@ public final class Test { System.out.println("Path to compare.pl is wrong: '" + aCompareFile.getAbsolutePath() + "'"); assertTrue(false); } - + final String sConnectionString = connection.getDescription(); String[] sCommandArray = @@ -101,7 +101,7 @@ public final class Test { { good = false; } - + assertTrue(good); // Runner.run( diff --git a/testgraphical/source/CallExternals.pm b/testgraphical/source/CallExternals.pm index a0a3b1ae716a..39db0c641318 100644 --- a/testgraphical/source/CallExternals.pm +++ b/testgraphical/source/CallExternals.pm @@ -3,7 +3,7 @@ package CallExternals; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -245,7 +245,7 @@ sub callperl($$$) my $sParams = shift; my $line; my $error; - + log_print("CALLPERL: $perlexe $perlprogram $sParams\n"); # if (open(IN_FILE, "$perlexe $sParams 2>&1 |")) if (open(IN_FILE, "$perlexe $perlprogram $sParams |")) @@ -277,7 +277,7 @@ sub setJavaExecutable($) # my $sJava14; # if ($OSNAME eq "MSWin32") # { -# if ($sJavaExecutable) +# if ($sJavaExecutable) # { # $sJava14 = $sJavaExecutable; # } @@ -311,7 +311,7 @@ sub setJavaExecutable($) sub getJava15() { my $sJava15; - if ($sJavaExecutable) + if ($sJavaExecutable) { $sJava15 = $sJavaExecutable; } @@ -363,7 +363,7 @@ sub getJava15() sub getJava16() { my $sJava16; - if ($sJavaExecutable) + if ($sJavaExecutable) { $sJava16 = $sJavaExecutable; } @@ -413,7 +413,7 @@ sub getJava16() } return $sJava16; } - + # ------------------------------------------------------------------------------ sub getJavaExecutable() { @@ -510,10 +510,10 @@ sub ExecSQL($) # my $line; # my $error; # my @result; -# +# # $exe = quoteIfNeed($exe); # $program = quoteIfNeed($program); -# +# # # print "Will send: $exe $sParams\n"; # # log_print("CALLEXE: $exe $program $sParams\n"); # if (open(IN_FILE, "$exe $program $sParams |")) diff --git a/testgraphical/source/ConvwatchHelper.pm b/testgraphical/source/ConvwatchHelper.pm index 8f157641b1f4..ccd166095cf3 100644 --- a/testgraphical/source/ConvwatchHelper.pm +++ b/testgraphical/source/ConvwatchHelper.pm @@ -61,11 +61,11 @@ our $tempprefix; # ------------------------------------------------------------------------------ # in filehelper # our $programprefix; -# +# # sub getProgramPrefix($) # { # my $sDBDistinct = shift; -# +# # my $sProgramPrefix; # if (! $programprefix) # { @@ -102,7 +102,7 @@ sub getQADEVToolsPath() # in filehelper # our $toolsprefix; -# +# # sub getToolsPrefix() # { # my $sToolsPrefix; @@ -202,13 +202,13 @@ our $dataprefix; # # sleep 1; # select(undef, undef, undef, 0.333); # } -# +# # sub _waitInSeconds($) # { # my $nLength = shift; # my $i; # my $j; -# +# # for ($j=0;$j<$nLength;$j++) # { # for ($i=0;$i<$j;$i++) @@ -222,7 +222,7 @@ our $dataprefix; # _shortsleep( 1 ); # print "\r"; # } -# +# # for ($j=0;$j<=$nLength;$j++) # { # for ($i=0;$i<$j;$i++) @@ -237,7 +237,7 @@ our $dataprefix; # print "\r"; # } # } -# +# # sub wait30seconds() # { # _waitInSeconds(20); @@ -319,7 +319,7 @@ sub readdirectory($$$) my $nFileCount = readdirectory($sNewStartDir, $sUserParameter, $hook); # workOnDir($sNewDir, $nFileCount); $nCountFiles += $nFileCount; - + chdir ($startdir); # zurueckwechseln. cwd(); } @@ -373,13 +373,13 @@ sub searchSofficeBin($$$) } # our $lcl_sUnoPkgPath; -# +# # sub searchUnoPkgBin($$$) # { # my $currentDir = shift; # my $currentFile = shift; # my $sUserParameter = shift; -# +# # if ($currentFile eq $sUserParameter) # { # my $sSourceFilename; @@ -398,7 +398,7 @@ sub searchSofficeBin($$$) # my $currentDir = shift; # my $currentFile = shift; # my $sUserParameter = shift; -# +# # if ($currentFile eq $sUserParameter) # { # my $sSourceFilename; @@ -415,36 +415,36 @@ sub searchSofficeBin($$$) # { # my $sPathToInstallOffice = shift; # my $sJARFileName = shift; -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sJARPath = ""; # readdirectory(${sPathToInstallOffice}, ${sJARFileName}, \&searchJARFile); -# +# # chdir $sCurrentPath; # cwd(); -# +# # return $lcl_sJARPath; # } # sub getUnoPkg($) # { # my $sPathToInstallOffice = shift; -# +# # my $sUnoPkgName = "unopkg.bin"; # if (isWindowsEnvironment()) # { # $sUnoPkgName = "unopkg.exe"; # } -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sUnoPkgPath = ""; # readdirectory(${sPathToInstallOffice}, ${sUnoPkgName}, \&searchUnoPkgBin); -# +# # chdir $sCurrentPath; # cwd(); -# +# # return ($lcl_sUnoPkgPath, $sUnoPkgName); # } @@ -473,9 +473,9 @@ sub getSofficeExe($) # sub checkOfficeAlreadyInstalled($) # { # my $sOfficePath = shift; -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sSofficeBinPath = ""; # my $sOldOfficePath = appendPath($sOfficePath, "program"); # if ( -d "$sOldOfficePath" ) @@ -494,7 +494,7 @@ sub getSofficeExe($) # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "StarOffice 9"); # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "program"); # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "soffice.bin"); -# +# # if ( -e "$sThreeLayerOffice" ) # { # return 1; @@ -511,12 +511,12 @@ sub getSofficeExe($) # } # } # } -# +# # # soffice.bin not found in fast path # readdirectory($sOfficePath, "soffice.bin", \&searchSofficeBin); # chdir $sCurrentPath; # cwd(); -# +# # if ( $lcl_sSofficeBinPath ne "" ) # { # return 1; @@ -529,7 +529,7 @@ sub getSofficeExe($) # # { # # return 1; # # } -# # +# # # # # check path system of tree layer office # # if ( isWindowsEnvironment() ) # # { @@ -541,14 +541,14 @@ sub getSofficeExe($) # # } # # else # # { -# # +# # # # $sOfficePathCheck = appendPath($sOfficePathCheck, "StarOffice 9"); # # $sOfficePathCheck = appendPath($sOfficePathCheck, "program"); # # $sOfficePathCheck = appendPath($sOfficePathCheck, "soffice.bin"); # # if ( -e $sOfficePathCheck ) # # { # # return 1; -# # } +# # } # # print "Error: There exist no Office, maybe an unsupported version?\n"; # # } # # } diff --git a/testgraphical/source/compare.pl b/testgraphical/source/compare.pl index 4aef877dc2b7..cc01b3626b13 100644 --- a/testgraphical/source/compare.pl +++ b/testgraphical/source/compare.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -191,7 +191,7 @@ else print "Warning: the file '$myfile' will not compared.\n"; } } - closedir(DIR); + closedir(DIR); } # my $sPool = "eis-chart"; # $err += CompareFiles($sDocumentPool, "eis-chart"); @@ -250,7 +250,7 @@ sub CompareFiles($$) } closedir(DIR); } - + print "***** State for graphical compare of pool: '$sPool' ******\n"; my $nErrorCount = 0; my $file; @@ -280,7 +280,7 @@ sub checkForKnownIssue($$) { my $startdir = shift; my $myfile = shift; - + if ($force) { return 0,""; @@ -393,7 +393,7 @@ sub print_usage(*) print(HANDLE <<END_OF_USAGE); -Usage: $tool_name [OPTIONS] +Usage: $tool_name [OPTIONS] -pool Give pool name out of document-pool directory. But all documents list in knownissues.xcl will not check. diff --git a/testgraphical/source/cwstestresult.pl b/testgraphical/source/cwstestresult.pl index 63c68c827dbd..89445fd6f641 100644 --- a/testgraphical/source/cwstestresult.pl +++ b/testgraphical/source/cwstestresult.pl @@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -53,13 +53,13 @@ use Cws; #### global ##### ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -my $is_debug = 1; # enable debug -my $opt_master; # option: master workspace -my $opt_child; # option: child workspace -my $opt_milestone; # option: milestone -my $opt_testrunName; # option: testrunName -my $opt_testrunPlatform; # option: testrunPlatfrom -my $opt_resultPage; # option: resultPage +my $is_debug = 1; # enable debug +my $opt_master; # option: master workspace +my $opt_child; # option: child workspace +my $opt_milestone; # option: milestone +my $opt_testrunName; # option: testrunName +my $opt_testrunPlatform; # option: testrunPlatfrom +my $opt_resultPage; # option: resultPage #### main ##### @@ -76,8 +76,8 @@ sub testresult # get master and child workspace my $masterws = $opt_master ? uc($opt_master) : $ENV{WORK_STAMP}; my $milestone = $opt_milestone ? $opt_milestone : $ENV{UPDMINOR}; - my $childws = $opt_milestone ? undef : ( $opt_child ? $opt_child : $ENV{CWS_WORK_STAMP} ); - + my $childws = $opt_milestone ? undef : ( $opt_child ? $opt_child : $ENV{CWS_WORK_STAMP} ); + if ( !defined($masterws) ) { print_error("Can't determine master workspace environment.\n" . "Please initialize environment with setsolar ...", 1); @@ -112,7 +112,7 @@ sub testresult $opt_resultPage=SOAP::Data->type(string => $opt_resultPage); $result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status); } - + exit(0) } @@ -120,7 +120,7 @@ sub testresult sub is_valid_cws { my $cws = shift; - + my $masterws = $cws->master(); my $childws = $cws->child(); # check if we got a valid child workspace @@ -165,7 +165,7 @@ sub parse_options # sub print_message # { # my $message = shift; -# +# # print STDERR "$script_name: "; # print STDERR "$message\n"; # return; @@ -186,7 +186,7 @@ sub print_error return; } -sub usage +sub usage { print STDERR "Usage: cwstestresult[-h] [-M masterws] [-m milestone|-c childws] <-n testrunName> <-p testrunPlatform> <-r resultPage> statusName\n"; print STDERR "\n"; diff --git a/testgraphical/source/cwstestresulthelper.pm b/testgraphical/source/cwstestresulthelper.pm index 37a5315445af..7796ff7d61b6 100644 --- a/testgraphical/source/cwstestresulthelper.pm +++ b/testgraphical/source/cwstestresulthelper.pm @@ -3,7 +3,7 @@ package cwstestresulthelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ sub cwstestresult($$$$$$) sleep(1); if (! -e $sSOLARENV) { - # fallback to old before ause103 (treeconfig) + # fallback to old before ause103 (treeconfig) $sSOLARENV="/so/ws/$MAJOR/src.$MINOR/solenv"; } } @@ -139,7 +139,7 @@ sub cwstestresult($$$$$$) log_print( "COMMON_ENV_TOOLS is: $ENV{COMMON_ENV_TOOLS} faked\n"); $nCOMMON_ENV_TOOLS_fake = 1; } - + # if ( !defined($ENV{WORK_STAMP}) ) # { # $ENV{WORK_STAMP} = $MAJOR; @@ -166,7 +166,7 @@ sub cwstestresult($$$$$$) log_print(" UPDMINOR is: $ENV{UPDMINOR} faked\n"); $nUPDMINOR_fake = 1; } - + # my $sStatus = "ok"; # if ($nFailure == 0) # { @@ -180,7 +180,7 @@ sub cwstestresult($$$$$$) # { # $sStatus = "incomplete"; # } - + # system("cwstestresult -c mycws -n Performance -p Windows ok"); my $sPerlProgram = appendPath($sSOLARENV, "bin/cwstestresult.pl"); # if ( -e "cwstestresult.pl" ) @@ -218,10 +218,10 @@ sub cwstestresult($$$$$$) } $sPerlParam .= " -p " . $sCWSEnv; $sPerlParam .= " -r http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/status_new.php?distinct=$sDBdistinct"; - + $sPerlParam .= " "; $sPerlParam .= $sStatus; - + # my $sSetcwsAndPerl = "setcws $destinationversion; " . getPerlExecutable(); @@ -246,7 +246,7 @@ sub cwstestresult($$$$$$) undef( $ENV{COMMON_ENV_TOOLS} ); $nCOMMON_ENV_TOOLS_fake = 0; } - + if ( $nWORK_STAMP_fake == 1 ) { # undef($ENV{WORK_STAMP}); diff --git a/testgraphical/source/dbhelper.pm b/testgraphical/source/dbhelper.pm index 0f5c0d5bb5ea..baadb80ba630 100644 --- a/testgraphical/source/dbhelper.pm +++ b/testgraphical/source/dbhelper.pm @@ -1,13 +1,13 @@ -# +# # # ------------------------------------------------------------------------------ -# +# # sub DB_INSERT_INTO_TABLE_STATUS() # { # # my $sDocID = shift; # # my $sDBDistinct = shift; -# +# # my $sHostname = hostname; -# +# # my $sSQL = "INSERT INTO status (docid, dbdistinct2, hostname)"; # $sSQL .= " VALUES ($docid, '$dbdistinct', '$sHostname')"; # ExecSQL($sSQL); @@ -17,19 +17,19 @@ # # my $sDocID = shift; # # my $sDBDistinct = shift; # my $sInfo = shift; -# +# # # my $sHostname = hostname; -# +# # my $sInsertSQL = "UPDATE status SET info='$sInfo' WHERE docid=$docid AND dbdistinct2='$dbdistinct'"; # ExecSQL($sInsertSQL); # } -# +# # sub DB_UPDATE_TABLE_DOCUMENTS_SET_STATE_INFO($$) # { # # my $sDocID = shift; # my $sStatus = shift; # my $sError = shift; -# +# # my $sSQL = "UPDATE documents"; # $sSQL .= " SET state='" . $sStatus . "'"; # $sSQL .= ",info='" . $sError . "'"; @@ -40,13 +40,13 @@ # { # # my $sDocID = shift; # my $sStatus = shift; -# +# # my $sSQL = "UPDATE status"; # $sSQL .= " SET state='" . $sStatus . "'"; # $sSQL .= " WHERE docid=$docid"; # ExecSQL($sSQL); # } -# +# # # sub DB_UPDATE_TABLE_STATUS_SET_STATE_FAILED() # # { # # DB_UPDATE_TABLE_STATUS_SET_STATE("FAILED-FAILED"); @@ -61,7 +61,7 @@ # sub getSourceInfo($) # { # my $sDBStr = shift; -# +# # my $sSourceVersion; # if ( $sDBStr =~ / sourceversion='(.*?)',/ ) # { @@ -91,7 +91,7 @@ # sub getDestinationInfo($) # { # my $sDBStr = shift; -# +# # my $sDestinationVersion; # if ( $sDBStr =~ / destinationversion='(.*?)',/ ) # { @@ -129,11 +129,11 @@ # # } # # return $sMailAddress; # # } -# +# # # sub getDocumentInfo($) # # { # # my $sDBStr = shift; -# # +# # # # my $sDocumentPoolPath; # # if ( $sDBStr =~ / documentpoolpath='(.*?)',/ ) # # { @@ -164,7 +164,7 @@ # # } # # return $sDocumentPoolPath, $sDocumentPool, $sDocumentName; # # } -# +# # sub getDistinct($) # { # my $sDBStr = shift; @@ -176,12 +176,12 @@ # } # return $sDBDistinct; # } -# +# # sub getIDInfo($) # { # my $sDBStr = shift; # # my $dbdistinct; -# +# # my $sDBDistinct = getDistinct($sDBStr); # # if ( $sDBStr =~ / dbdistinct2='(\S*?)',/ ) # # { @@ -206,4 +206,4 @@ # } # return $sDBDistinct, $sDocID; # } -# +# diff --git a/testgraphical/source/filehelper.pm b/testgraphical/source/filehelper.pm index ed1be35cf124..fc39237d7b2a 100644 --- a/testgraphical/source/filehelper.pm +++ b/testgraphical/source/filehelper.pm @@ -3,7 +3,7 @@ package filehelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -105,10 +105,10 @@ sub unixpath($) # my $sSolarisLockFile = "/tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e"; # return $sSolarisLockFile; # } -# +# # sub checkForSolarisLock() # { -# if ($OSNAME eq "solaris") +# if ($OSNAME eq "solaris") # { # # wait until the internal installer lock is gone # while ( -e getSolarisLockFile() ) @@ -123,14 +123,14 @@ sub unixpath($) # log_print( "[ok], lock is gone.\n"); # } # } -# +# # sub deleteSolarisLock() # { -# if ($OSNAME eq "solaris") +# if ($OSNAME eq "solaris") # { # sleep 1; # unlink getSolarisLockFile(); -# +# # sleep 1; # if ( -e getSolarisLockFile() ) # { @@ -196,7 +196,7 @@ our $programprefix; # sub getProgramPrefix($) # { # my $sDBDistinct = shift; -# +# # my $sProgramPrefix; # if (! $programprefix) # { @@ -275,7 +275,7 @@ sub rmkdir($) { @dirs = split("\\\\", $tpath); } - + foreach $dir (@dirs) { $accum = "$accum$dir/"; diff --git a/testgraphical/source/fill_documents_loop.pl b/testgraphical/source/fill_documents_loop.pl index c1b8174fefe5..4948262240ca 100644 --- a/testgraphical/source/fill_documents_loop.pl +++ b/testgraphical/source/fill_documents_loop.pl @@ -8,8 +8,8 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' # This program polls the database (documentcompare) every 60s for new jobs # it runs over the given directory from documentpoolpath and pool, and create for every file # a new database entry in documents. -# - +# + BEGIN { # Adding the path of this script file to the include path in the hope @@ -137,7 +137,7 @@ sub readdirectory($$$) my $nFileCount = readdirectory($sNewStartDir, $sValues, $hook); # workOnDir($sNewDir, $nFileCount); $nCountFiles += $nFileCount; - + chdir ($startdir); # zurueckwechseln. cwd(); } @@ -173,7 +173,7 @@ sub putDocumentInDB($$$) my $currentDir = shift; my $currentFile = shift; my $sValues = shift; - + my $sSourceFilename = $currentDir . $currentFile; # we cut down all the previous names like documentpoolpath and the documentpoolname $sSourceFilename = substr($sSourceFilename, length($sCurrentDocumentPool . $fs)); @@ -195,10 +195,10 @@ sub createDBEntriesForEveryDocument($) # we don't do anything if an error occured return; } - + # interpret the follows string # documentpoolpath='//so-gfxcmp-documents/doc-pool', documentpool='demo_lla', dbdistinct=62, - + # my $sDocumentPoolDir; if ( $sStr =~ /documentpoolpath='(.*?)',/ ) { @@ -280,10 +280,10 @@ sub createDBEntriesForEveryDocument($) # run over the whole given document pool and store every found document name in the database readdirectory($sCurrentDocumentPool, "", \&putDocumentInDB); - + chdir $cwd; cwd(); - + foreach $sSQL (@aEntries) { # print "# $sSQL\n"; @@ -354,9 +354,9 @@ sub sendMail($$$) $sParams .= " $dbdistinct"; $sParams .= " $mailaddress"; $sParams .= " starts"; # run through state of convwatch - + my $sMailProgram = appendPath(getQADEVToolsPath(), "mailsend.php"); - + my $err; my @lines; my $sLine; @@ -404,7 +404,7 @@ while (1) my @aResult; my $sSQL = "SELECT documentpoolpath,documentpool,dbdistinct2,sourceversion,destinationversion,mailfeedback,parentdistinct FROM documentcompare $sWhereClause"; @aResult = ExecSQL($sSQL); - + my $aValue; foreach $aValue (@aResult) { diff --git a/testgraphical/source/graphical_compare.pm b/testgraphical/source/graphical_compare.pm index 5cde8d64ea01..d3ea8e90360d 100644 --- a/testgraphical/source/graphical_compare.pm +++ b/testgraphical/source/graphical_compare.pm @@ -3,7 +3,7 @@ package graphical_compare; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ sub getOOoRunnerClasspath() if (! -d $sSourceRoot ) { - log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); + log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); return ""; } @@ -112,8 +112,8 @@ sub getOOoRunnerClasspath() my $sJurtPath = $sSourceRootBin; my $sJuhPath = $sSourceRootBin; my $sJavaUnoPath = $sSourceRootBin; - - my $sOOoRunnerClasspath = + + my $sOOoRunnerClasspath = appendPath( $sRidlPath, "ridl.jar") . getJavaPathSeparator() . appendPath( $sUnoilPath, "unoil.jar") . getJavaPathSeparator() . appendPath( $sJurtPath, "jurt.jar") . getJavaPathSeparator() . @@ -182,7 +182,7 @@ sub searchForReference($) { return 0; } - return 1; + return 1; } # ------------------------------------------------------------------------------ @@ -232,7 +232,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + my $sPathesIni = appendPath(getProjectOutput(), "pathes.ini"); my $gspath = getFromPathes($sPathesIni, "gs.path"); my $gsexe = getFromPathes($sPathesIni, "gs.exe"); @@ -247,7 +247,7 @@ sub SingleDocumentCompare($$$$$$) my $sInputPath = $sDocumentPoolPath; $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); - + if (! -f $sInputPath ) { $nConvwatchFailed = 1; @@ -302,13 +302,13 @@ sub SingleDocumentCompare($$$$$$) } $sParams .= " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -ini $sPropertyFile" . - " -o graphical.PostscriptCreator"; + " -o graphical.PostscriptCreator"; # $sParams .= " -cs pipe,name=$USER"; - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -351,12 +351,12 @@ sub SingleDocumentCompare($$$$$$) print("]\n"); return $nConvwatchFailed; } - + # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM RUNNING OFFICE -----\n"); @@ -367,8 +367,8 @@ sub SingleDocumentCompare($$$$$$) my $sOutputPath = getProjectOutput(); my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -384,7 +384,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -401,7 +401,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from references # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM REFERENCE -----\n"); @@ -409,7 +409,7 @@ sub SingleDocumentCompare($$$$$$) # start OOoRunner my $sInputPath = appendPath(getProjectRoot(), "references"); $sInputPath = appendPath($sInputPath, getEnvironment()); - $sInputPath = appendPath($sInputPath, $sDocumentPool); + $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); my $err = searchForReference($sInputPath); @@ -420,7 +420,7 @@ sub SingleDocumentCompare($$$$$$) } else { - my $sOutputPath = getProjectOutputReference(); + my $sOutputPath = getProjectOutputReference(); rmkdir $sOutputPath; my $sIndexFile = appendPath($sOutputPath, "index.ini"); @@ -435,8 +435,8 @@ sub SingleDocumentCompare($$$$$$) } } my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -452,7 +452,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -468,7 +468,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # compare JPEGs # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- COMPARE JPEGS -----\n"); @@ -478,19 +478,19 @@ sub SingleDocumentCompare($$$$$$) my $sParams = "-Xmx512m" . " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . - " -NoOffice" . + " -NoOffice" . " -NoSmallPictures" . " -o graphical.JPEGComparator"; if ($impath) { $sParams .= " -imagemagick.path " . quoteIfNeed($impath); } - + # start OOoRunner # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); @@ -559,7 +559,7 @@ sub SingleDocumentCompare($$$$$$) my $sLogFile = appendPath(getProjectOutput(), $sDocumentName . ".txt"); showFile($sLogFile); } - # printTime(endTime($nSimpleCompareTime)); + # printTime(endTime($nSimpleCompareTime)); return $nConvwatchFailed; } diff --git a/testgraphical/source/loghelper.pm b/testgraphical/source/loghelper.pm index 6dad31c7761a..76c91fc93319 100644 --- a/testgraphical/source/loghelper.pm +++ b/testgraphical/source/loghelper.pm @@ -3,7 +3,7 @@ package loghelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/oshelper.pm b/testgraphical/source/oshelper.pm index 3f2ed1c44e38..d7b26fb9defb 100644 --- a/testgraphical/source/oshelper.pm +++ b/testgraphical/source/oshelper.pm @@ -3,7 +3,7 @@ package oshelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/solarenvhelper.pm b/testgraphical/source/solarenvhelper.pm index f8ec17ece12b..ae162da0d1bd 100644 --- a/testgraphical/source/solarenvhelper.pm +++ b/testgraphical/source/solarenvhelper.pm @@ -3,7 +3,7 @@ package solarenvhelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/stringhelper.pm b/testgraphical/source/stringhelper.pm index e7d19256bf1b..3ffdabd46211 100644 --- a/testgraphical/source/stringhelper.pm +++ b/testgraphical/source/stringhelper.pm @@ -3,7 +3,7 @@ package stringhelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/timehelper.pm b/testgraphical/source/timehelper.pm index 38bd56fc4b20..95f66e83a6bc 100644 --- a/testgraphical/source/timehelper.pm +++ b/testgraphical/source/timehelper.pm @@ -3,7 +3,7 @@ package timehelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -94,6 +94,6 @@ sub printTime($) # # print getCurrentDateString() . "\n"; # sleep(60); # } -# +# 1; diff --git a/testgraphical/ui/java/ConvwatchGUIProject/build.xml b/testgraphical/ui/java/ConvwatchGUIProject/build.xml index e4d82212f35d..d397826c96e4 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/build.xml +++ b/testgraphical/ui/java/ConvwatchGUIProject/build.xml @@ -12,9 +12,9 @@ <import file="nbproject/build-impl.xml"/> <!-- - There exist several targets which are by default empty and which can be - used for execution of your tasks. These targets are usually executed - before and after some main targets. They are: + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: -pre-init: called before initialization of project properties -post-init: called after initialization of project properties @@ -40,12 +40,12 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. + For list of available properties check the imported + nbproject/build-impl.xml file. Another way to customize the build is by overriding existing main targets. - The targets of interest are: + The targets of interest are: -init-macrodef-javac: defines macro for javac compilation -init-macrodef-junit: defines macro for junit execution @@ -53,7 +53,7 @@ -init-macrodef-java: defines macro for class execution -do-jar-with-manifest: JAR building (if you are using a manifest) -do-jar-without-manifest: JAR building (if you are not using a manifest) - run: execution of project + run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation @@ -65,10 +65,10 @@ </exec> </target> - Notice that the overridden target depends on the jar target and not only on - the compile target as the regular run target does. Again, for a list of available + Notice that the overridden target depends on the jar target and not only on + the compile target as the regular run target does. Again, for a list of available properties which you can use, check the target you are overriding in the - nbproject/build-impl.xml file. + nbproject/build-impl.xml file. --> </project> diff --git a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml index e493afec4fc3..229d0c658dab 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml +++ b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml @@ -28,9 +28,9 @@ is divided into following sections: </condition> </fail> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> - <!-- + <!-- ====================== - INITIALIZATION SECTION + INITIALIZATION SECTION ====================== --> <target name="-pre-init"> diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java index 625e7b80c6e0..05b79cb9ab05 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java @@ -10,7 +10,7 @@ import javax.swing.SwingWorker; ************************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ public class ConvwatchGUI extends javax.swing.JFrame } // private int m_nOldWidth; - + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is @@ -479,7 +479,7 @@ public class ConvwatchGUI extends javax.swing.JFrame Image aImage = m_aImageIcon.getImage().getScaledInstance(w, h, Image.SCALE_AREA_AVERAGING); // SCALE_SMOOTH final ImageIcon aIcon = new ImageIcon(aImage); // m_jLabel.setIcon(aIcon); - return aIcon; + return aIcon; } @Override @@ -492,7 +492,7 @@ public class ConvwatchGUI extends javax.swing.JFrame catch (Exception e) {} } - + } /** @@ -502,7 +502,7 @@ public class ConvwatchGUI extends javax.swing.JFrame { // Start GUI - + java.awt.EventQueue.invokeLater(new Runnable() { diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java index 20cede5b1c33..903e370fa622 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -587,7 +587,7 @@ public class IniFile implements Enumeration // } // sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue); // sLocalValue = replaceEvaluatedKey("global", sLocalValue); - // + // // return sLocalValue; // } public void removeSection(String _sSectionToRemove) diff --git a/testtools/com/sun/star/comp/bridge/CurrentContextChecker.java b/testtools/com/sun/star/comp/bridge/CurrentContextChecker.java index 6d8022cd47fd..841c177fa339 100644 --- a/testtools/com/sun/star/comp/bridge/CurrentContextChecker.java +++ b/testtools/com/sun/star/comp/bridge/CurrentContextChecker.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index a399595f0164..e6a4dfa99aa2 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,9 +76,9 @@ public class TestComponent { private char _char; private byte _byte; private short _short; - private int _long; - private int _ulong; - private long _hyper; + private int _long; + private int _ulong; + private long _hyper; private float _float; private double _double; private String _string = ""; @@ -293,7 +293,7 @@ public class TestComponent { throw new com.sun.star.uno.RuntimeException(exception.getMessage()); } } - + public byte[] getImplementationId() throws com.sun.star.uno.RuntimeException { return toString().getBytes(); } @@ -306,11 +306,11 @@ public class TestComponent { private char _char; private byte _byte; private short _short; - private short _ushort; - private int _long; - private int _ulong; - private long _hyper; - private long _uhyper; + private short _ushort; + private int _long; + private int _ulong; + private long _hyper; + private long _uhyper; private float _float; private double _double; private String _string; @@ -323,7 +323,7 @@ public class TestComponent { private int _nLastCallId; private boolean _bFirstCall; private boolean _bSequenceOfCallTestPassed; - + private boolean[] arBool; private char[] arChar; private byte[] arByte; @@ -350,23 +350,23 @@ public class TestComponent { } - public void setValues(boolean bBool, - char cChar, + public void setValues(boolean bBool, + char cChar, byte nByte, - short nShort, + short nShort, short nUShort, - int nLong, + int nLong, int nULong, - long nHyper, + long nHyper, long nUHyper, - float fFloat, + float fFloat, double fDouble, - TestEnum testEnum, + TestEnum testEnum, String string, Object xInterface, Object any, TestElement testElements[], - TestDataElements testDataElements) throws com.sun.star.uno.RuntimeException + TestDataElements testDataElements) throws com.sun.star.uno.RuntimeException { if(DEBUG) System.err.println("##### " + getClass().getName() + ".setValues:" + any); @@ -391,23 +391,23 @@ public class TestComponent { - public TestDataElements setValues2(/*INOUT*/boolean[] io_bool, - /*INOUT*/char[] io_char, - /*INOUT*/byte[] io_byte, - /*INOUT*/short[] io_short, - /*INOUT*/short[] io_ushort, - /*INOUT*/int[] io_long, - /*INOUT*/int[] io_ulong, - /*INOUT*/long[] io_hyper, - /*INOUT*/long[] io_uhyper, - /*INOUT*/float[] io_float, - /*INOUT*/double[] io_double, - /*INOUT*/TestEnum[] io_testEnum, - /*INOUT*/String[] io_string, - /*INOUT*/Object[] io_xInterface, - /*INOUT*/Object[] io_any, - /*INOUT*/TestElement[][] io_testElements, - /*INOUT*/TestDataElements[] io_testDataElements) throws com.sun.star.uno.RuntimeException + public TestDataElements setValues2(/*INOUT*/boolean[] io_bool, + /*INOUT*/char[] io_char, + /*INOUT*/byte[] io_byte, + /*INOUT*/short[] io_short, + /*INOUT*/short[] io_ushort, + /*INOUT*/int[] io_long, + /*INOUT*/int[] io_ulong, + /*INOUT*/long[] io_hyper, + /*INOUT*/long[] io_uhyper, + /*INOUT*/float[] io_float, + /*INOUT*/double[] io_double, + /*INOUT*/TestEnum[] io_testEnum, + /*INOUT*/String[] io_string, + /*INOUT*/Object[] io_xInterface, + /*INOUT*/Object[] io_any, + /*INOUT*/TestElement[][] io_testElements, + /*INOUT*/TestDataElements[] io_testDataElements) throws com.sun.star.uno.RuntimeException { if(DEBUG) System.err.println("##### " + getClass().getName() + ".setValues2:" + io_any[0]); @@ -428,29 +428,29 @@ public class TestComponent { _any = io_any[0]; _testElements = io_testElements[0]; _testDataElements = io_testDataElements[0]; - + io_testElements[ 0 ] = new TestElement [] { io_testElements[ 0 ][ 1 ], io_testElements[ 0 ][ 0 ] }; - + return _testDataElements; } - public TestDataElements getValues(/*OUT*/boolean[] o_bool, - /*OUT*/char[] o_char, - /*OUT*/byte[] o_byte, - /*OUT*/short[] o_short, - /*OUT*/short[] o_ushort, - /*OUT*/int[] o_long, - /*OUT*/int[] o_ulong, - /*OUT*/long[] o_hyper, - /*OUT*/long[] o_uhyper, - /*OUT*/float[] o_float, - /*OUT*/double[] o_double, - /*OUT*/TestEnum[] o_testEnum, - /*OUT*/String[] o_string, - /*OUT*/Object[] o_xInterface, - /*OUT*/Object[] o_any, - /*OUT*/TestElement[][] o_testElements, + public TestDataElements getValues(/*OUT*/boolean[] o_bool, + /*OUT*/char[] o_char, + /*OUT*/byte[] o_byte, + /*OUT*/short[] o_short, + /*OUT*/short[] o_ushort, + /*OUT*/int[] o_long, + /*OUT*/int[] o_ulong, + /*OUT*/long[] o_hyper, + /*OUT*/long[] o_uhyper, + /*OUT*/float[] o_float, + /*OUT*/double[] o_double, + /*OUT*/TestEnum[] o_testEnum, + /*OUT*/String[] o_string, + /*OUT*/Object[] o_xInterface, + /*OUT*/Object[] o_any, + /*OUT*/TestElement[][] o_testElements, /*OUT*/TestDataElements[] o_testDataElements) throws com.sun.star.uno.RuntimeException { if(DEBUG) System.err.println("##### " + getClass().getName() + ".getValues:" + _any); @@ -495,7 +495,7 @@ public class TestComponent { public int testPPCAlignment( long l1, long l2, int i1, long l3, int i2 ) throws com.sun.star.uno.RuntimeException { return i2; } - + // Attributes public boolean getBool() throws com.sun.star.uno.RuntimeException { return _bool; @@ -706,8 +706,8 @@ public class TestComponent { } public void call(int nCallId , int nWaitMUSEC) throws com.sun.star.uno.RuntimeException { -// TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; -// osl_waitThread( &value ); +// TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; +// osl_waitThread( &value ); try { Thread.sleep(nWaitMUSEC / 10000); } @@ -725,8 +725,8 @@ public class TestComponent { } public void callOneway( int nCallId , int nWaitMUSEC ) throws com.sun.star.uno.RuntimeException { -// TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; -// osl_waitThread( &value ); +// TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; +// osl_waitThread( &value ); try { Thread.sleep(nWaitMUSEC / 10000); } @@ -742,7 +742,7 @@ public class TestComponent { return _bSequenceOfCallTestPassed; } - public synchronized void callRecursivly(XRecursiveCall xCall, int nToCall) throws com.sun.star.uno.RuntimeException { + public synchronized void callRecursivly(XRecursiveCall xCall, int nToCall) throws com.sun.star.uno.RuntimeException { if(nToCall != 0) { nToCall --; @@ -891,8 +891,8 @@ public class TestComponent { } // XBridgeTest - public TestDataElements raiseException(short nArgumentPos, String rMsg, Object xContext) - throws com.sun.star.lang.IllegalArgumentException, + public TestDataElements raiseException(short nArgumentPos, String rMsg, Object xContext) + throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.RuntimeException { throw new com.sun.star.lang.IllegalArgumentException(rMsg, xContext, nArgumentPos); @@ -957,7 +957,7 @@ public class TestComponent { throw new com.sun.star.uno.RuntimeException(exception.getMessage()); } } - + public byte[] getImplementationId() throws com.sun.star.uno.RuntimeException { return toString().getBytes(); } @@ -1290,8 +1290,8 @@ public class TestComponent { * @param regKey the registryKey * @see com.sun.star.comp.loader.JavaLoader */ - public static XSingleServiceFactory __getServiceFactory(String implName, - XMultiServiceFactory multiFactory, + public static XSingleServiceFactory __getServiceFactory(String implName, + XMultiServiceFactory multiFactory, XRegistryKey regKey) { XSingleServiceFactory xSingleServiceFactory = null; @@ -1299,18 +1299,18 @@ public class TestComponent { if(implName.equals(_TestObject.class.getName())) xSingleServiceFactory = FactoryHelper.getServiceFactory(_TestObject.class, _TestObject.__serviceName, - multiFactory, + multiFactory, regKey); else if(implName.equals(_PerformancTestObject.class.getName())) xSingleServiceFactory = FactoryHelper.getServiceFactory(_PerformancTestObject.class, _PerformancTestObject.__serviceName, - multiFactory, + multiFactory, regKey); - + return xSingleServiceFactory; } - + /** * Writes the service information into the given registry key. * This method is called by the <code>JavaLoader</code> @@ -1323,7 +1323,7 @@ public class TestComponent { boolean result = true; result = result & FactoryHelper.writeRegistryServiceInfo(_TestObject.class.getName(), _TestObject.__serviceName, regKey); - result = result & FactoryHelper.writeRegistryServiceInfo(_PerformancTestObject.class.getName(), + result = result & FactoryHelper.writeRegistryServiceInfo(_PerformancTestObject.class.getName(), _PerformancTestObject.__serviceName, regKey); return result; diff --git a/testtools/com/sun/star/comp/bridge/TestComponentMain.java b/testtools/com/sun/star/comp/bridge/TestComponentMain.java index 805bb1b68281..9e86c11e34f4 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponentMain.java +++ b/testtools/com/sun/star/comp/bridge/TestComponentMain.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ public class TestComponentMain static class InstanceProvider implements XInstanceProvider { XComponentContext ctx; - + public InstanceProvider( XComponentContext ctx ) { this.ctx = ctx; } - + public Object getInstance( /*IN*/String sInstanceName ) throws com.sun.star.container.NoSuchElementException, com.sun.star.uno.RuntimeException { @@ -73,7 +73,7 @@ public class TestComponentMain } static public void main(String args[]) throws Exception, com.sun.star.uno.Exception { - if(args.length != 2) { + if(args.length != 2) { System.err.println("usage : com.sun.star.comp.bridge.TestComponentMain uno:connection;protocol;objectName singleaccept"); System.exit(-1); } @@ -84,7 +84,7 @@ public class TestComponentMain String dcp = args[0]; boolean singleaccept = args[1].equals("singleaccept"); - + int index = dcp.indexOf(':'); String url = dcp.substring(0, index).trim(); dcp = dcp.substring(index + 1).trim(); @@ -92,11 +92,11 @@ public class TestComponentMain index = dcp.indexOf(';'); conDcp = dcp.substring(0, index).trim(); dcp = dcp.substring(index + 1).trim(); - + index = dcp.indexOf(';'); protDcp = dcp.substring(0, index).trim(); dcp = dcp.substring(index + 1).trim(); - + rootOid = dcp.trim().trim(); XComponentContext ctx = com.sun.star.comp.helper.Bootstrap.createInitialComponentContext( null ); @@ -109,7 +109,7 @@ public class TestComponentMain Object o = com.sun.star.comp.bridge.TestComponent.__getServiceFactory( "com.sun.star.comp.bridge.TestComponent$_TestObject", oldsmgr,null ); set.insert(o); - + XAcceptor xAcceptor = Acceptor.create(ctx); while( true ) @@ -117,11 +117,11 @@ public class TestComponentMain System.err.println("waiting for connect..."); XConnection xConnection = xAcceptor.accept(conDcp); - + XBridgeFactory xBridgeFactory = UnoRuntime.queryInterface( XBridgeFactory.class, smgr.createInstanceWithContext("com.sun.star.bridge.BridgeFactory",ctx)); - + XBridge xBridge = xBridgeFactory.createBridge( "", protDcp, xConnection, new InstanceProvider(ctx)); @@ -133,7 +133,7 @@ public class TestComponentMain break; } } - + } private static final class Listener implements XEventListener { diff --git a/testtools/inc/pch/precompiled_testtools.cxx b/testtools/inc/pch/precompiled_testtools.cxx index 7d0e153f3ee5..dffc97a40900 100644 --- a/testtools/inc/pch/precompiled_testtools.cxx +++ b/testtools/inc/pch/precompiled_testtools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/inc/pch/precompiled_testtools.hxx b/testtools/inc/pch/precompiled_testtools.hxx index aa292ceaace3..6d590497397a 100644 --- a/testtools/inc/pch/precompiled_testtools.hxx +++ b/testtools/inc/pch/precompiled_testtools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java index 68cc5dbd40fb..daa2f8937f17 100644 --- a/testtools/qa/cli/CLITest.java +++ b/testtools/qa/cli/CLITest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,18 +53,18 @@ public class CLITest extends ComplexTestCase if (arg1.length() == 0) failed("Check the make file. Java must be called with " + "-Dcli_test_arg=path_to_bootstrap_ini"); - String[] cmdarray = new String[] {testProgram, arg1}; + String[] cmdarray = new String[] {testProgram, arg1}; Process proc = null; Reader outReader; Reader errReader; try{ - + proc = Runtime.getRuntime().exec(cmdarray); outReader = new Reader(proc.getInputStream()); errReader = new Reader(proc.getErrorStream()); - - + + } catch(Exception e) { @@ -81,7 +81,7 @@ public class CLITest extends ComplexTestCase { failed("Unexpected exception."); } - + } } diff --git a/testtools/qa/cliversioning/VersionTestCase.java b/testtools/qa/cliversioning/VersionTestCase.java index bb897bbff1df..43f512ade5ad 100644 --- a/testtools/qa/cliversioning/VersionTestCase.java +++ b/testtools/qa/cliversioning/VersionTestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 3ed8349df2e5..2696217824ef 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,8 +72,8 @@ using namespace com::sun::star::registry; using namespace com::sun::star::bridge; using namespace test::testtools::bridgetest; -#define SERVICENAME "com.sun.star.test.bridge.BridgeTest" -#define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" +#define SERVICENAME "com.sun.star.test.bridge.BridgeTest" +#define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define STRING_TEST_CONSTANT "\" paco\' chorizo\\\' \"\'" @@ -477,7 +477,7 @@ static sal_Bool performTest( TestElement temp = aRet.Sequence[ 0 ]; aRet.Sequence[ 0 ] = aRet.Sequence[ 1 ]; aRet.Sequence[ 1 ] = temp; - + bRet = check( equals( aData, aSV2ret ) && equals( aData, aRet2 ), "getValues2 test") && bRet; @@ -738,7 +738,7 @@ static sal_Bool performTest( { _arSeqLong[i] = Sequence<sal_Int32>(_arLong, 3); } - + _arSeqLong2[j] = Sequence< Sequence<sal_Int32> > (_arSeqLong, 3); } @@ -798,7 +798,7 @@ static sal_Bool performTest( Sequence<Any> arAnyTemp = cloneSequence(arAny); Sequence<Sequence<sal_Int32> > arLong2Temp(arLong3[0]); Sequence<Sequence<Sequence<sal_Int32> > > arLong3Temp(arLong3); - + xBT2->setSequencesInOut(arBoolTemp, arCharTemp, arByteTemp, arShortTemp, arUShortTemp, arLongTemp,arULongTemp, arHyperTemp, arUHyperTemp, arFloatTemp, arDoubleTemp, @@ -1006,7 +1006,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) { #ifdef COMPCHECK //When we check if a new compiler still works then we must not call - //getRuntimeException because it uses cppu::getCaughtException which + //getRuntimeException because it uses cppu::getCaughtException which //does only work if all libs are build with the same runtime. return true; #else @@ -1075,8 +1075,8 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type) typelib_TypeDescription* pTdElem = pIndirectTd->pType->pType; sal_Int8* buf = new sal_Int8[pTdElem->nSize * val->nElements]; sal_Int8* pBufCur = buf; - - uno_Sequence* retSeq = NULL; + + uno_Sequence* retSeq = NULL; switch (pTdElem->eTypeClass) { case TypeClass_SEQUENCE: @@ -1099,7 +1099,7 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type) break; } delete[] buf; - return retSeq; + return retSeq; } template< class T> @@ -1116,11 +1116,11 @@ inline bool makeSurrogate( rOut.clear(); if (! rOriginal.is()) return false; - + Environment aCppEnv_official; Environment aUnoEnv_ano; Environment aCppEnv_ano; - + OUString aCppEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); OUString aUnoEnvTypeName( @@ -1136,7 +1136,7 @@ inline bool makeSurrogate( uno_createEnvironment( reinterpret_cast< uno_Environment ** >( &aUnoEnv_ano ), aUnoEnvTypeName.pData, 0 ); - + UnoInterfaceReference unoI; Mapping cpp2uno( aCppEnv_official.get(), aUnoEnv_ano.get() ); Mapping uno2cpp( aUnoEnv_ano.get(), aCppEnv_ano.get() ); @@ -1164,7 +1164,7 @@ inline bool makeSurrogate( OUSTR("mapping binary UNO to C++ failed!"), Reference< XInterface >() ); } - + return rOut.is(); } @@ -1225,7 +1225,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) break; } } - + if (! xOriginal.is()) { throw RuntimeException( @@ -1272,7 +1272,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) { printf( "\n> ### test failed!\n" ); } - + return 0; } @@ -1357,7 +1357,7 @@ void * SAL_CALL component_getFactory( bridge_test::TestBridgeImpl_create, OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), bridge_test::getSupportedServiceNames() ) ); - + if (xFactory.is()) { xFactory->acquire(); diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index 3de10604d0e4..ab49129165ee 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,14 +68,14 @@ namespace cpp_bridgetest { nToCall --; xCall->callRecursivly(this, nToCall); - } + } } } __finally { Monitor::Exit(this); } - + } }; @@ -84,7 +84,7 @@ public __gc class Constants public: static String* STRING_TEST_CONSTANT = new String(S"\" paco\' chorizo\\\' \"\'"); }; - + public __gc class BridgeTest : public WeakBase, public XMain { static bool compareData(Object* val1, Object* val2) @@ -94,7 +94,7 @@ public __gc class BridgeTest : public WeakBase, public XMain if ((val1 == 0 && val2 != 0) || (val1 != 0 && val2 == 0) || val1->GetType() != val2->GetType()) return false; - + bool ret = false; Type* t1 = val1->GetType(); //Sequence @@ -111,9 +111,9 @@ public __gc class BridgeTest : public WeakBase, public XMain // Interface implementation else if (t1->GetInterfaces()->Length > 0 && ! t1->IsValueType) { - ret = val1 == val2; - } - // Struct + ret = val1 == val2; + } + // Struct else if ( ! t1->IsValueType) { ret = compareStruct(val1, val2); @@ -132,7 +132,7 @@ public __gc class BridgeTest : public WeakBase, public XMain else { Debug::Assert(false); - } + } return ret; } @@ -142,8 +142,8 @@ public __gc class BridgeTest : public WeakBase, public XMain Debug::Assert(ar1 != 0 && ar2 != 0); Type* t1 = ar1->GetType(); Type* t2 = ar2->GetType(); - - if (!(ar1->Rank == 1 && ar2->Rank == 1 + + if (!(ar1->Rank == 1 && ar2->Rank == 1 && ar1->Length == ar2->Length && t1->GetElementType() == t2->GetElementType())) return false; @@ -208,7 +208,7 @@ public __gc class BridgeTest : public WeakBase, public XMain check( rData1->String == rData2->String, "### string does not match!" ); check( rData1->Interface == rData2->Interface, "### interface does not match!" ); check( compareData(__box(rData1->Any), __box(rData2->Any)), "### any does not match!" ); - + return (rData1->Bool == rData2->Bool && rData1->Char == rData2->Char && rData1->Byte == rData2->Byte && @@ -318,7 +318,7 @@ static bool performAnyTest(XBridgeTest* xLBT, TestDataElements* data) Any a2 = xLBT->transportAny(a1); bReturn = compareData( __box(a2), __box(a1)) && bReturn; } - return bReturn; + return bReturn; } static bool performSequenceOfCallTest(XBridgeTest* xLBT) @@ -355,7 +355,7 @@ static bool performRecursiveCallTest(XBridgeTest* xLBT) static bool performQueryForUnknownType(XBridgeTest* xLBT) { bool bRet = false; - // test queryInterface for an unknown type + // test queryInterface for an unknown type try { __try_cast<foo::MyInterface*>(xLBT); @@ -377,7 +377,7 @@ static bool performTest(XBridgeTest* xLBT) { // this data is never ever granted access to by calls other than equals(), assign()! TestDataElements* aData = new TestDataElements(); // test against this data - + Object* xI= new WeakBase(); Any aAny( __typeof(Object), xI); @@ -390,39 +390,39 @@ static bool performTest(XBridgeTest* xLBT) bRet = check( aData->Any.Value == xI, "### unexpected any!" ) && bRet; bRet = check( !(aData->Any.Value != xI), "### unexpected any!" ) && bRet; - + aData->Sequence = new TestElement*[2]; aData->Sequence[0] = new TestElement( aData->Bool, aData->Char, aData->Byte, aData->Short, - aData->UShort, aData->Long, aData->ULong, - aData->Hyper, aData->UHyper, aData->Float, - aData->Double, aData->Enum, aData->String, + aData->UShort, aData->Long, aData->ULong, + aData->Hyper, aData->UHyper, aData->Float, + aData->Double, aData->Enum, aData->String, aData->Interface, aData->Any); //(TestElement) aData; aData->Sequence[1] = new TestElement(); //is empty - + // aData complete // // this is a manually copy of aData for first setting... TestDataElements* aSetData = new TestDataElements; Any aAnySet(__typeof(Object), xI); assign( static_cast<TestElement*>(aSetData), - aData->Bool, - aData->Char, - aData->Byte, - aData->Short, + aData->Bool, + aData->Char, + aData->Byte, + aData->Short, aData->UShort, aData->Long, aData->ULong, aData->Hyper, aData->UHyper, aData->Float, aData->Double, - aData->Enum, - aData->String, + aData->Enum, + aData->String, xI, aAnySet); - + aSetData->Sequence = new TestElement*[2]; aSetData->Sequence[0] = new TestElement( aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, - aSetData->UShort, aSetData->Long, aSetData->ULong, - aSetData->Hyper, aSetData->UHyper, aSetData->Float, - aSetData->Double, aSetData->Enum, aSetData->String, + aSetData->UShort, aSetData->Long, aSetData->ULong, + aSetData->Hyper, aSetData->UHyper, aSetData->Float, + aSetData->Double, aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any); //TestElement) aSetData; aSetData->Sequence[1] = new TestElement(); // empty struct @@ -430,7 +430,7 @@ static bool performTest(XBridgeTest* xLBT) aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, aSetData->UShort, aSetData->Long, aSetData->ULong, aSetData->Hyper, aSetData->UHyper, aSetData->Float, aSetData->Double, aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any, aSetData->Sequence, aSetData ); - + { TestDataElements* aRet = new TestDataElements(); TestDataElements* aRet2 = new TestDataElements(); @@ -439,22 +439,22 @@ static bool performTest(XBridgeTest* xLBT) & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "getValues test") && bRet; - + // set last retrieved values TestDataElements* aSV2ret = xLBT->setValues2( & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort, & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + // check inout sequence order // => inout sequence parameter was switched by test objects TestElement* temp = aRet->Sequence[ 0 ]; aRet->Sequence[ 0 ] = aRet->Sequence[ 1 ]; aRet->Sequence[ 1 ] = temp; - + bRet = check( compareData( aData, aSV2ret ) && compareData( aData, aRet2 ), "getValues2 test") && bRet; @@ -468,9 +468,9 @@ static bool performTest(XBridgeTest* xLBT) & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) && compareData( aData, aGVret ), "getValues test" ) && bRet; - + // set last retrieved values xLBT->Bool = aRet->Bool; xLBT->Char = aRet->Char; @@ -510,7 +510,7 @@ static bool performTest(XBridgeTest* xLBT) aRet->Any = xLBT->Any; aRet->Sequence = xLBT->Sequence; aRet2 = xLBT->Struct; - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "struct comparison test") && bRet; bRet = check(performSequenceTest(xLBT), "sequence test") && bRet; @@ -523,7 +523,7 @@ static bool performTest(XBridgeTest* xLBT) // recursive call test bRet = check( performRecursiveCallTest( xLBT ) , "recursive test" ) && bRet; - + bRet = (compareData( aData, aRet ) && compareData( aData, aRet2 )) && bRet ; // check setting of null reference @@ -532,7 +532,7 @@ static bool performTest(XBridgeTest* xLBT) bRet = (aRet->Interface == 0) && bRet; } - + } return bRet; @@ -583,13 +583,13 @@ static bool performSequenceTest(XBridgeTest* xBT) //TestEnum arEnum[] = new TestEnum[3]; //arEnum[0] = TestEnum::ONE; arEnum[1] = TestEnum::TWO; //arEnum[2] = TestEnum::CHECK; - Console::WriteLine(new String("cli_cpp_bridgetest: Workaround for C++ compiler bug:" + Console::WriteLine(new String("cli_cpp_bridgetest: Workaround for C++ compiler bug:" " using Array of Int32 instead of Array of enums w")); Int32 arEnum[] = new Int32[3]; arEnum[0] = static_cast<Int32>(TestEnum::ONE); arEnum[1] = static_cast<Int32>(TestEnum::TWO); arEnum[2] = static_cast<Int32>(TestEnum::CHECK); - + TestElement* arStruct[] = new TestElement*[3]; arStruct[0] = new TestElement(); arStruct[1] = new TestElement(); arStruct[2] = new TestElement(); @@ -606,7 +606,7 @@ static bool performSequenceTest(XBridgeTest* xBT) TestEnum::CHECK, Constants::STRING_TEST_CONSTANT, arObject[2], Any( __typeof(Object), arObject[2] ) ); - + // int[][][] arLong3 = new int[][][]{ // new int[][]{new int[]{1,2,3},new int[]{4,5,6}, new int[]{7,8,9} }, // new int [][]{new int[]{1,2,3},new int[]{4,5,6}, new int[]{7,8,9}}, @@ -614,7 +614,7 @@ static bool performSequenceTest(XBridgeTest* xBT) { -// Console::WriteLine(new String("cli_cpp_bridgetest: +// Console::WriteLine(new String("cli_cpp_bridgetest: // int[][] seqSeqRet = xBT2->setDim2(arLong3[0]); // bRet = check( compareData(seqSeqRet, arLong3[0]), "sequence test") && bRet; // int[][][] seqSeqRet2 = xBT2->setDim3(arLong3); @@ -639,7 +639,7 @@ static bool performSequenceTest(XBridgeTest* xBT) Double seqDoubleRet[] = xBT2->setSequenceDouble(arDouble); bRet = check( compareData(seqDoubleRet, arDouble), "sequence test") && bRet; xBT2->setSequenceEnum(arEnum); - //comparing seqEnumRet with arEnum will fail since they are of different + //comparing seqEnumRet with arEnum will fail since they are of different //types because of workaround. arEnum is Int32[]. Console::WriteLine(new String("cli_cpp_bridgetest: Test omitted because " "of C++ compiler bug. XBridgeTest2::setSequenceEnum(sequence<TestEnum>)")); @@ -707,7 +707,7 @@ static bool performSequenceTest(XBridgeTest* xBT) // compareData(arAnyTemp , arAny) && // compareData(arLong2Temp , arLong3[0]) && // compareData(arLong3Temp , arLong3), "sequence test") && bRet; - + //Boolean arBoolOut[]; //Char arCharOut[]; //Byte arByteOut[]; @@ -788,7 +788,7 @@ static bool performSequenceTest(XBridgeTest* xBT) bRet = check( compareData(seqDoubleRet, _arDouble), "sequence test") && bRet; TestEnum _arEnum[] = new TestEnum[0]; xBT2->setSequenceEnum(_arEnum); -// compiler bug: _arEnum has type System.Enum and not TestEnum +// compiler bug: _arEnum has type System.Enum and not TestEnum // bRet = check( compareData(seqEnumRet, _arEnum), "sequence test") && bRet; UInt16 _arUShort[] = new UInt16[0]; UInt16 seqUShortRet[] = xBT2->setSequenceUShort(_arUShort); @@ -808,7 +808,7 @@ static bool performSequenceTest(XBridgeTest* xBT) TestElement* _arStruct[] = new TestElement*[0]; TestElement* seqStructRet[] = xBT2->setSequenceStruct(_arStruct); bRet = check( compareData(seqStructRet, _arStruct), "sequence test") && bRet; - + } return bRet; } @@ -880,7 +880,7 @@ static bool raiseException(XBridgeTest* xLBT ) { check( false, "### unexpected exception content!" ); } - + /** it is certain, that the RuntimeException testing will fail, if no */ xLBT->RuntimeException = 0; @@ -896,7 +896,7 @@ static bool raiseException(XBridgeTest* xLBT ) { check( false, "### unexpected exception content!" ); } - + /** it is certain, that the RuntimeException testing will fail, if no */ xLBT->RuntimeException = (int) 0xcafebabe; } @@ -938,9 +938,9 @@ static bool raiseException(XBridgeTest* xLBT ) { m_xContext = xContext; } + - - + int run( String* args[] ) { try @@ -955,7 +955,7 @@ static bool raiseException(XBridgeTest* xLBT ) args[ 0 ], m_xContext ); if (test_obj == 0) test_obj = m_xContext->getValueByName( args[ 0 ] ).Value; - + Console::WriteLine( "cli target bridgetest obj: {0}", test_obj->ToString() ); XBridgeTest* xTest = __try_cast<XBridgeTest*>(test_obj) ; diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index a7d8a96c1bf3..2b72372da599 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -290,13 +290,13 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) css::uno::Sequence<ttb::TestPolyStruct< ::sal_Int32> > arg35; css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > arg36; css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< - ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, ::rtl::OUString> > > arg37; + ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, ::rtl::OUString> > > arg37; css::uno::Sequence<ttb::TestPolyStruct2< ::rtl::OUString, ttb::TestPolyStruct2< ::sal_Unicode, ttb::TestPolyStruct<css::uno::Any> > > > arg38; css::uno::Sequence<ttb::TestPolyStruct2<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any>, ttb::TestPolyStruct< ::sal_Unicode> > > arg39; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct< ::sal_Unicode> > > arg40; - css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > >arg41; + css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > >arg41; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct< ttb::TestPolyStruct2<ttb::TestPolyStruct2<sal_Unicode, css::uno::Any>, ::rtl::OUString> > > > arg42; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct2< @@ -307,7 +307,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) if (!(arguments.getLength() == 45 && (arguments[0] >>= arg0) && arg0.member == cppu::UnoType<sal_Int32>::get() - && (arguments[1] >>= arg1) && arg1.member == arg1b + && (arguments[1] >>= arg1) && arg1.member == arg1b && (arguments[2] >>= arg2) && arg2.member == sal_True && (arguments[3] >>= arg3) && arg3.member == SAL_MIN_INT8 && (arguments[4] >>= arg4) && arg4.member == SAL_MIN_INT16 @@ -436,7 +436,7 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio { m_attr1 = _att1; } - + ::sal_Int32 Impl2::fn11( ::sal_Int32 arg ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 587eacabbfc5..e41c5ad605bf 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace test::testtools::bridgetest; -#define SERVICENAME "com.sun.star.test.bridge.CppTestObject" -#define IMPLNAME "com.sun.star.comp.bridge.CppTestObject" +#define SERVICENAME "com.sun.star.test.bridge.CppTestObject" +#define IMPLNAME "com.sun.star.comp.bridge.CppTestObject" namespace bridge_object { @@ -153,15 +153,15 @@ class Test_Impl : Sequence<Sequence<Sequence<sal_Int32> > > _arLong3; Sequence<Any> _arAny; Sequence<TestElement> _arStruct; - + public: Test_Impl() : m_nLastCallId( 0 ), m_bFirstCall( sal_True ), m_bSequenceOfCallTestPassed( sal_True ) {} virtual ~Test_Impl() - { - OSL_TRACE( "> scalar Test_Impl dtor <\n" ); + { + OSL_TRACE( "> scalar Test_Impl dtor <\n" ); } void SAL_CALL acquire() throw () @@ -172,12 +172,12 @@ public: { OWeakObject::release(); } - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); - + // XLBTestBase virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, @@ -190,7 +190,7 @@ public: const ::com::sun::star::uno::Sequence<TestElement >& rSequence, const TestData& rStruct ) throw(com::sun::star::uno::RuntimeException); - + virtual TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -202,7 +202,7 @@ public: ::com::sun::star::uno::Sequence<TestElement >& rSequence, TestData& rStruct ) throw(com::sun::star::uno::RuntimeException); - + virtual TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -225,7 +225,7 @@ public: { return rStruct; } virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException) { return i2; } - + virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException) { return _aData.Bool; } virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException) @@ -371,13 +371,13 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startRecursiveCall( const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException); virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException); virtual rtl::OUString SAL_CALL testMulti(Reference< XMulti > const & multi) throw (RuntimeException); - + public: // XBridgeTest virtual TestData SAL_CALL raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xCOntext ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -385,7 +385,7 @@ public: // XBridgeTest virtual void SAL_CALL raiseRuntimeExceptionOneway( const ::rtl::OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException); - + virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException); @@ -480,7 +480,7 @@ class Dummy : protected osl::DebugBase<Dummy>, public WeakComponentImplHelperBase { public: - Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){} + Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){} }; //__________________________________________________________________________________________________ @@ -592,11 +592,11 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny, rSequence ); _aStructData = rStruct; - + TestElement elem = rSequence[ 0 ]; rSequence[ 0 ] = rSequence[ 1 ]; rSequence[ 1 ] = elem; - + return _aStructData; } //__________________________________________________________________________________________________ @@ -637,8 +637,8 @@ TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMs { IllegalArgumentException aExc; aExc.ArgumentPosition = nArgumentPos; - aExc.Message = _aData.String = rMsg; - aExc.Context = _aData.Interface = xContext; + aExc.Message = _aData.String = rMsg; + aExc.Context = _aData.Interface = xContext; throw aExc; } @@ -646,8 +646,8 @@ void Test_Impl::raiseRuntimeExceptionOneway( const OUString & rMsg, const Refere throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = _aData.String = rMsg; - aExc.Context = _aData.Interface = xContext; + aExc.Message = _aData.String = rMsg; + aExc.Context = _aData.Interface = xContext; throw aExc; } @@ -704,8 +704,8 @@ sal_Int32 Test_Impl::getRuntimeException() void Test_Impl::setRuntimeException( sal_Int32 ) throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = _aData.String; - aExc.Context = _aData.Interface; + aExc.Message = _aData.String; + aExc.Context = _aData.Interface; throwException( makeAny( aExc ) ); } @@ -880,9 +880,9 @@ void SAL_CALL Test_Impl::setSequencesOut( Sequence< sal_Bool >& aSeqBoolean, Sequence< sal_Unicode >& aSeqChar, Sequence< sal_Int8 >& aSeqByte, Sequence< sal_Int16 >& aSeqShort, - Sequence< sal_uInt16 >& aSeqUShort, + Sequence< sal_uInt16 >& aSeqUShort, Sequence< sal_Int32 >& aSeqLong, - Sequence< sal_uInt32 >& aSeqULong, + Sequence< sal_uInt32 >& aSeqULong, Sequence< sal_Int64 >& aSeqHyper, Sequence< sal_uInt64 >& aSeqUHyper, Sequence< float >& aSeqFloat, @@ -1029,7 +1029,7 @@ void Test_Impl::testConstructorsService( Sequence<Type> argSeq1(1); argSeq1[0] = cppu::UnoType<sal_Int32>::get(); Sequence<Reference<XInterface> > argSeq2(1); argSeq2[0] = static_cast<XComponent*>(new Dummy()); Sequence<Reference<XComponent> > argSeq2a(1); argSeq2a[0] = static_cast<XComponent*>(new Dummy()); - + Sequence<TestPolyStruct2<sal_Unicode, Sequence<Any> > > argSeq3(1); argSeq3[0] = TestPolyStruct2<sal_Unicode, Sequence<Any> >('X', arg27); Sequence<TestPolyStruct2<TestPolyStruct<sal_Unicode>, Sequence<Any> > > argSeq4(1); @@ -1055,7 +1055,7 @@ void Test_Impl::testConstructorsService( TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), TestPolyStruct<sal_Unicode>('X')); Sequence<Sequence<TestPolyStruct<sal_Unicode > > > argSeq11(1); argSeq11[0] = Sequence<TestPolyStruct<sal_Unicode > >(1); - argSeq11[0][0] = TestPolyStruct<sal_Unicode>('X'); + argSeq11[0][0] = TestPolyStruct<sal_Unicode>('X'); Sequence<Sequence<TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> > > > argSeq12(1); argSeq12[0] = Sequence<TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> > >(1); argSeq12[0][0] = TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> >( @@ -1193,7 +1193,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) ); xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ) ); - + return sal_True; } catch (InvalidRegistryException &) @@ -1208,7 +1208,7 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; - + if (pServiceManager && rtl_str_compare( pImplName, IMPLNAME ) == 0) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( @@ -1216,14 +1216,14 @@ void * SAL_CALL component_getFactory( OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), bridge_object::Test_Impl_create, bridge_object::getSupportedServiceNames() ) ); - + if (xFactory.is()) { xFactory->acquire(); pRet = xFactory.get(); } } - + return pRet; } } diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index 38933d928b6a..7bdfbfba0d5e 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx index 4fbcbaf65ef0..542e9736eab2 100644 --- a/testtools/source/bridgetest/currentcontextchecker.hxx +++ b/testtools/source/bridgetest/currentcontextchecker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl index 40a0066211ab..71e82c5b282d 100644 --- a/testtools/source/bridgetest/idl/bridgetest.idl +++ b/testtools/source/bridgetest/idl/bridgetest.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index dd8558a29867..18a04889a83b 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx index 3a73a6eb390a..f2ac06560d83 100644 --- a/testtools/source/bridgetest/multi.hxx +++ b/testtools/source/bridgetest/multi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx index 8f81138fb4f2..2fb9730c408b 100644 --- a/testtools/source/performance/pseudo.cxx +++ b/testtools/source/performance/pseudo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ namespace pseudo_uno //================================================================================================== struct pseudo_Mapping : public uno_Mapping { - oslInterlockedCount nRef; + oslInterlockedCount nRef; - uno_ExtEnvironment * pFrom; - uno_ExtEnvironment * pTo; + uno_ExtEnvironment * pFrom; + uno_ExtEnvironment * pTo; pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment * pTo_ ); ~pseudo_Mapping(); @@ -58,13 +58,13 @@ struct pseudo_Mapping : public uno_Mapping //==== a uno pseudo proxy ============================================================================= struct pseudo_unoInterfaceProxy : public uno_Interface { - oslInterlockedCount nRef; - pseudo_Mapping * pPseudoMapping; + oslInterlockedCount nRef; + pseudo_Mapping * pPseudoMapping; // mapping information - uno_Interface * pUnoI; // wrapped interface - typelib_InterfaceTypeDescription * pTypeDescr; - OUString oid; + uno_Interface * pUnoI; // wrapped interface + typelib_InterfaceTypeDescription * pTypeDescr; + OUString oid; // ctor inline pseudo_unoInterfaceProxy( pseudo_Mapping * pPseudoMapping_, @@ -255,7 +255,7 @@ extern "C" void SAL_CALL uno_ext_getMapping( if (ppMapping && pFrom && pTo && pFrom->pExtEnv && pTo->pExtEnv) { uno_Mapping * pMapping = 0; - + if (0 == rtl_ustr_ascii_compare( pFrom->pTypeName->buffer, UNO_LB_UNO ) && 0 == rtl_ustr_ascii_compare( pTo->pTypeName->buffer, UNO_LB_UNO )) { @@ -267,7 +267,7 @@ extern "C" void SAL_CALL uno_ext_getMapping( (uno_Environment *)pTo->pExtEnv, aMappingPurpose.pData ); } - + if (*ppMapping) (*(*ppMapping)->release)( *ppMapping ); *ppMapping = pMapping; diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 15397de078d1..72bc8cc36c1c 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::test::performance; -#define SERVICENAME "com.sun.star.test.performance.PerformanceTestObject" -#define IMPLNAME "com.sun.star.comp.performance.PerformanceTestObject" +#define SERVICENAME "com.sun.star.test.performance.PerformanceTestObject" +#define IMPLNAME "com.sun.star.comp.performance.PerformanceTestObject" namespace benchmark_object { @@ -73,7 +73,7 @@ class ServiceImpl RuntimeException _aDummyRE; sal_Int32 _nRef; - + public: ServiceImpl() : _nRef( 0 ) @@ -81,7 +81,7 @@ public: ServiceImpl( const Reference< XMultiServiceFactory > & xMgr ) : _nRef( 0 ) {} - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException) { @@ -108,7 +108,7 @@ public: { osl_incrementInterlockedCount( &_nRef ); } virtual void SAL_CALL release() throw() { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException); @@ -151,8 +151,8 @@ public: { return _aDummyStruct; } virtual void SAL_CALL setStruct_attr( const ::com::sun::star::test::performance::ComplexTypes& _attributestruct ) throw(::com::sun::star::uno::RuntimeException) {} - - // Methods + + // Methods virtual sal_Int32 SAL_CALL getLong() throw(::com::sun::star::uno::RuntimeException) { return 0; } virtual void SAL_CALL setLong( sal_Int32 _long ) throw(::com::sun::star::uno::RuntimeException) @@ -184,12 +184,12 @@ public: virtual Sequence< Reference< XInterface > > SAL_CALL getSequence() throw(::com::sun::star::uno::RuntimeException) { return _aDummySequence; } virtual void SAL_CALL setSequence( const Sequence< Reference< XInterface > >& _sequence ) throw(::com::sun::star::uno::RuntimeException) - {} + {} virtual ComplexTypes SAL_CALL getStruct() throw(::com::sun::star::uno::RuntimeException) { return _aDummyStruct; } virtual void SAL_CALL setStruct( const ::com::sun::star::test::performance::ComplexTypes& c ) throw(::com::sun::star::uno::RuntimeException) {} - + virtual void SAL_CALL async() throw(::com::sun::star::uno::RuntimeException) {} virtual void SAL_CALL sync() throw(::com::sun::star::uno::RuntimeException) @@ -273,7 +273,7 @@ sal_Bool SAL_CALL component_writeInfo( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) ); xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ) ); - + return sal_True; } catch (InvalidRegistryException &) @@ -288,7 +288,7 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; - + if (pServiceManager && rtl_str_compare( pImplName, IMPLNAME ) == 0) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( @@ -296,14 +296,14 @@ void * SAL_CALL component_getFactory( OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), benchmark_object::ServiceImpl_create, benchmark_object::getSupportedServiceNames() ) ); - + if (xFactory.is()) { xFactory->acquire(); pRet = xFactory.get(); } } - + return pRet; } } diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 0347612fa18c..4eaadf24bec2 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,8 +83,8 @@ using namespace com::sun::star::bridge; using namespace com::sun::star::container; using namespace com::sun::star::test::performance; -#define SERVICENAME "com.sun.star.test.performance.PerformanceTest" -#define IMPLNAME "com.sun.star.comp.performance.PerformanceTest" +#define SERVICENAME "com.sun.star.test.performance.PerformanceTest" +#define IMPLNAME "com.sun.star.comp.performance.PerformanceTest" namespace benchmark_test { @@ -94,18 +94,18 @@ static inline sal_uInt32 getSystemTicks() #ifdef SAL_W32 return (sal_uInt32)GetTickCount(); #else // only UNX supported for now - static sal_uInt32 nImplTicksPerSecond = 0; - static double dImplTicksPerSecond; - static double dImplTicksULONGMAX; + static sal_uInt32 nImplTicksPerSecond = 0; + static double dImplTicksPerSecond; + static double dImplTicksULONGMAX; - struct tms aTms; + struct tms aTms; sal_uInt32 nTicks = (sal_uInt32)times( &aTms ); if ( !nImplTicksPerSecond ) { nImplTicksPerSecond = sysconf(_SC_CLK_TCK); dImplTicksPerSecond = nImplTicksPerSecond; - dImplTicksULONGMAX = (double)(sal_uInt32)ULONG_MAX; + dImplTicksULONGMAX = (double)(sal_uInt32)ULONG_MAX; } double fTicks = nTicks; @@ -368,10 +368,10 @@ static void createInstance( Reference< T > & rxOut, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bridge.UnoUrlResolver") ), xMgr, Reference< XRegistryKey >() ) ) ); // java loader -// xSet->insert( makeAny( loadLibComponentFactory( -// OUString( RTL_CONSTASCII_USTRINGPARAM("javaloader") ), -// OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader") ), -// xMgr, Reference< XRegistryKey >() ) ) ); +// xSet->insert( makeAny( loadLibComponentFactory( +// OUString( RTL_CONSTASCII_USTRINGPARAM("javaloader") ), +// OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader") ), +// xMgr, Reference< XRegistryKey >() ) ) ); } s_bSet = sal_True; } @@ -522,8 +522,8 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl ) //================================================================================================== class TimeEntry { - sal_Int64 nLoop; - sal_uInt32 nTicks; + sal_Int64 nLoop; + sal_uInt32 nTicks; public: TimeEntry() @@ -558,7 +558,7 @@ typedef std::map< std::string, TimeEntry > t_TimeEntryMap; //================================================================================================== struct TimingSheet { - t_TimeEntryMap _entries; + t_TimeEntryMap _entries; void insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); }; //__________________________________________________________________________________________________ @@ -922,12 +922,12 @@ static void benchmark( rSheet.insert( "Ad: set struct attribute", nLoop, tEnd - tStart ); // load -// i = nLoop; -// tStart = getSystemTicks(); -// while (i--) -// xBench->setSequence( aSeq ); -// tEnd = getSystemTicks(); -// rSheet.insert( "transfer of exisiting objects", nLoop, tEnd - tStart ); +// i = nLoop; +// tStart = getSystemTicks(); +// while (i--) +// xBench->setSequence( aSeq ); +// tEnd = getSystemTicks(); +// rSheet.insert( "transfer of exisiting objects", nLoop, tEnd - tStart ); // exceptions i = nLoop; diff --git a/testtools/source/servicetests/LocalServiceTest.java b/testtools/source/servicetests/LocalServiceTest.java index bb12235d1b37..d7558859c719 100644 --- a/testtools/source/servicetests/LocalServiceTest.java +++ b/testtools/source/servicetests/LocalServiceTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java index 8abf6674f1e5..53df71e1bd62 100644 --- a/testtools/source/servicetests/RemoteServiceTest.java +++ b/testtools/source/servicetests/RemoteServiceTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java index 248ff96007e2..97248dbc208a 100644 --- a/testtools/source/servicetests/TestBase.java +++ b/testtools/source/servicetests/TestBase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/TestService.java b/testtools/source/servicetests/TestService.java index 279aaabe4b70..f02f02a75232 100644 --- a/testtools/source/servicetests/TestService.java +++ b/testtools/source/servicetests/TestService.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/TestService1.idl b/testtools/source/servicetests/TestService1.idl index 3bf04c6cdc5f..bd73e7ebe2e6 100644 --- a/testtools/source/servicetests/TestService1.idl +++ b/testtools/source/servicetests/TestService1.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/TestService2.idl b/testtools/source/servicetests/TestService2.idl index cf487bcd8dc2..890e3e439910 100644 --- a/testtools/source/servicetests/TestService2.idl +++ b/testtools/source/servicetests/TestService2.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/XTestService1.idl b/testtools/source/servicetests/XTestService1.idl index 6d6bf1e44802..cfd1c2e315f7 100644 --- a/testtools/source/servicetests/XTestService1.idl +++ b/testtools/source/servicetests/XTestService1.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/XTestService2.idl b/testtools/source/servicetests/XTestService2.idl index be7de2437244..e45592a3108e 100644 --- a/testtools/source/servicetests/XTestService2.idl +++ b/testtools/source/servicetests/XTestService2.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/XTestService3.idl b/testtools/source/servicetests/XTestService3.idl index 1933ecf729e6..5c0dca63a79a 100644 --- a/testtools/source/servicetests/XTestService3.idl +++ b/testtools/source/servicetests/XTestService3.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/servicetests/XTestService4.idl b/testtools/source/servicetests/XTestService4.idl index 5d7e80c9a8ed..512b022be8ff 100644 --- a/testtools/source/servicetests/XTestService4.idl +++ b/testtools/source/servicetests/XTestService4.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |