diff options
Diffstat (limited to 'qadevOOo/runner')
193 files changed, 2307 insertions, 2307 deletions
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() { |