diff options
Diffstat (limited to 'qadevOOo/runner')
203 files changed, 1060 insertions, 1495 deletions
diff --git a/qadevOOo/runner/base/TestBase.java b/qadevOOo/runner/base/TestBase.java index e0daf78cb706..d09f28721ab0 100644 --- a/qadevOOo/runner/base/TestBase.java +++ b/qadevOOo/runner/base/TestBase.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TestBase.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/base/basic_fat.java b/qadevOOo/runner/base/basic_fat.java index a46a8abbc9b4..74a6708cf801 100644 --- a/qadevOOo/runner/base/basic_fat.java +++ b/qadevOOo/runner/base/basic_fat.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: basic_fat.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,7 +26,6 @@ ************************************************************************/ package base; -import base.TestBase; import basicrunner.BasicIfcTest; import basicrunner.BasicTestCase; @@ -72,7 +68,7 @@ public class basic_fat implements TestBase /** * Execute a test. * @param param The test parameters. - * @param return True, if the test was executed. + * @return True, if the test was executed. */ public boolean executeTest(TestParameters param) { diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java index 7f3ff7dce64b..c25de6efc4a9 100644 --- a/qadevOOo/runner/base/java_cmp.java +++ b/qadevOOo/runner/base/java_cmp.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: java_cmp.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,11 +28,6 @@ package base; -import com.sun.star.uno.UnoRuntime; - -import helper.APIDescGetter; -import helper.AppProvider; -import base.TestBase; /** diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java index e3a41ca19d5c..946e14b42934 100644 --- a/qadevOOo/runner/base/java_complex.java +++ b/qadevOOo/runner/base/java_complex.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: java_complex.java,v $ - * $Revision: 1.13.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index 6b555fc1f1e5..1d75c48ed43e 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: java_fat.java,v $ - * $Revision: 1.15.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -62,43 +59,43 @@ import util.DynamicClassLoader; public class java_fat implements TestBase { - private static boolean debug = false; + private static boolean m_isDebug = false; private static boolean keepdocument = false; private static boolean logging = true; private static boolean newOffice = false; - private DynamicClassLoader dcl = null; + private DynamicClassLoader m_aDynamicClassLoader = null; private lib.TestParameters m_aParams; private AppProvider m_aOffice; - public boolean executeTest(lib.TestParameters param) + public boolean executeTest(lib.TestParameters _aParams) { - m_aParams = param; + m_aParams = _aParams; - dcl = new DynamicClassLoader(); + m_aDynamicClassLoader = new DynamicClassLoader(); DescGetter dg = new APIDescGetter(); - String job = (String) param.get("TestJob"); - String ExclusionFile = (String) param.get("ExclusionList"); + String job = (String) m_aParams.get("TestJob"); + String ExclusionFile = (String) m_aParams.get("ExclusionList"); Vector exclusions = null; boolean retValue = true; - debug = param.getBool("DebugIsActive"); - logging = param.getBool("LoggingIsActive"); - keepdocument = param.getBool("KeepDocument"); - newOffice = param.getBool(util.PropertyName.NEW_OFFICE_INSTANCE); + m_isDebug = m_aParams.getBool("DebugIsActive"); + logging = m_aParams.getBool("LoggingIsActive"); + keepdocument = m_aParams.getBool("KeepDocument"); + newOffice = m_aParams.getBool(util.PropertyName.NEW_OFFICE_INSTANCE); if (keepdocument) { System.setProperty("KeepDocument", "true"); } if (ExclusionFile != null) { - exclusions = getExclusionList(ExclusionFile, debug); + exclusions = getExclusionList(ExclusionFile, m_isDebug); } //get Job-Descriptions - System.out.println("Getting Descriptions for Job: " + job); + // System.out.println("Getting Descriptions for Job: " + job); - String sDescriptionPath = (String) param.get("DescriptionPath"); - DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, debug); + String sDescriptionPath = (String) m_aParams.get("DescriptionPath"); + DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, m_isDebug); // System.out.println(); @@ -109,8 +106,8 @@ public class java_fat implements TestBase return false; } -// String officeProviderName = (String) param.get("OfficeProvider"); -// AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); +// String officeProviderName = (String) m_aParams.get("OfficeProvider"); +// AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); // // if (office == null) { // System.out.println("ERROR: Wrong parameter 'OfficeProvider', " + @@ -118,18 +115,22 @@ public class java_fat implements TestBase // System.exit(-1); // } - m_aOffice = startOffice(param); + m_aOffice = startOffice(m_aParams); boolean firstRun = true; + // Run through all entries (e.g. sw.SwXBookmark.*) + for (int l = 0; l < entries.length; l++) { - if (entries[l] == null) + DescEntry entry = entries[l]; + + if (entry == null) { continue; } - if (entries[l].hasErrorMsg) + if (entry.hasErrorMsg) { System.out.println(entries[l].ErrorMsg); retValue = false; @@ -138,145 +139,86 @@ public class java_fat implements TestBase if (!firstRun && newOffice) { - if (!m_aOffice.closeExistingOffice(param, true)) + if (!m_aOffice.closeExistingOffice(m_aParams, true)) { - m_aOffice.disposeManager(param); + m_aOffice.disposeManager(m_aParams); } - startOffice(param); + startOffice(m_aParams); } firstRun = false; -// XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager( -// param); - - XMultiServiceFactory msf = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory msf = (XMultiServiceFactory) m_aParams.getMSF(); if (msf == null) { retValue = false; - continue; } -// param.put("ServiceFactory", msf); - - DescEntry entry = entries[l]; - //get some helper classes Summarizer sumIt = new Summarizer(); - - TestCase tCase = null; - - try - { - tCase = (TestCase) dcl.getInstance("mod._" + entry.entryName); - } - catch (java.lang.IllegalArgumentException ie) - { - entry.ErrorMsg = ie.getMessage(); - entry.hasErrorMsg = true; - } - catch (java.lang.NoClassDefFoundError ie) - { - entry.ErrorMsg = ie.getMessage(); - entry.hasErrorMsg = true; - } - + TestCase tCase = getTestCase(entry); if (tCase == null) { - Summarizer.summarizeDown(entry, entry.ErrorMsg); - - LogWriter sumObj = OutProducerFactory.createOutProducer(param); - entry.UserDefinedParams = param; - sumObj.initialize(entry, logging); - sumObj.summary(entry); - continue; } - if (debug) - { - System.out.println("sleeping 5 seconds.."); - } - util.utils.shortWait(5000); +// if (m_isDebug) +// { +// System.out.println("sleeping 2 seconds.."); +// } + util.utils.shortWait(2000); System.out.println("Creating: " + entry.entryName); - LogWriter log = (LogWriter) dcl.getInstance((String) param.get("LogWriter")); + LogWriter log = (LogWriter) m_aDynamicClassLoader.getInstance((String) m_aParams.get("LogWriter")); log.initialize(entry, logging); - entry.UserDefinedParams = param; - - TestEnvironment tEnv = null; + entry.UserDefinedParams = m_aParams; - try - { - tCase.setLogWriter((PrintWriter) log); - tCase.initializeTestCase(param); - tEnv = tCase.getTestEnvironment(param); - } - catch (Exception e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - e.printStackTrace(); - tEnv = null; - } - catch (java.lang.UnsatisfiedLinkError e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - tEnv = null; - } - catch (java.lang.NoClassDefFoundError e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - tEnv = null; - } + tCase.setLogWriter((PrintWriter) log); + tCase.initializeTestCase(m_aParams); + TestEnvironment tEnv = getTestEnvironment(tCase, entry); if (tEnv == null) { - Summarizer.summarizeDown(entry, "Couldn't create " + tCase.getObjectName()); - - LogWriter sumObj = OutProducerFactory.createOutProducer(param); - entry.UserDefinedParams = param; - sumObj.initialize(entry, logging); - sumObj.summary(entry); - continue; } - System.out.println(tCase.getObjectName() + " recreated "); + final String sObjectName = tCase.getObjectName(); + // System.out.println(sObjectName + " recreated "); for (int j = 0; j < entry.SubEntryCount; j++) { DescEntry aSubEntry = entry.SubEntries[j]; - if (!aSubEntry.isToTest) + final boolean bIsToTest = aSubEntry.isToTest; + if (!bIsToTest) { Summarizer.summarizeDown(aSubEntry, "not part of the job"); - continue; } - if ((exclusions != null) && (exclusions.contains(aSubEntry.longName))) + // final String sEntryName = aSubEntry.entryName; + final String sLongEntryName = aSubEntry.longName; + + if ((exclusions != null) && (exclusions.contains(sLongEntryName))) { Summarizer.summarizeDown(aSubEntry, "known issue"); - continue; } - System.out.println("running: '" + aSubEntry.entryName + "'"); + // System.out.println("running: '" + sLongEntryName + "' testcode: [" + sEntryName + "]"); + // this will shown in test itself - LogWriter ifclog = (LogWriter) dcl.getInstance( (String) param.get("LogWriter")); + LogWriter ifclog = (LogWriter) m_aDynamicClassLoader.getInstance( (String) m_aParams.get("LogWriter")); ifclog.initialize(aSubEntry, logging); - aSubEntry.UserDefinedParams = param; + aSubEntry.UserDefinedParams = m_aParams; aSubEntry.Logger = ifclog; if ((tEnv == null) || tEnv.isDisposed()) { closeExistingOffice(); - tEnv = getEnv(entry, param); + tEnv = getEnv(entry, m_aParams); } // MultiMethodTest ifc = null; @@ -291,7 +233,7 @@ public class java_fat implements TestBase { countInterfaceTestRun++; finished = true; - res = executeInterfaceTest(aSubEntry, tEnv, param); + res = executeInterfaceTest(aSubEntry, tEnv, m_aParams); } catch (IllegalArgumentException iae) { @@ -308,7 +250,7 @@ public class java_fat implements TestBase catch (java.lang.RuntimeException e) { closeExistingOffice(); - tEnv = getEnv(entry, param); + tEnv = getEnv(entry, m_aParams); if (countInterfaceTestRun < 2) { finished = false; @@ -323,8 +265,8 @@ public class java_fat implements TestBase sumIt.summarizeUp(aSubEntry); - LogWriter sumIfc = OutProducerFactory.createOutProducer(param); - aSubEntry.UserDefinedParams = param; + LogWriter sumIfc = OutProducerFactory.createOutProducer(m_aParams); + aSubEntry.UserDefinedParams = m_aParams; sumIfc.initialize(aSubEntry, logging); sumIfc.summary(aSubEntry); } @@ -333,7 +275,7 @@ public class java_fat implements TestBase { if (!keepdocument) { - tCase.cleanupTestCase(param); + tCase.cleanupTestCase(m_aParams); } } catch (Exception e) @@ -347,7 +289,7 @@ public class java_fat implements TestBase sumIt.summarizeUp(entry); - LogWriter sumObj = OutProducerFactory.createOutProducer(param); + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); sumObj.initialize(entry, logging); sumObj.summary(entry); @@ -362,7 +304,8 @@ public class java_fat implements TestBase for (int i = 0; i < entries.length; i++) { - if (!entries[i].State.endsWith("OK")) + final String sState = entries[i].State; + if (!sState.endsWith("OK")) { System.out.println("\t " + entries[i].longName); counter++; @@ -376,6 +319,78 @@ public class java_fat implements TestBase return retValue; } +// + private TestEnvironment getTestEnvironment(TestCase tCase, DescEntry entry) + { + TestEnvironment tEnv = null; + + try + { + tEnv = tCase.getTestEnvironment(m_aParams); + } + catch (Exception e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + e.printStackTrace(); + tEnv = null; + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + tEnv = null; + } + catch (java.lang.NoClassDefFoundError e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + tEnv = null; + } + + if (tEnv == null) + { + Summarizer.summarizeDown(entry, "Couldn't create " + tCase.getObjectName()); + + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); + entry.UserDefinedParams = m_aParams; + sumObj.initialize(entry, logging); + sumObj.summary(entry); + } + return tEnv; + } + // ------------------------------------------------------------------------- + private TestCase getTestCase(DescEntry _aEntry) + { + TestCase tCase = null; + + try + { + tCase = (TestCase) m_aDynamicClassLoader.getInstance("mod._" + _aEntry.entryName); + } + catch (java.lang.IllegalArgumentException ie) + { + _aEntry.ErrorMsg = ie.getMessage(); + _aEntry.hasErrorMsg = true; + } + catch (java.lang.NoClassDefFoundError ie) + { + _aEntry.ErrorMsg = ie.getMessage(); + _aEntry.hasErrorMsg = true; + } + + if (tCase == null) + { + Summarizer.summarizeDown(_aEntry, _aEntry.ErrorMsg); + + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); + _aEntry.UserDefinedParams = m_aParams; + sumObj.initialize(_aEntry, logging); + sumObj.summary(_aEntry); + } + return tCase; +} + private void setState(DescEntry aSubEntry, lib.TestResult res) { if (res != null) @@ -393,10 +408,10 @@ public class java_fat implements TestBase private TestEnvironment getEnv(DescEntry entry, TestParameters param) { -// if (dcl == null) -// dcl = new DynamicClassLoader(); -// String officeProviderName = (String) param.get("OfficeProvider"); -// AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); +// if (m_aDynamicClassLoader == null) +// m_aDynamicClassLoader = new DynamicClassLoader(); +// String officeProviderName = (String) m_aParams.get("OfficeProvider"); +// AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); // // if (office == null) { // System.out.println("ERROR: Wrong parameter 'OfficeProvider', " + @@ -405,21 +420,21 @@ public class java_fat implements TestBase // } // // XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager( -// param); +// m_aParams); // // if (msf == null) { // return null; // } // -// param.put("ServiceFactory", msf); +// m_aParams.put("ServiceFactory", msf); - // AppProvider office = startOffice(param); + // AppProvider office = startOffice(m_aParams); TestCase tCase = null; try { - tCase = (TestCase) dcl.getInstance("mod._" + entry.entryName); + tCase = (TestCase) m_aDynamicClassLoader.getInstance("mod._" + entry.entryName); } catch (java.lang.IllegalArgumentException ie) { @@ -436,7 +451,7 @@ public class java_fat implements TestBase entry.UserDefinedParams = param; - LogWriter log = (LogWriter) dcl.getInstance((String) param.get("LogWriter")); + LogWriter log = (LogWriter) m_aDynamicClassLoader.getInstance((String) param.get("LogWriter")); log.initialize(entry, logging); tCase.setLogWriter((PrintWriter) log); @@ -472,21 +487,21 @@ public class java_fat implements TestBase if (ph != null) { m_aOffice.closeExistingOffice(m_aParams, true); - shortWait(5000); + util.utils.shortWait(5000); } } - private void shortWait(int millis) - { - try - { - Thread.sleep(millis); - } - catch (java.lang.InterruptedException ie) - { - } - } +// private void shortWait(int millis) +// { +// try +// { +// Thread.sleep(millis); +// } +// catch (java.lang.InterruptedException ie) +// { +// } +// } private Vector getExclusionList(String url, boolean debug) { @@ -551,20 +566,20 @@ public class java_fat implements TestBase DescEntry entry, TestEnvironment tEnv, TestParameters param) throws IllegalArgumentException, java.lang.NoClassDefFoundError { - MultiMethodTest ifc = (MultiMethodTest) dcl.getInstance(entry.entryName); + MultiMethodTest ifc = (MultiMethodTest) m_aDynamicClassLoader.getInstance(entry.entryName); return ifc.run(entry, tEnv, param); } private AppProvider startOffice(lib.TestParameters param) { - if (dcl == null) + if (m_aDynamicClassLoader == null) { - dcl = new DynamicClassLoader(); + m_aDynamicClassLoader = new DynamicClassLoader(); } String officeProviderName = (String) param.get("OfficeProvider"); - AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); + AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); if (office == null) { diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 90c21aa5cdad..0c8fd17e43ec 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: java_fat_service.java,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,7 +41,6 @@ import com.sun.star.lang.XMultiServiceFactory; import share.DescEntry; import share.DescGetter; import helper.APIDescGetter; -import base.TestBase; import share.LogWriter; import stats.Summarizer; @@ -177,7 +173,11 @@ public class java_fat_service implements TestBase { entry.SubEntries[j].entryName); if ((tEnv != null) && (ifc != null)) { res = ifc.run(entry.SubEntries[j],tEnv,param); - } else res = null; + } + else + { + res = null; + } } if (res != null) { for (int k=0;k<entry.SubEntries[j].SubEntryCount;k++) { @@ -230,34 +230,38 @@ public class java_fat_service implements TestBase { TestCase tCase = null; - try { - tCase = (TestCase) - dcl.getInstance("mod._"+entry.entryName); - } catch (java.lang.IllegalArgumentException ie) { + try + { + tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName); + } + catch (java.lang.IllegalArgumentException ie) + { entry.ErrorMsg=ie.getMessage(); entry.hasErrorMsg=true; } log.println("Creating: "+tCase.getObjectName()); - LogWriter log = (LogWriter)dcl.getInstance( - (String)param.get("LogWriter")); + // LogWriter log = (LogWriter)dcl.getInstance( (String)param.get("LogWriter")); log.initialize(entry,true); entry.UserDefinedParams = param; tCase.setLogWriter((PrintWriter) log); TestEnvironment tEnv = null; - try { + try + { tCase.initializeTestCase(param); tEnv = tCase.getTestEnvironment(param); - } catch (com.sun.star.lang.DisposedException de) { + } + catch (com.sun.star.lang.DisposedException de) + { log.println("Office disposed"); } return tEnv; } - protected void shortWait(int millis) { - try { - Thread.sleep(millis); - } catch (java.lang.InterruptedException ie) {} - } +// protected void shortWait(int millis) { +// try { +// Thread.sleep(millis); +// } catch (java.lang.InterruptedException ie) {} +// } } diff --git a/qadevOOo/runner/base/makefile.mk b/qadevOOo/runner/base/makefile.mk index abf6c0a6a90d..17fb497c0c8b 100644 --- a/qadevOOo/runner/base/makefile.mk +++ b/qadevOOo/runner/base/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/BasicException.java b/qadevOOo/runner/basicrunner/BasicException.java index 9a6821647919..419e26461916 100644 --- a/qadevOOo/runner/basicrunner/BasicException.java +++ b/qadevOOo/runner/basicrunner/BasicException.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicException.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/BasicHandler.java b/qadevOOo/runner/basicrunner/BasicHandler.java index 721da4931798..a0f5f5e405fc 100644 --- a/qadevOOo/runner/basicrunner/BasicHandler.java +++ b/qadevOOo/runner/basicrunner/BasicHandler.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicHandler.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java b/qadevOOo/runner/basicrunner/BasicHandlerProvider.java index ad2f7d79c7e4..9a6479d50f1d 100644 --- a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java +++ b/qadevOOo/runner/basicrunner/BasicHandlerProvider.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicHandlerProvider.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/BasicIfcTest.java b/qadevOOo/runner/basicrunner/BasicIfcTest.java index 69b8c622bba6..8c75f8ff94f0 100644 --- a/qadevOOo/runner/basicrunner/BasicIfcTest.java +++ b/qadevOOo/runner/basicrunner/BasicIfcTest.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicIfcTest.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/BasicTestCase.java b/qadevOOo/runner/basicrunner/BasicTestCase.java index f0d133a4fbde..a84e996cc09e 100644 --- a/qadevOOo/runner/basicrunner/BasicTestCase.java +++ b/qadevOOo/runner/basicrunner/BasicTestCase.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicTestCase.java,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java b/qadevOOo/runner/basicrunner/basichelper/AttributeList.java index a11544c221b3..cdcba0f6f956 100644 --- a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java +++ b/qadevOOo/runner/basicrunner/basichelper/AttributeList.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AttributeList.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/Connector.java b/qadevOOo/runner/basicrunner/basichelper/Connector.java index 0bca0b7a81e0..cc219ac9f416 100644 --- a/qadevOOo/runner/basicrunner/basichelper/Connector.java +++ b/qadevOOo/runner/basicrunner/basichelper/Connector.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Connector.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java b/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java index c80d4f791784..f50a7d2eb470 100644 --- a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java +++ b/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DispatchProviderInterceptor.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java b/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java index 473b8ef93553..62909f16dd4f 100644 --- a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java +++ b/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DocumentHandler.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/runner/basicrunner/basichelper/Filter.java index 5a66d42a4016..d9616d30e5b2 100644 --- a/qadevOOo/runner/basicrunner/basichelper/Filter.java +++ b/qadevOOo/runner/basicrunner/basichelper/Filter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Filter.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,6 @@ import com.sun.star.lang.XTypeProvider; import com.sun.star.uno.Type; import com.sun.star.container.XNameAccess; import com.sun.star.container.NoSuchElementException; -import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.XSingleServiceFactory; import com.sun.star.document.XFilter; @@ -227,7 +223,8 @@ class FilterImpl implements XInitialization, XTypeProvider, XNameAccess { public void initialize(Object[] parm1) throws com.sun.star.uno.Exception { XFilter oFilter = (XFilter)UnoRuntime.queryInterface( XFilter.class, parm1[0]); - PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]); +//? PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]); + PropertyValue[] FilterDesc = (PropertyValue[])UnoRuntime.queryInterface(PropertyValue[].class, parm1[1]); aState = "just initialized"; FilterThread aThread = new FilterThread(oFilter, FilterDesc); aThread.start(); diff --git a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java b/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java index c83241cd61e0..ec8957e01a6f 100644 --- a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java +++ b/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ThreadRunner.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/basichelper/makefile.mk b/qadevOOo/runner/basicrunner/basichelper/makefile.mk index d17c1ff0c79a..cc45b0014fb9 100644 --- a/qadevOOo/runner/basicrunner/basichelper/makefile.mk +++ b/qadevOOo/runner/basicrunner/basichelper/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/basicrunner/makefile.mk b/qadevOOo/runner/basicrunner/makefile.mk index 57aa5ee7dc14..54874a77ef48 100644 --- a/qadevOOo/runner/basicrunner/makefile.mk +++ b/qadevOOo/runner/basicrunner/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 8ee4119c149c..665980d792ab 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Assurance.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 18f89681c96e..b15224bc503f 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ComplexTestCase.java,v $ - * $Revision: 1.16.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -47,8 +44,6 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest protected static TestParameters param = null; /** Log writer **/ protected static LogWriter log = null; - /** Description entry **/ - protected DescEntry subEntry = null; /** * The method name which will be written into f.e. the data base **/ @@ -56,42 +51,33 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest /** Maximal time one method is allowed to execute * Can be set with parameter 'ThreadTimeOut' **/ - protected int mThreadTimeOut = 0; + 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; + /** - * Call test. It is expected, that an environment is - * given to this test. - * - * @param entry The name of the test method that should be called. - * @param environment The environment for the test. + * is called before the real test starts */ - public void executeMethods(DescEntry entry, TestParameters environment) + private void before() { - - // get the environment - param = environment; - log = entry.Logger; - - mThreadTimeOut = param.getInt("ThreadTimeOut"); - if (mThreadTimeOut == 0) - { - mThreadTimeOut = 300000; - } - // start with the before() method - boolean beforeWorked = true; try { Method before = this.getClass().getMethod("before", new Class[] {} ); before.invoke(this, new Object[] {} ); + + // beforeWorked = false; + m_bBeforeCalled = true; } catch (java.lang.NoSuchMethodException e) { // simply ignore + int dummy = 0; + m_bBeforeCalled = true; } catch (java.lang.IllegalAccessException e) { @@ -99,7 +85,6 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } catch (java.lang.reflect.InvocationTargetException e) { - beforeWorked = false; Throwable t = e.getTargetException(); if (!(t instanceof RuntimeException) || state) { @@ -113,12 +98,25 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } } + } - //executeMethodTests - for (int i = 0; i < entry.SubEntries.length; i++) + /** Description entry **/ + // protected DescEntry subEntry = null; + + private void test_method(DescEntry _entry) + { + + m_nThreadTimeOut = param.getInt("ThreadTimeOut"); + if (m_nThreadTimeOut == 0) { - subEntry = entry.SubEntries[i]; - if (beforeWorked) + m_nThreadTimeOut = 300000; + } + + for (int i = 0; i < _entry.SubEntries.length; i++) + { + + DescEntry subEntry = _entry.SubEntries[i]; + if (m_bBeforeCalled) { state = true; message = ""; @@ -141,10 +139,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest { String sParameter = (entryName.substring(entryName.indexOf("(") + 1, entryName.indexOf(")"))); mTestMethodName = entryName; - parameter = new String[] - { - sParameter - }; + parameter = new String[] { sParameter }; entryName = entryName.substring(0, entryName.indexOf("(")); testMethod = this.getClass().getMethod(entryName, new Class[] { String.class }); } @@ -173,7 +168,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest int sleepingStep = 1000; int factor = 0; - while (th.isAlive() && (lastPing != newPing || factor * sleepingStep < mThreadTimeOut)) + while (th.isAlive() && (lastPing != newPing || factor * sleepingStep < m_nThreadTimeOut)) { Thread.sleep(sleepingStep); factor++; @@ -196,7 +191,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest { log.println("Destroy " + mTestMethodName); th.destroy(); - subEntry.State = "Test did sleep for " + (mThreadTimeOut / 1000) + " seconds and has been killed!"; + subEntry.State = "Test did sleep for " + (m_nThreadTimeOut / 1000) + " seconds and has been killed!"; subEntry.hasErrorMsg = true; subEntry.ErrorMsg = subEntry.State; continue; @@ -228,8 +223,14 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest subEntry.hasErrorMsg = !state; subEntry.ErrorMsg = message; } + } - if (beforeWorked) + /** + * after() is called after the test is done + */ + private void after() + { + if (m_bBeforeCalled) { // the after() method try @@ -264,8 +265,38 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } } } + + } + + + + /** + * Call test. It is expected, that an environment is + * given to this test. + * + * @param entry The name of the test method that should be called. + * @param environment The environment for the test. + */ + public void executeMethods(DescEntry entry, TestParameters environment) + { + m_bBeforeCalled = false; + + // get the environment + param = environment; + log = entry.Logger; + + + // start with the before() method + before(); + + //executeMethodTests + test_method(entry); + + // cleanup + after(); } + /** * Implement this method in the Complex test. * @return All test method names. diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/runner/complexlib/ShowTargets.java index c48db7092d09..6f46a389d14b 100644 --- a/qadevOOo/runner/complexlib/ShowTargets.java +++ b/qadevOOo/runner/complexlib/ShowTargets.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ShowTargets.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/complexlib/makefile.mk b/qadevOOo/runner/complexlib/makefile.mk index 1e8c70d58889..7af514193c12 100644 --- a/qadevOOo/runner/complexlib/makefile.mk +++ b/qadevOOo/runner/complexlib/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/Basename.java b/qadevOOo/runner/convwatch/Basename.java index 5691b94ed65c..05381e841eed 100644 --- a/qadevOOo/runner/convwatch/Basename.java +++ b/qadevOOo/runner/convwatch/Basename.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Basename.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index 5ac5d569954f..986f6ff6582b 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BorderRemover.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java index fed56715fafa..efb091d160f9 100644 --- a/qadevOOo/runner/convwatch/BuildID.java +++ b/qadevOOo/runner/convwatch/BuildID.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BuildID.java,v $ - * $Revision: 1.6.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -139,28 +136,28 @@ public class BuildID } return sBuildID; } - public static void main(String[] args) - { - String sApp; - sApp = "/opt/staroffice8_m116/program/soffice -headless -accept=socket,host=localhost,port=8100;urp;"; - String sBuildID; - sBuildID = getBuildID(sApp); - System.out.println("BuildID is: " + sBuildID); - - Date aDate = new Date(); - long nStart = aDate.getTime(); - System.out.println("Time:" + nStart); - // LLA: Just some more tests for getBuildID - // 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); - } +// public static void main(String[] args) +// { +// String sApp; +// sApp = "/opt/staroffice8_m116/program/soffice -headless -accept=socket,host=localhost,port=8100;urp;"; +// String sBuildID; +// sBuildID = getBuildID(sApp); +// System.out.println("BuildID is: " + sBuildID); +// +// Date aDate = new Date(); +// long nStart = aDate.getTime(); +// System.out.println("Time:" + nStart); +// // LLA: Just some more tests for getBuildID +// // 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/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index 028e9e91a8c4..76dc3522d2e0 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ConvWatch.java,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ConvWatchCancelException.java b/qadevOOo/runner/convwatch/ConvWatchCancelException.java index bff9307272fc..2042f600b4cc 100644 --- a/qadevOOo/runner/convwatch/ConvWatchCancelException.java +++ b/qadevOOo/runner/convwatch/ConvWatchCancelException.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ConvWatchCancelException.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ConvWatchException.java b/qadevOOo/runner/convwatch/ConvWatchException.java index b7bd407bff61..f0fab0852deb 100644 --- a/qadevOOo/runner/convwatch/ConvWatchException.java +++ b/qadevOOo/runner/convwatch/ConvWatchException.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ConvWatchException.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index 59ff029f0ba8..c81ba3dfca85 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ConvWatchStarter.java,v $ - * $Revision: 1.11.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/CrashLoopTest.java b/qadevOOo/runner/convwatch/CrashLoopTest.java index e56444fe35c2..6eb7b35391b8 100644 --- a/qadevOOo/runner/convwatch/CrashLoopTest.java +++ b/qadevOOo/runner/convwatch/CrashLoopTest.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: CrashLoopTest.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 6484c1655306..e28fafb65ec4 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DBHelper.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/DateHelper.java b/qadevOOo/runner/convwatch/DateHelper.java index b90d836d6776..59207ea3ee3a 100755 --- a/qadevOOo/runner/convwatch/DateHelper.java +++ b/qadevOOo/runner/convwatch/DateHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DateHelper.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index ddb0c2c71166..a15d790b9c25 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DirectoryHelper.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index 917e71273925..f6583dd5fdbc 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DocumentConverter.java,v $ - * $Revision: 1.8.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java index d42d46374dc4..7c51940d7801 100644 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: EnhancedComplexTestCase.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 56d27c5abb52..2ff9ede2f8d4 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FileHelper.java,v $ - * $Revision: 1.8.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 59d2045937c0..3d49703dc995 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FilenameHelper.java,v $ - * $Revision: 1.5.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/GfxCompare.java b/qadevOOo/runner/convwatch/GfxCompare.java index 8e6ac397eb02..b45897475c23 100644 --- a/qadevOOo/runner/convwatch/GfxCompare.java +++ b/qadevOOo/runner/convwatch/GfxCompare.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GfxCompare.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/GlobalLogWriter.java b/qadevOOo/runner/convwatch/GlobalLogWriter.java index 349280c0edae..fe785915cc02 100644 --- a/qadevOOo/runner/convwatch/GlobalLogWriter.java +++ b/qadevOOo/runner/convwatch/GlobalLogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GlobalLogWriter.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java index af5fb0921762..efce96c1c15b 100644 --- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java +++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GraphicalDifferenceCheck.java,v $ - * $Revision: 1.8.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 127743f091f5..72d732d3d8de 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GraphicalTestArguments.java,v $ - * $Revision: 1.13.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index d68e08904892..49edb2c25ac0 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: HTMLOutputter.java,v $ - * $Revision: 1.9.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index 80ddaab51c98..faa542a05cb8 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: INIOutputter.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 7c38b10fba30..6eec5dee6b63 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ImageHelper.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 83cff8595678..fbcaaea0b33b 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IniFile.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -438,18 +435,18 @@ class IniFile /** * some tests for this class */ - public static void main(String[] args) - { - IniFile aIniFile = new IniFile("/tmp/inifile"); - String sValue = aIniFile.getValue("Section","Key"); - // insert a new value to a already exist section - aIniFile.insertValue("Section","Key2","a new value in a existing section"); - // replace a value - aIniFile.insertValue("Section","Key","replaced value"); - // create a new value - aIniFile.insertValue("New Section", "Key", "a new key value pair"); - - String sValue2 = aIniFile.getValue("Section2","Key"); - aIniFile.store(); - } +// public static void main(String[] args) +// { +// IniFile aIniFile = new IniFile("/tmp/inifile"); +// String sValue = aIniFile.getValue("Section","Key"); +// // insert a new value to a already exist section +// aIniFile.insertValue("Section","Key2","a new value in a existing section"); +// // replace a value +// aIniFile.insertValue("Section","Key","replaced value"); +// // create a new value +// aIniFile.insertValue("New Section", "Key", "a new key value pair"); +// +// String sValue2 = aIniFile.getValue("Section2","Key"); +// aIniFile.store(); +// } } diff --git a/qadevOOo/runner/convwatch/LISTOutputter.java b/qadevOOo/runner/convwatch/LISTOutputter.java index ada144e03066..87c13ea0477a 100644 --- a/qadevOOo/runner/convwatch/LISTOutputter.java +++ b/qadevOOo/runner/convwatch/LISTOutputter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: LISTOutputter.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index be5fc70568fe..5be0cfe058ce 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: MSOfficePrint.java,v $ - * $Revision: 1.11.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/NameHelper.java b/qadevOOo/runner/convwatch/NameHelper.java index 05c1b36cdf2a..cddf3aca75f2 100644 --- a/qadevOOo/runner/convwatch/NameHelper.java +++ b/qadevOOo/runner/convwatch/NameHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: NameHelper.java,v $ - * $Revision: 1.5.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/OSHelper.java b/qadevOOo/runner/convwatch/OSHelper.java index 9924dbd89c11..1fbf804831d7 100644 --- a/qadevOOo/runner/convwatch/OSHelper.java +++ b/qadevOOo/runner/convwatch/OSHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OSHelper.java,v $ - * $Revision: 1.6.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 7f8e32733246..7f9b86f2f920 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OfficePrint.java,v $ - * $Revision: 1.10.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -111,7 +108,8 @@ public class OfficePrint { } catch (com.sun.star.lang.IllegalArgumentException e) { - GlobalLogWriter.get().println("showProperty: can't convert a object to string."); + // GlobalLogWriter.get().println("showProperty: can't convert a object to string."); + GlobalLogWriter.get().println("Property " + sName + ":= a Object which can't convert by AnyConverter()"); } } @@ -630,11 +628,12 @@ public class OfficePrint { { XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings ); xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) ); + GlobalLogWriter.get().println("PrintAllSheets := true"); } } ArrayList aPrintProps = new ArrayList(); - GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); + // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); // PropertyValue [] aPrintProps = new PropertyValue[nProperties]; PropertyValue Arg = new PropertyValue(); @@ -642,7 +641,7 @@ public class OfficePrint { Arg.Value = _sPrintFileURL; // aPrintProps[nPropsCount ++] = Arg; aPrintProps.add(Arg); - // showProperty(Arg); + showProperty(Arg); if (_aGTA.printAllPages() == false) { @@ -664,8 +663,8 @@ public class OfficePrint { Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); + showProperty(Arg); } - showProperty(Arg); // GlobalLogWriter.get().println("Start printing."); diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index f21d3f1821c4..1d0503299d67 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PRNCompare.java,v $ - * $Revision: 1.8.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index 3846f7c69f10..d0c1e0fb5ed1 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PerformanceContainer.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -235,18 +232,19 @@ public class PerformanceContainer /* extends *//* implements */ { } } - public static void main(String[] args) { +// public static void main(String[] args) { +// +///* +// BorderRemover a = new BorderRemover(); +// try +// { +// a.createNewImageWithoutBorder(args[0], args[1]); +// } +// catch(java.io.IOException e) +// { +// System.out.println("Exception caught."); +// } +// */ +// } -/* - BorderRemover a = new BorderRemover(); - try - { - a.createNewImageWithoutBorder(args[0], args[1]); - } - catch(java.io.IOException e) - { - System.out.println("Exception caught."); - } - */ - } } diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 3e1a5adec731..116b07e48d8e 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PixelCounter.java,v $ - * $Revision: 1.4.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -187,22 +184,23 @@ public class PixelCounter { // ----------------------------------------------------------------------------- - public static void main(String[] args) { +// public static void main(String[] args) { +// +// String a = helper.StringHelper.createValueString(10, 4); +// int dummy = 1; +///* +// BorderRemover a = new BorderRemover(); +// try +// { +// a.createNewImageWithoutBorder(args[0], args[1]); +// } +// catch(java.io.IOException e) +// { +// System.out.println("Exception caught."); +// } +// */ +// } - String a = helper.StringHelper.createValueString(10, 4); - int dummy = 1; -/* - BorderRemover a = new BorderRemover(); - try - { - a.createNewImageWithoutBorder(args[0], args[1]); - } - catch(java.io.IOException e) - { - System.out.println("Exception caught."); - } - */ - } } diff --git a/qadevOOo/runner/convwatch/PropertyName.java b/qadevOOo/runner/convwatch/PropertyName.java index 824fb4d1d384..00130faf50e3 100644 --- a/qadevOOo/runner/convwatch/PropertyName.java +++ b/qadevOOo/runner/convwatch/PropertyName.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyName.java,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index ec3170d025c8..076d5f5804f4 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ReferenceBuilder.java,v $ - * $Revision: 1.12.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 0467ab131112..703a2b2f3073 100755 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -3,13 +3,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ReportDesignerTest.java,v $ - * $Revision: 1.4.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java index ff00c1bff0c7..9d608bdb332b 100644 --- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java +++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleFileSemaphore.java,v $ - * $Revision: 1.3.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java index 4554a788e1e6..d37fa4a79af4 100644 --- a/qadevOOo/runner/convwatch/StatusHelper.java +++ b/qadevOOo/runner/convwatch/StatusHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StatusHelper.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/StringHelper.java b/qadevOOo/runner/convwatch/StringHelper.java index 7042382bc052..b20e3b6bea01 100644 --- a/qadevOOo/runner/convwatch/StringHelper.java +++ b/qadevOOo/runner/convwatch/StringHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StringHelper.java,v $ - * $Revision: 1.5.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/TimeHelper.java b/qadevOOo/runner/convwatch/TimeHelper.java index 2de3edfeef45..923568db51c8 100755 --- a/qadevOOo/runner/convwatch/TimeHelper.java +++ b/qadevOOo/runner/convwatch/TimeHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TimeHelper.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 35e5d9f4c10c..7a9e9312c6bb 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TriState.java,v $ - * $Revision: 1.3.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/ValueNotFoundException.java b/qadevOOo/runner/convwatch/ValueNotFoundException.java index 8a9a55bd2dc4..04957187d126 100644 --- a/qadevOOo/runner/convwatch/ValueNotFoundException.java +++ b/qadevOOo/runner/convwatch/ValueNotFoundException.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ValueNotFoundException.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/convwatch/makefile.mk b/qadevOOo/runner/convwatch/makefile.mk index 61d8dfcaf360..aed1532cea6e 100644 --- a/qadevOOo/runner/convwatch/makefile.mk +++ b/qadevOOo/runner/convwatch/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.13.8.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index 7621e29141d5..4c5907ff34ad 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/qadevOOo/runner/graphical/BuildID.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BuildID.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,20 +32,23 @@ import helper.OSHelper; public class BuildID { - public static String getBuildID(String _sApp) + private static String getOfficePath(String _sApp) + { + String sOfficePath = ""; + // TODO: StringHelper.removeQuote? + if (_sApp.startsWith("\"")) { - String sOfficePath = ""; - // TODO: StringHelper.removeQuote? - if (_sApp.startsWith("\"")) + int nIdx = _sApp.indexOf("\"", 1); + if (nIdx != -1) { - int nIdx = _sApp.indexOf("\"", 1); - if (nIdx != -1) - { - // leave double qoute out. - sOfficePath = _sApp.substring(1, nIdx); - } + // leave double qoute out. + sOfficePath = _sApp.substring(1, nIdx); } - else + } + else + { + // check if _sApp ends with the office executable, if not + if (! (_sApp.endsWith("soffice.exe") || _sApp.endsWith("soffice"))) { // check if a space exist, so we get all until space int nIdx = _sApp.indexOf(" ", 1); @@ -61,19 +61,34 @@ public class BuildID sOfficePath = _sApp.substring(0, nIdx); } } - GlobalLogWriter.get().println("Office path: " + sOfficePath); + else + { + sOfficePath = _sApp; + } + } + // GlobalLogWriter.get().println("Office path: " + sOfficePath); + return sOfficePath; + } - // String fs = System.getProperty("file.separator"); + public static String getBuildID(String _sApp) + { + final String sOfficePath = getOfficePath(_sApp); + final String sBuildID = getBuildID(sOfficePath, "buildid"); + return sBuildID; + } + + private static String getBuildID(String _sOfficePath, String _sIniSection) + { + File aSOfficeFile = new File(_sOfficePath); String sBuildID = ""; - File aSOfficeFile = new File(sOfficePath); if (aSOfficeFile.exists()) { - sOfficePath = FileHelper.getPath(sOfficePath); + String sOfficePath = FileHelper.getPath(_sOfficePath); // ok. System.out.println("directory: " + sOfficePath); - sBuildID = getBuildIDFromBootstrap(sOfficePath); + sBuildID = getBuildIDFromBootstrap(sOfficePath, _sIniSection); if (sBuildID.length() == 0) { - sBuildID = getBuildIDFromVersion(sOfficePath); + sBuildID = getBuildIDFromVersion(sOfficePath, _sIniSection); } } else @@ -85,7 +100,7 @@ public class BuildID return sBuildID; } - private static String getBuildIDFromBootstrap(String _sOfficePath) + private static String getBuildIDFromBootstrap(String _sOfficePath, String _sIniSection) { String sBuildID = ""; String sOfficePath; @@ -100,7 +115,7 @@ public class BuildID IniFile aIniFile = new IniFile(sOfficePath); if (aIniFile.is()) { - sBuildID = aIniFile.getValue("Bootstrap", "buildid"); + sBuildID = aIniFile.getValue("Bootstrap", /*"buildid"*/ _sIniSection); } else { @@ -109,7 +124,7 @@ public class BuildID return sBuildID; } - private static String getBuildIDFromVersion(String _sOfficePath) + private static String getBuildIDFromVersion(String _sOfficePath, String _sIniSection) { // String fs = System.getProperty("file.separator"); String sBuildID = ""; @@ -125,7 +140,7 @@ public class BuildID IniFile aIniFile = new IniFile(sOfficePath); if (aIniFile.is()) { - sBuildID = aIniFile.getValue("Version", "buildid"); + sBuildID = aIniFile.getValue("Version", /*"buildid"*/ _sIniSection); } else { @@ -157,5 +172,55 @@ public class BuildID // System.exit(1); // } -} + public static String getMaster(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sMaster = getBuildID(sOfficePath, "ProductSource"); + return sMaster; + } + + public static String getMinor(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sMinor = "m" + getBuildID(sOfficePath, "ProductMinor"); + return sMinor; + } + public static String getCWSName(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sBuildID = getBuildID(sOfficePath, "buildid"); + String sCWSName = "MWS"; + int nIdx = sBuildID.indexOf("[CWS:"); + if (nIdx > 0) + { + int nIdx2 = sBuildID.indexOf("]", nIdx); + sCWSName = sBuildID.substring(nIdx + 5, nIdx2); + } + return sCWSName; + } + +// public static void main(String[] args) +// { +// String sApp; +// sApp = "D:/staroffice9_m63/Sun/StarOffice 9/program/soffice.exe"; +// String sBuildID; +// sBuildID = getBuildID(sApp); +// System.out.println("BuildID is: " + sBuildID); +// +// String sMaster; +// sMaster = getMaster(sApp); +// System.out.println("Master is: " + sMaster); +// +// String sMinor; +// sMinor = getMinor(sApp); +// System.out.println("Minor is: " + sMinor); +// +// String sCWSName; +// sCWSName = getCWSName(sApp); +// System.out.println("CWSName is: " + sCWSName); +// +// System.exit(1); +// } + +} diff --git a/qadevOOo/runner/graphical/DateHelper.java b/qadevOOo/runner/graphical/DateHelper.java index fc64aadc62d7..07a5c5844099 100644 --- a/qadevOOo/runner/graphical/DateHelper.java +++ b/qadevOOo/runner/graphical/DateHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DateHelper.java,v $ - * $Revision: 1.1.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index 08dbca6936e6..f3349da2800a 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DirectoryHelper.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index 49c893d47194..b465437f578f 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: EnhancedComplexTestCase.java,v $ - * $Revision: 1.1.2.7 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 9d11035f73b7..feb9e152e5d9 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FileHelper.java,v $ - * $Revision: 1.1.2.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/GlobalLogWriter.java b/qadevOOo/runner/graphical/GlobalLogWriter.java index 52c8fbffe5be..a8deabfbce0a 100644 --- a/qadevOOo/runner/graphical/GlobalLogWriter.java +++ b/qadevOOo/runner/graphical/GlobalLogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GlobalLogWriter.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/HTMLResult.java b/qadevOOo/runner/graphical/HTMLResult.java index 25fc097d28c7..85ee0e88d356 100644 --- a/qadevOOo/runner/graphical/HTMLResult.java +++ b/qadevOOo/runner/graphical/HTMLResult.java @@ -3,13 +3,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: HTMLResult.java,v $ - * $Revision: 1.1.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/runner/graphical/IDocument.java index 19f17f0ec9bf..3f724d5c5d9c 100644 --- a/qadevOOo/runner/graphical/IDocument.java +++ b/qadevOOo/runner/graphical/IDocument.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IDocument.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/IOffice.java b/qadevOOo/runner/graphical/IOffice.java index 7e7c5b8acae9..ec1dc3b7371f 100644 --- a/qadevOOo/runner/graphical/IOffice.java +++ b/qadevOOo/runner/graphical/IOffice.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IOffice.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index a35e730872d6..e016e08f0df1 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ImageHelper.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 1934dc39731a..832aef795e71 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IniFile.java,v $ - * $Revision: 1.1.2.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -591,29 +588,29 @@ public class IniFile implements Enumeration /** * some tests for this class */ - public static void main(String[] args) - { - String sTempFile = System.getProperty("java.io.tmpdir"); - sTempFile += "inifile"; - - - IniFile aIniFile = new IniFile(sTempFile); - String sValue = aIniFile.getValue("Section", "Key"); - // insert a new value to a already exist section - aIniFile.insertValue("Section", "Key2", "a new value in a existing section"); - // replace a value - aIniFile.insertValue("Section", "Key", "replaced value"); - // create a new value - aIniFile.insertValue("New Section", "Key", "a new key value pair"); - aIniFile.insertValue("New Section", "Key2", "a new second key value pair"); - - String sValue2 = aIniFile.getValue("Section2", "Key"); - - aIniFile.removeSection("Section"); - aIniFile.removeSection("New Section"); - - aIniFile.close(); - } +// public static void main(String[] args) +// { +// String sTempFile = System.getProperty("java.io.tmpdir"); +// sTempFile += "inifile"; +// +// +// IniFile aIniFile = new IniFile(sTempFile); +// String sValue = aIniFile.getValue("Section", "Key"); +// // insert a new value to a already exist section +// aIniFile.insertValue("Section", "Key2", "a new value in a existing section"); +// // replace a value +// aIniFile.insertValue("Section", "Key", "replaced value"); +// // create a new value +// aIniFile.insertValue("New Section", "Key", "a new key value pair"); +// aIniFile.insertValue("New Section", "Key2", "a new second key value pair"); +// +// String sValue2 = aIniFile.getValue("Section2", "Key"); +// +// aIniFile.removeSection("Section"); +// aIniFile.removeSection("New Section"); +// +// aIniFile.close(); +// } /** * Enumeration Interface diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index 126d06e11ffc..ed3417e04c9c 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: JPEGComparator.java,v $ - * $Revision: 1.1.2.6 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ @@ -341,6 +338,8 @@ 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"; // String sDifferencePath = sDestinationPath; @@ -646,30 +645,30 @@ public class JPEGComparator extends EnhancedComplexTestCase - public static void main(String [] _args) - { -// give an index.ini file, ok -// give a directory, where exist jpeg files ok -// inputpath (given file) doesn't exists -// give a jpeg file. - - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.JPEGComparator", - "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", - "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2", -// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\GroupReport.odt.pdf_180DPI_0001.jpg", -// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2\\Report1.odt.pdf_180DPI_0001.jpg", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -// "-OFFICE_VIEWABLE", "false", -// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-NoOffice" - }; - - org.openoffice.Runner.main(args); - } +// public static void main(String [] _args) +// { +//// give an index.ini file, ok +//// give a directory, where exist jpeg files ok +//// inputpath (given file) doesn't exists +//// give a jpeg file. +// +// String args[] = { +// "-TimeOut", "3600000", +// "-tb", "java_complex", +// "-o", "graphical.JPEGComparator", +// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2", +//// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\GroupReport.odt.pdf_180DPI_0001.jpg", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2\\Report1.odt.pdf_180DPI_0001.jpg", +// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +//// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +// "-NoOffice" +// }; +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index afda4eb39b07..5f6343d9780d 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: JPEGCreator.java,v $ - * $Revision: 1.1.2.2 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ @@ -127,9 +124,14 @@ public class JPEGCreator extends EnhancedComplexTestCase */ public static void convertToNearSameFileWithWidth340(String _sJPEGFilename) { + String sJPEGFilename = _sJPEGFilename.replaceAll("\\\\", "/"); +// if (OSHelper.isWindows()) +// { +// sJPEGFilename = sJPEGFilename.replaceAll("/", "\\\\"); +// } String sNewJPEGFilename; - sNewJPEGFilename = util.utils.replaceAll13(_sJPEGFilename, ".jpg", "_w340.jpg"); - convertToWidth340(_sJPEGFilename, sNewJPEGFilename); + sNewJPEGFilename = util.utils.replaceAll13(sJPEGFilename, ".jpg", "_w340.jpg"); + convertToWidth340(sJPEGFilename, sNewJPEGFilename); } /** @@ -156,7 +158,9 @@ private static void convertToWidth340(String _sFrom, String _To) } if (OSHelper.isWindows()) { - sConvertEXE = "convert.exe"; + // TODO! + // HACK Hard coded! + sConvertEXE = "C:\\Programme\\ImageMagick-6.0.3-q8\\convert.exe"; } String[] sCommandArray = @@ -381,14 +385,34 @@ private static void convertToWidth340(String _sFrom, String _To) return nPages; } - public static void main(String [] _args) - { -// DONE: give an index.ini file ok +// public static void main(String [] _args) +// { +//// DONE: give an index.ini file ok +//// String args[] = { +//// "-TimeOut", "3600000", +//// "-tb", "java_complex", +//// "-o", "graphical.JPEGCreator", +//// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", +//// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", +//// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", +//// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +////// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +//// "-NoOffice" +//// }; +// +//// Done: give a directory, where exist pdf/ps files ok. +//// Done: inputpath (given file) doesn't exists, ok. +//// Done: give a ps/pdf file. ok. +// // String args[] = { // "-TimeOut", "3600000", // "-tb", "java_complex", // "-o", "graphical.JPEGCreator", -// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\Names7.odt.pdf", // "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", // "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", // "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", @@ -399,28 +423,8 @@ private static void convertToWidth340(String _sFrom, String _To) // "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", // "-NoOffice" // }; - -// Done: give a directory, where exist pdf/ps files ok. -// Done: inputpath (given file) doesn't exists, ok. -// Done: give a ps/pdf file. ok. - - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.JPEGCreator", - "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\Names7.odt.pdf", - "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", - "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", - "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -// "-OFFICE_VIEWABLE", "false", - "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-NoOffice" - }; - - org.openoffice.Runner.main(args); - } +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/graphical/JPEGEvaluator.java b/qadevOOo/runner/graphical/JPEGEvaluator.java index 78fb0a77ecdd..07b265b62355 100644 --- a/qadevOOo/runner/graphical/JPEGEvaluator.java +++ b/qadevOOo/runner/graphical/JPEGEvaluator.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: JPEGEvaluator.java,v $ - * $Revision: 1.1.2.4 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index df88934652e1..8a85c6b32afd 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: MSOfficePostscriptCreator.java,v $ - * $Revision: 1.1.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -983,8 +980,8 @@ public class MSOfficePostscriptCreator implements IOffice return sType; } - public static void main(String [] _args) - { - String sTest = getXMLDocumentFormat("c:/cws/temp/input/Blah Fasel.xml"); - } +// public static void main(String [] _args) +// { +// String sTest = getXMLDocumentFormat("c:/cws/temp/input/Blah Fasel.xml"); +// } } diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java index 82d8ecea676a..88aeebc6b049 100644 --- a/qadevOOo/runner/graphical/Office.java +++ b/qadevOOo/runner/graphical/Office.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Office.java,v $ - * $Revision: 1.1.2.4 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/OfficeException.java b/qadevOOo/runner/graphical/OfficeException.java index 158cfdf44df8..bc5a24fd5b97 100644 --- a/qadevOOo/runner/graphical/OfficeException.java +++ b/qadevOOo/runner/graphical/OfficeException.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OfficeException.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java index e05883c54c32..a325ba5aaf0d 100644 --- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java +++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OpenOfficeDatabaseReportExtractor.java,v $ - * $Revision: 1.1.2.3 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 9d430dad66f4..06330a06d9ab 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OpenOfficePostscriptCreator.java,v $ - * $Revision: 1.1.2.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -602,11 +599,12 @@ public class OpenOfficePostscriptCreator implements IOffice { XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings ); xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) ); + GlobalLogWriter.get().println("PrintAllSheets := true"); } } ArrayList aPrintProps = new ArrayList(); - GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); + // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); // PropertyValue [] aPrintProps = new PropertyValue[nProperties]; PropertyValue Arg = new PropertyValue(); @@ -614,7 +612,7 @@ public class OpenOfficePostscriptCreator implements IOffice Arg.Value = _sPrintFileURL; // aPrintProps[nPropsCount ++] = Arg; aPrintProps.add(Arg); - // showProperty(Arg); + showProperty(Arg); // generate pages string @@ -638,8 +636,8 @@ public class OpenOfficePostscriptCreator implements IOffice Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); + showProperty(Arg); } - showProperty(Arg); // GlobalLogWriter.get().println("Start printing."); @@ -669,6 +667,8 @@ public class OpenOfficePostscriptCreator implements IOffice throw new com.sun.star.uno.Exception("Convwatch exception, wait too long for printing."); } } + // TimeHelper.waitInSeconds(40, "Start waiting after print ready."); + _aGTA.getPerformance().stopTime(PerformanceContainer.Print); GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Print document done."); diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index da727ad844cd..e3545a56e73b 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ParameterHelper.java,v $ - * $Revision: 1.1.2.3 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java index de6560be39ac..c31d1efb79db 100644 --- a/qadevOOo/runner/graphical/PerformanceContainer.java +++ b/qadevOOo/runner/graphical/PerformanceContainer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PerformanceContainer.java,v $ - * $Revision: 1.1.2.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java index 02f4a4d8361d..e625c2a75b12 100644 --- a/qadevOOo/runner/graphical/PixelCounter.java +++ b/qadevOOo/runner/graphical/PixelCounter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PixelCounter.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/runner/graphical/PostscriptCreator.java index c4a3a77c7d6f..ab7ad4536fa6 100644 --- a/qadevOOo/runner/graphical/PostscriptCreator.java +++ b/qadevOOo/runner/graphical/PostscriptCreator.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PostscriptCreator.java,v $ - * $Revision: 1.1.2.3 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ @@ -101,40 +98,40 @@ public class PostscriptCreator extends EnhancedComplexTestCase - public static void main(String [] _args) - { - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.PostscriptCreator", -// "-DOC_COMPARATOR_INPUT_PATH", "D:\\temp\\input", -// "-DOC_COMPARATOR_OUTPUT_PATH", "D:\\temp\\output", -// "-DOC_COMPARATOR_REFERENCE_PATH", "D:\\temp\\output\\ref", -// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", -// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", -// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -//// "-OFFICE_VIEWABLE", "false", -// "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", -//// "-NoOffice" - "-DOC_COMPARATOR_PRINT_MAX_PAGE","9999", - "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION","180", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX","http://so-gfxcmp.germany.sun.com/gfxcmp_ui/cw.php?inifile=", - "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE","OOo", - "-DOC_COMPARATOR_DB_INFO_STRING","p:DEV300_m18,c:,d:LLA_test,src:DEV300_m18,dest:,doc:LLA_test,id:34715,distinct:2008-06-27_13-39-09_d6f22d4c-958d-10", - "-DISTINCT","2008-06-27_13-39-09_d6f22d4c-958d-10", - "-TEMPPATH","//so-gfxcmp-lin/gfxcmp-data/wntmsci/temp/2008-06-27_13-39-09_d6f22d4c-958d-10/34715", -// "ConnectionString","socket,host=localhost,port=8101", - "-OFFICE_VIEWABLE","true", - "-wntmsci.DOC_COMPARATOR_INPUT_PATH","\\\\so-gfxcmp-lin\\doc-pool\\LLA_test\\issue_79214.odb", - "-wntmsci.DOC_COMPARATOR_OUTPUT_PATH","\\\\so-gfxcmp-lin\\gfxcmp-data\\wntmsci\\convwatch-output\\LLA_test\\DEV300_m11", - "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-wntmsci.AppKillCommand","\"C:\\bin\\pskill.exe soffice.bin;C:\\bin\\pskill.exe winword;C:\\bin\\pskill.exe excel\"", - - }; - - org.openoffice.Runner.main(args); - } +// public static void main(String [] _args) +// { +// String args[] = { +// "-TimeOut", "3600000", +// "-tb", "java_complex", +// "-o", "graphical.PostscriptCreator", +//// "-DOC_COMPARATOR_INPUT_PATH", "D:\\temp\\input", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "D:\\temp\\output", +//// "-DOC_COMPARATOR_REFERENCE_PATH", "D:\\temp\\output\\ref", +//// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", +//// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", +//// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +////// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +////// "-NoOffice" +// "-DOC_COMPARATOR_PRINT_MAX_PAGE","9999", +// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION","180", +// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX","http://so-gfxcmp.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE","OOo", +// "-DOC_COMPARATOR_DB_INFO_STRING","p:DEV300_m18,c:,d:LLA_test,src:DEV300_m18,dest:,doc:LLA_test,id:34715,distinct:2008-06-27_13-39-09_d6f22d4c-958d-10", +// "-DISTINCT","2008-06-27_13-39-09_d6f22d4c-958d-10", +// "-TEMPPATH","//so-gfxcmp-lin/gfxcmp-data/wntmsci/temp/2008-06-27_13-39-09_d6f22d4c-958d-10/34715", +//// "ConnectionString","socket,host=localhost,port=8101", +// "-OFFICE_VIEWABLE","true", +// "-wntmsci.DOC_COMPARATOR_INPUT_PATH","\\\\so-gfxcmp-lin\\doc-pool\\LLA_test\\issue_79214.odb", +// "-wntmsci.DOC_COMPARATOR_OUTPUT_PATH","\\\\so-gfxcmp-lin\\gfxcmp-data\\wntmsci\\convwatch-output\\LLA_test\\DEV300_m11", +// "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +// "-wntmsci.AppKillCommand","\"C:\\bin\\pskill.exe soffice.bin;C:\\bin\\pskill.exe winword;C:\\bin\\pskill.exe excel\"", +// +// }; +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index 8a4b537724fb..8ca2835e8086 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyName.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java index 73e741663a89..d0180d82e423 100644 --- a/qadevOOo/runner/graphical/TimeHelper.java +++ b/qadevOOo/runner/graphical/TimeHelper.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TimeHelper.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/WrongEnvironmentException.java b/qadevOOo/runner/graphical/WrongEnvironmentException.java index f306355a4002..24ab5532b2e7 100644 --- a/qadevOOo/runner/graphical/WrongEnvironmentException.java +++ b/qadevOOo/runner/graphical/WrongEnvironmentException.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: WrongEnvironmentException.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/WrongSuffixException.java b/qadevOOo/runner/graphical/WrongSuffixException.java index 2e795e23d9f2..d8632ea50e72 100644 --- a/qadevOOo/runner/graphical/WrongSuffixException.java +++ b/qadevOOo/runner/graphical/WrongSuffixException.java @@ -1,31 +1,28 @@ /* * ************************************************************************ * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: WrongSuffixException.java,v $ - * $Revision: 1.1.2.1 $ + * This file is part of OpenOffice.org. * - * 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 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). * - * 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> - * for a copy of the LGPLv3 License. + * 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> + * for a copy of the LGPLv3 License. * * *********************************************************************** */ diff --git a/qadevOOo/runner/graphical/makefile.mk b/qadevOOo/runner/graphical/makefile.mk index dc940c4ecd56..db1f84ca26ca 100644 --- a/qadevOOo/runner/graphical/makefile.mk +++ b/qadevOOo/runner/graphical/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.1.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 036487fb9856..9e980b273896 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: APIDescGetter.java,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/runner/helper/AppProvider.java index 8a43504626f4..f8cf7e9737db 100644 --- a/qadevOOo/runner/helper/AppProvider.java +++ b/qadevOOo/runner/helper/AppProvider.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AppProvider.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java index 95c6446477c3..296b56877717 100644 --- a/qadevOOo/runner/helper/BuildEnvTools.java +++ b/qadevOOo/runner/helper/BuildEnvTools.java @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BuildEnvTools.java,v $ - * - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index 19d2d561f666..f4f919c5cfc4 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: CfgParser.java,v $ - * $Revision: 1.8.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java index c88b14a6028b..7e54bccb174e 100644 --- a/qadevOOo/runner/helper/ClParser.java +++ b/qadevOOo/runner/helper/ClParser.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ClParser.java,v $ - * $Revision: 1.12.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index 5ed9efcbb702..287c0402fb77 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ComplexDescGetter.java,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/runner/helper/ConfigurationRead.java index 735c7033aed1..e82fe6141b72 100644 --- a/qadevOOo/runner/helper/ConfigurationRead.java +++ b/qadevOOo/runner/helper/ConfigurationRead.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ConfigurationRead.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/runner/helper/ContextMenuInterceptor.java index 834631bc6928..a14685365c74 100644 --- a/qadevOOo/runner/helper/ContextMenuInterceptor.java +++ b/qadevOOo/runner/helper/ContextMenuInterceptor.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ContextMenuInterceptor.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java index 6884d6c27d8e..15292f20d725 100644 --- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java +++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java @@ -3,13 +3,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: CwsDataExchangeImpl.java,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/runner/helper/FileTools.java index b7d8b9f98df3..0a6b4dd96577 100644 --- a/qadevOOo/runner/helper/FileTools.java +++ b/qadevOOo/runner/helper/FileTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FileTools.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/InetTools.java b/qadevOOo/runner/helper/InetTools.java index c55164b6aac9..56c964c8f4db 100644 --- a/qadevOOo/runner/helper/InetTools.java +++ b/qadevOOo/runner/helper/InetTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: InetTools.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 5404919d2162..39536179545c 100644 --- a/qadevOOo/runner/helper/LoggingThread.java +++ b/qadevOOo/runner/helper/LoggingThread.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: LoggingThread.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/OSHelper.java b/qadevOOo/runner/helper/OSHelper.java index d4f596c05848..d8e467ae4584 100644 --- a/qadevOOo/runner/helper/OSHelper.java +++ b/qadevOOo/runner/helper/OSHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OSHelper.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java index f803734a426c..5075c50e795b 100644 --- a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java +++ b/qadevOOo/runner/helper/ObjectInspectorModelImpl.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ObjectInspectorModelImpl.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 5653c882a1f3..adeecbdeba1d 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OfficeProvider.java,v $ - * $Revision: 1.22.2.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index c2f32d02314a..2068a7f5246c 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OfficeWatcher.java,v $ - * $Revision: 1.9.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ParameterNotFoundException.java b/qadevOOo/runner/helper/ParameterNotFoundException.java index 1eb4cf35f7f2..f1ea980e1533 100644 --- a/qadevOOo/runner/helper/ParameterNotFoundException.java +++ b/qadevOOo/runner/helper/ParameterNotFoundException.java @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ParameterNotFoundException.java,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 6fa842c4ebb8..c414accd44ac 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ProcessHandler.java,v $ - * $Revision: 1.14.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/PropertyHandlerFactroy.java b/qadevOOo/runner/helper/PropertyHandlerFactroy.java index 4aa8f8eb0803..1dcdd3d3b2b3 100644 --- a/qadevOOo/runner/helper/PropertyHandlerFactroy.java +++ b/qadevOOo/runner/helper/PropertyHandlerFactroy.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyHandlerFactroy.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java index 6b748e6df514..01ab88e05e6b 100644 --- a/qadevOOo/runner/helper/PropertyHandlerImpl.java +++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyHandlerImpl.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/PropertyHelper.java b/qadevOOo/runner/helper/PropertyHelper.java index 0747caafece5..1b2bdbb9f175 100755 --- a/qadevOOo/runner/helper/PropertyHelper.java +++ b/qadevOOo/runner/helper/PropertyHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyHelper.java,v $ - * $Revision: 1.4.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -66,6 +63,18 @@ public class PropertyHelper // { // aSaveProperties = new PropertyValue[0]; // } + +// show properties? +// if (_aPropertyList.size() > 0) +// { +// // aSaveProperties = new PropertyValue[_aPropertyList.size()]; +// for (int i = 0;i<_aPropertyList.size(); i++) +// { +// PropertyValue aProp = (PropertyValue) _aPropertyList.get(i); +// showProperty(aProp); +// } +// } + } return aSaveProperties; } diff --git a/qadevOOo/runner/helper/SimpleMailSender.java b/qadevOOo/runner/helper/SimpleMailSender.java index c81d56e16f93..221de9a75027 100644 --- a/qadevOOo/runner/helper/SimpleMailSender.java +++ b/qadevOOo/runner/helper/SimpleMailSender.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleMailSender.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index cef9fdd6baac..5e6554943e41 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StreamSimulator.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java index e3fb362b97a9..d2eb41606844 100644 --- a/qadevOOo/runner/helper/StringHelper.java +++ b/qadevOOo/runner/helper/StringHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StringHelper.java,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java index 8c8b9fceaaf0..39bff1485747 100644 --- a/qadevOOo/runner/helper/URLHelper.java +++ b/qadevOOo/runner/helper/URLHelper.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: URLHelper.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index 40a24fe8f414..c1c3e63f5ef3 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnoProvider.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/helper/makefile.mk b/qadevOOo/runner/helper/makefile.mk index fda152e4fc08..f5ad34c53ad6 100644 --- a/qadevOOo/runner/helper/makefile.mk +++ b/qadevOOo/runner/helper/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.11.16.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/DynamicClassLoader.java b/qadevOOo/runner/lib/DynamicClassLoader.java index de8bf848b146..2611ad965dfc 100644 --- a/qadevOOo/runner/lib/DynamicClassLoader.java +++ b/qadevOOo/runner/lib/DynamicClassLoader.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DynamicClassLoader.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/ExceptionStatus.java b/qadevOOo/runner/lib/ExceptionStatus.java index 9f669b5a9d59..198bded1e895 100644 --- a/qadevOOo/runner/lib/ExceptionStatus.java +++ b/qadevOOo/runner/lib/ExceptionStatus.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ExceptionStatus.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index d6e6833648fb..884059bcfd88 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: MultiMethodTest.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -167,7 +164,8 @@ public class MultiMethodTest if (! entry.entryName.equals("ifc.qadevooo._SelfTest")) { String ifcName = getInterfaceName(); - System.out.println("checking : " + ifcName); + // System.out.println("checking : " + ifcName); + System.out.print("checking: [" + entry.longName + "]"); // defining a name of the class corresponding to the tested interface // or service @@ -186,12 +184,12 @@ public class MultiMethodTest } catch (ClassNotFoundException cnfE) { - + System.out.println(); cnfE.printStackTrace(log); log.println("could not find a class : " + getTestedClassName()); return null; - } + System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]"); // quering the tested interface from the tested object XInterface tCase = tEnv.getTestObject(); @@ -234,7 +232,8 @@ public class MultiMethodTest DescEntry aSubEntry = entry.SubEntries[i]; try { - executeMethod(aSubEntry.entryName); + final String sEntryName = aSubEntry.entryName; + executeMethod(sEntryName); } catch (Exception e) { @@ -258,7 +257,7 @@ public class MultiMethodTest * Is called before calling method tests, but after initialization. * Subclasses may override to perform actions before method tests. */ - protected void before() throws Exception + protected void before() { } @@ -321,13 +320,15 @@ public class MultiMethodTest /** * Checks if the <code>method</code> is optional in the service. */ - protected boolean isOptional(String method) + protected boolean isOptional(String _method) { for (int k = 0; k < entry.SubEntryCount; k++) { - if (entry.SubEntries[k].entryName.equals(method)) + final String sName = entry.SubEntries[k].entryName; + if (sName.equals(_method)) { - return entry.SubEntries[k].isOptional; + final boolean bIsOptional = entry.SubEntries[k].isOptional; + return bIsOptional; } } return false; @@ -370,6 +371,7 @@ public class MultiMethodTest log.println("Execute: " + method); callMethod(method); log.println(method + ": " + tRes.getStatusFor(method)); + log.println(); } } diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index cd6f5ce28218..286ddf1600a9 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: MultiPropertyTest.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -158,7 +155,8 @@ public class MultiPropertyTest extends MultiMethodTest if (info != null) { - if (!info.hasPropertyByName(propName)) + final boolean bHasProperty = info.hasPropertyByName(propName); + if (!bHasProperty) { if (isOptional(propName) || optionalService) { diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 5559fc1099cf..1c4a43c4fd3a 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Parameters.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index 7632d4286357..2c2304b5088e 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleStatus.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/Status.java b/qadevOOo/runner/lib/Status.java index df1310c2bbbd..7cd65c380425 100644 --- a/qadevOOo/runner/lib/Status.java +++ b/qadevOOo/runner/lib/Status.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Status.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java index 235b9d1a0cf5..4768a9229c8f 100644 --- a/qadevOOo/runner/lib/StatusException.java +++ b/qadevOOo/runner/lib/StatusException.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StatusException.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java index 353a1cee46d1..e5214f2edb40 100644 --- a/qadevOOo/runner/lib/TestCase.java +++ b/qadevOOo/runner/lib/TestCase.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TestCase.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/TestEnvironment.java b/qadevOOo/runner/lib/TestEnvironment.java index 4ee280880cf3..877f681e3b3c 100644 --- a/qadevOOo/runner/lib/TestEnvironment.java +++ b/qadevOOo/runner/lib/TestEnvironment.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TestEnvironment.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 24b9503184ae..9d1e171b95d9 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TestParameters.java,v $ - * $Revision: 1.14.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java index 53749fa1227d..b0c70954a6cc 100644 --- a/qadevOOo/runner/lib/TestResult.java +++ b/qadevOOo/runner/lib/TestResult.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TestResult.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/lib/makefile.mk b/qadevOOo/runner/lib/makefile.mk index 93a852570ed5..4807416e1939 100644 --- a/qadevOOo/runner/lib/makefile.mk +++ b/qadevOOo/runner/lib/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk index 986111bd5bad..c18d77f25b0e 100644 --- a/qadevOOo/runner/makefile.mk +++ b/qadevOOo/runner/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.15.2.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 473f01a63b97..979fc527f775 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Runner.java,v $ - * $Revision: 1.5.8.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -187,7 +184,7 @@ public class Runner public static void main(String[] args) { - System.out.println("OOoRunner Main() version from 20090825 (yyyymmdd)"); + System.out.println("OOoRunner Main() version from 20100125 (yyyymmdd)"); setStartTime(getTime()); diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index d5dfc15ee690..cbe1787f2de1 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: RunnerService.java,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/org/openoffice/makefile.mk b/qadevOOo/runner/org/openoffice/makefile.mk index d6a472b62ec7..e3ba3b4f6e22 100644 --- a/qadevOOo/runner/org/openoffice/makefile.mk +++ b/qadevOOo/runner/org/openoffice/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/ComplexTest.java b/qadevOOo/runner/share/ComplexTest.java index 2188b98ddebe..ea1ab3c55850 100644 --- a/qadevOOo/runner/share/ComplexTest.java +++ b/qadevOOo/runner/share/ComplexTest.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ComplexTest.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/CwsDataExchange.java b/qadevOOo/runner/share/CwsDataExchange.java index 2b151ae6f708..8f6c31943ad4 100644 --- a/qadevOOo/runner/share/CwsDataExchange.java +++ b/qadevOOo/runner/share/CwsDataExchange.java @@ -3,13 +3,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: CwsDataExchange.java,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/DescEntry.java b/qadevOOo/runner/share/DescEntry.java index 1e277886ad46..6485cd840950 100644 --- a/qadevOOo/runner/share/DescEntry.java +++ b/qadevOOo/runner/share/DescEntry.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DescEntry.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java index dc6ac351ccb1..b032dda1eec3 100644 --- a/qadevOOo/runner/share/DescGetter.java +++ b/qadevOOo/runner/share/DescGetter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DescGetter.java,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/LogWriter.java b/qadevOOo/runner/share/LogWriter.java index b9c54b83ea04..67b8250f6f01 100644 --- a/qadevOOo/runner/share/LogWriter.java +++ b/qadevOOo/runner/share/LogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: LogWriter.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/Watcher.java b/qadevOOo/runner/share/Watcher.java index 00c905ce99a5..bf0c40d9dadf 100644 --- a/qadevOOo/runner/share/Watcher.java +++ b/qadevOOo/runner/share/Watcher.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Watcher.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/share/makefile.mk b/qadevOOo/runner/share/makefile.mk index e2398249ff09..ff780b13c0a9 100644 --- a/qadevOOo/runner/share/makefile.mk +++ b/qadevOOo/runner/share/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java index b4a27640c312..7237fcc98dd8 100644 --- a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ComplexDataBaseOutProducer.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 0339b1bd1a8e..814135d553ca 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DataBaseOutProducer.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index b78f26bafa48..dce9c137810a 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FatDataBaseOutProducer.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/FileLogWriter.java b/qadevOOo/runner/stats/FileLogWriter.java index 22790507c24f..cfa4ccc5a617 100644 --- a/qadevOOo/runner/stats/FileLogWriter.java +++ b/qadevOOo/runner/stats/FileLogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FileLogWriter.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/InternalLogWriter.java b/qadevOOo/runner/stats/InternalLogWriter.java index d4225e14d92a..b3c71217fb64 100644 --- a/qadevOOo/runner/stats/InternalLogWriter.java +++ b/qadevOOo/runner/stats/InternalLogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: InternalLogWriter.java,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index 9eed00139215..ca569631f409 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OutProducerFactory.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 532e1daa0c61..c55da50327a6 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SQLExecution.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/SimpleFileOutProducer.java b/qadevOOo/runner/stats/SimpleFileOutProducer.java index 0345a1389ba4..e03cf374e187 100644 --- a/qadevOOo/runner/stats/SimpleFileOutProducer.java +++ b/qadevOOo/runner/stats/SimpleFileOutProducer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleFileOutProducer.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index 965bf6ebc7ad..9bdfb30fe223 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleLogWriter.java,v $ - * $Revision: 1.7.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/SimpleOutProducer.java b/qadevOOo/runner/stats/SimpleOutProducer.java index f410c02ad4c6..4c91233e6f67 100644 --- a/qadevOOo/runner/stats/SimpleOutProducer.java +++ b/qadevOOo/runner/stats/SimpleOutProducer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SimpleOutProducer.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java index 6b9aebdec06c..b1fe5fe61dd3 100644 --- a/qadevOOo/runner/stats/Summarizer.java +++ b/qadevOOo/runner/stats/Summarizer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Summarizer.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -27,7 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package stats; import java.util.Vector; @@ -38,57 +34,81 @@ import share.DescEntry; * this class summs up the results of the subentries of a given DescEntry<br> * and fills the subentries in cases of SKIPPED states */ -public class Summarizer { +public class Summarizer +{ /** * * gets the state for a SuperEntry according to its subentries * @param entry */ - public void summarizeUp(DescEntry entry) { - if ( ( entry.State != null ) && !entry.State.equals("UNKNOWN")) return; + public void summarizeUp(DescEntry entry) + { + if ((entry.State != null) && !entry.State.equals("UNKNOWN")) + { + return; + } int count = entry.SubEntryCount; int knownIssues = 0; Vector failures = new Vector(); Vector states = new Vector(); - for (int i=0; i<count; i++) { - if (entry.SubEntries[i].State == null) { + for (int i = 0; i < count; i++) + { + if (entry.SubEntries[i].State == null) + { entry.SubEntries[i].State = "PASSED.FAILED"; } - if (entry.SubEntries[i].State.equals("known issue")) { + if (entry.SubEntries[i].State.equals("known issue")) + { entry.SubEntries[i].State = "PASSED.OK"; knownIssues++; } - if (!entry.SubEntries[i].State.endsWith("OK")) { - failures.add(entry.SubEntries[i].entryName); + if (!entry.SubEntries[i].State.endsWith("OK")) + { + String sFailure = "[" + entry.SubEntries[i].longName + "]" + " is testcode: [" + entry.SubEntries[i].entryName + "]"; + failures.add(sFailure); states.add(entry.SubEntries[i].State); } } - if (failures.size()>0) { + if (failures.size() > 0) + { String errMsg = ""; String state = "PASSED.FAILED"; - for (int j=0; j<failures.size();j++) { - if (states.elementAt(j).equals("not part of the job")) { + for (int j = 0; j < failures.size(); j++) + { + if (states.elementAt(j).equals("not part of the job")) + { state = "Not possible since not all Interfaces/Services have been checked"; - } else errMsg += - failures.elementAt(j)+" - "+states.elementAt(j)+"\r\n"; + } + else + { + errMsg += + failures.elementAt(j) + " - " + states.elementAt(j) + "\r\n"; + } } - entry.hasErrorMsg=true; + entry.hasErrorMsg = true; entry.ErrorMsg = errMsg; entry.State = state; - } else if (entry.EntryType.equals("component") && knownIssues > 0) { + } + else if (entry.EntryType.equals("component") && knownIssues > 0) + { entry.State = "PASSED(with known issues).OK"; - } else { + } + else + { entry.State = "PASSED.OK"; } } - public static void summarizeDown(DescEntry entry, String state) { - if ( ( entry.State == null ) || entry.State.equals("UNKNOWN")) + public static void summarizeDown(DescEntry entry, String state) + { + if ((entry.State == null) || entry.State.equals("UNKNOWN")) + { entry.State = state; - for (int i=0; i<entry.SubEntryCount; i++) { + } + for (int i = 0; i < entry.SubEntryCount; i++) + { summarizeDown(entry.SubEntries[i], entry.State); } } - } diff --git a/qadevOOo/runner/stats/makefile.mk b/qadevOOo/runner/stats/makefile.mk index 7d8348ecf76c..af503a229038 100644 --- a/qadevOOo/runner/stats/makefile.mk +++ b/qadevOOo/runner/stats/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 16d3386633d4..c698839f3149 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibilityTools.java,v $ - * $Revision: 1.12.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 1d78a8107ab8..0d64779137f7 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BasicMacroTools.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index f47d67d8724e..5929192ac1df 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: BookmarkDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/CalcTools.java b/qadevOOo/runner/util/CalcTools.java index de3772e6f42b..08a8b945839a 100644 --- a/qadevOOo/runner/util/CalcTools.java +++ b/qadevOOo/runner/util/CalcTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: CalcTools.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java index 0e64f5945f4a..f2f1a82e63f4 100644 --- a/qadevOOo/runner/util/ControlDsc.java +++ b/qadevOOo/runner/util/ControlDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ControlDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 407afde30a2b..440274d8fd9a 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DBTools.java,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index a84c99ffea20..07a2cdd2c5cc 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DefaultDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index bee3bc8f9bd1..3384a8b83423 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DesktopTools.java,v $ - * $Revision: 1.10.8.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/DrawTools.java b/qadevOOo/runner/util/DrawTools.java index e84f6f718796..d5f862cb49a7 100644 --- a/qadevOOo/runner/util/DrawTools.java +++ b/qadevOOo/runner/util/DrawTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DrawTools.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/DynamicClassLoader.java b/qadevOOo/runner/util/DynamicClassLoader.java index f132cacbaa58..659593e69346 100644 --- a/qadevOOo/runner/util/DynamicClassLoader.java +++ b/qadevOOo/runner/util/DynamicClassLoader.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DynamicClassLoader.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index 30664457ec30..ce7b62d4003b 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FootnoteDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java index 180f4d79da21..46515043f677 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FormTools.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 9ea23c6c10f0..4bfb64e8459c 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: FrameDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index 4a80a625222e..b76066d7e95e 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: InstCreator.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/InstDescr.java b/qadevOOo/runner/util/InstDescr.java index beef3b56ff0a..e8343bc866e3 100644 --- a/qadevOOo/runner/util/InstDescr.java +++ b/qadevOOo/runner/util/InstDescr.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: InstDescr.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index af351550dfb6..acaa630baad5 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ParagraphDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index c77c07187288..075fa4d9704e 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PropertyName.java,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index aef2af6aa9cd..948fab207a13 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ReferenceMarkDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java index c5cbffcf99ff..199eb1c01451 100644 --- a/qadevOOo/runner/util/RegistryTools.java +++ b/qadevOOo/runner/util/RegistryTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: RegistryTools.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index a1aecee855f0..80493fdee058 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SOfficeFactory.java,v $ - * $Revision: 1.10.8.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index 45bb141c7c13..df9364a7d9a2 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ShapeDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/StyleFamilyDsc.java b/qadevOOo/runner/util/StyleFamilyDsc.java index 037a260e54bd..eed3835bfab4 100644 --- a/qadevOOo/runner/util/StyleFamilyDsc.java +++ b/qadevOOo/runner/util/StyleFamilyDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: StyleFamilyDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java index 28e1acb3523b..110b7ea549d7 100644 --- a/qadevOOo/runner/util/SysUtils.java +++ b/qadevOOo/runner/util/SysUtils.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SysUtils.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java index f3a731fabeed..d933bc0cb041 100644 --- a/qadevOOo/runner/util/TableDsc.java +++ b/qadevOOo/runner/util/TableDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TableDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java index 34cca525a786..3afcbbce5dd5 100644 --- a/qadevOOo/runner/util/TextSectionDsc.java +++ b/qadevOOo/runner/util/TextSectionDsc.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TextSectionDsc.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index 95a1b50a2b39..1a639d18b252 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UITools.java,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 45acaa615d1c..d63202d54e33 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ValueChanger.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java index d15f93dd8997..dd9749119a8f 100644 --- a/qadevOOo/runner/util/ValueComparer.java +++ b/qadevOOo/runner/util/ValueComparer.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ValueComparer.java,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/WaitUnreachable.java b/qadevOOo/runner/util/WaitUnreachable.java index d2ea233a45fe..f756c9fae648 100644 --- a/qadevOOo/runner/util/WaitUnreachable.java +++ b/qadevOOo/runner/util/WaitUnreachable.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: WaitUnreachable.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index 86b6a7459897..33b5d4f61aab 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: WriterTools.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/XInstCreator.java b/qadevOOo/runner/util/XInstCreator.java index a2b6cf7360ba..2f6ec3ecf272 100644 --- a/qadevOOo/runner/util/XInstCreator.java +++ b/qadevOOo/runner/util/XInstCreator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XInstCreator.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java index 90e710c4a10f..e3a0ae3a1b23 100644 --- a/qadevOOo/runner/util/XLayerHandlerImpl.java +++ b/qadevOOo/runner/util/XLayerHandlerImpl.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XLayerHandlerImpl.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/XLayerImpl.java b/qadevOOo/runner/util/XLayerImpl.java index 3525fb02fa11..72dc2a2fa6aa 100644 --- a/qadevOOo/runner/util/XLayerImpl.java +++ b/qadevOOo/runner/util/XLayerImpl.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XLayerImpl.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 63750b1afd10..a744afe0a3f8 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLTools.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/XSchemaHandlerImpl.java b/qadevOOo/runner/util/XSchemaHandlerImpl.java index 8ed09de7bde3..cac0754d9f20 100644 --- a/qadevOOo/runner/util/XSchemaHandlerImpl.java +++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XSchemaHandlerImpl.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/DocComparator.java b/qadevOOo/runner/util/compare/DocComparator.java index d505a1ffdc3c..365850fa4839 100644 --- a/qadevOOo/runner/util/compare/DocComparator.java +++ b/qadevOOo/runner/util/compare/DocComparator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DocComparator.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/DocComparatorFactory.java b/qadevOOo/runner/util/compare/DocComparatorFactory.java index 38abcf749a40..5f68606932c0 100644 --- a/qadevOOo/runner/util/compare/DocComparatorFactory.java +++ b/qadevOOo/runner/util/compare/DocComparatorFactory.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DocComparatorFactory.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 3f154fa6248c..71109e984188 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GraphicalComparator.java,v $ - * $Revision: 1.6.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/PDFComparator.java b/qadevOOo/runner/util/compare/PDFComparator.java index c259cf7e108a..fb49b0db40dd 100644 --- a/qadevOOo/runner/util/compare/PDFComparator.java +++ b/qadevOOo/runner/util/compare/PDFComparator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PDFComparator.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/XMLComparator.java b/qadevOOo/runner/util/compare/XMLComparator.java index dc6ab4275ab4..470dbaa3ada1 100644 --- a/qadevOOo/runner/util/compare/XMLComparator.java +++ b/qadevOOo/runner/util/compare/XMLComparator.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLComparator.java,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/compare/makefile.mk b/qadevOOo/runner/util/compare/makefile.mk index 249e654cf460..2983e8aa581b 100644 --- a/qadevOOo/runner/util/compare/makefile.mk +++ b/qadevOOo/runner/util/compare/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6.16.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index dc21c1f247ba..60c613edd854 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2009 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -21,6 +21,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. + * */ package util.db; diff --git a/qadevOOo/runner/util/db/DataSourceDescriptor.java b/qadevOOo/runner/util/db/DataSourceDescriptor.java index 734c9e123b3c..9faeeb3f51e0 100644 --- a/qadevOOo/runner/util/db/DataSourceDescriptor.java +++ b/qadevOOo/runner/util/db/DataSourceDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2009 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -21,6 +21,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. + * */ package util.db; diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java index 3dfe11088293..9022315fbfa4 100644 --- a/qadevOOo/runner/util/db/DatabaseDocument.java +++ b/qadevOOo/runner/util/db/DatabaseDocument.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2009 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -21,6 +21,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. + * */ package util.db; diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java index 07cda51defe9..259500fe0c8f 100644 --- a/qadevOOo/runner/util/dbg.java +++ b/qadevOOo/runner/util/dbg.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbg.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/makefile.mk b/qadevOOo/runner/util/makefile.mk index d7ca5f46ccc8..7b4d72385e24 100644 --- a/qadevOOo/runner/util/makefile.mk +++ b/qadevOOo/runner/util/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index d555452ff4ee..1467edf05375 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: utils.java,v $ - * $Revision: 1.17.2.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |