diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:53 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:53 +0200 |
commit | b29a838b1cd9014c0951312f53ca6c0ebb9e1219 (patch) | |
tree | f951731fcd4f0c17dd7a55b154be238cb2b71bae /qadevOOo/runner/graphical/ParameterHelper.java | |
parent | b9bff9906e94ef3b1c8d6da779269122d39d8354 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 868b90218854a32bdd0bbcc85aad838f198e40bb (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:21 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 7525320ca65ca0cf2ed5ec481d9f26638aed1b5c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:38 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: testing_libreoffice-3.3.0.4
Diffstat (limited to 'qadevOOo/runner/graphical/ParameterHelper.java')
-rw-r--r-- | qadevOOo/runner/graphical/ParameterHelper.java | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 598ee6c53007..2450ce97cce3 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -1,8 +1,8 @@ /* * ************************************************************************ - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,11 +87,11 @@ public class ParameterHelper private String m_sInputPath = null; private String m_sOutputPath = null; // private String m_sReferencePath = null; - + private TestParameters m_aCurrentParams; // private GlobalLogWriter m_aLog; - + // CONSTRUCTOR private ParameterHelper(){} @@ -100,10 +100,10 @@ public class ParameterHelper m_aCurrentParams = param; // m_aLog = log; // interpretReferenceType(); - // interpretPrinterName(); + // interpretPrinterName(); } - + protected TestParameters getTestParameters() { return m_aCurrentParams; @@ -120,7 +120,7 @@ public class ParameterHelper String sInputPath = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_INPUT_PATH ); if (sInputPath == null || sInputPath.length() == 0) { - GlobalLogWriter.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); + GlobalLogWriter.println("Please set input path (path to documents) " + PropertyName.DOC_COMPARATOR_INPUT_PATH + "=path."); } else { @@ -129,7 +129,7 @@ public class ParameterHelper } return m_sInputPath; } - + public String getOutputPath() { if (m_sOutputPath == null) @@ -137,7 +137,7 @@ public class ParameterHelper String sOutputPath = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); if (sOutputPath == null || sOutputPath.length() == 0) { - GlobalLogWriter.println("Please set output path (path where to store document results) " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + "=path."); + GlobalLogWriter.println("Please set output path (path where to store document results) " + PropertyName.DOC_COMPARATOR_OUTPUT_PATH + "=path."); } else { @@ -163,7 +163,7 @@ public class ParameterHelper // } // return m_sReferencePath; // } - + public boolean isIncludeSubDirectories() { @@ -189,7 +189,7 @@ public class ParameterHelper if (m_sReferenceType == null) { // REFERENCE_TYPE ---------- - + String sReferenceType = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_REFERENCE_TYPE ); if (sReferenceType == null || sReferenceType.length() == 0) { @@ -209,7 +209,7 @@ public class ParameterHelper if (m_sPrinterName == null) { // PRINTER_NAME ---------- - + String sPrinterName = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_PRINTER_NAME ); if (sPrinterName == null || sPrinterName.length() == 0) { @@ -223,11 +223,11 @@ public class ParameterHelper } return m_sPrinterName; } - + PerformanceContainer m_aPerformanceContainer = null; /** * helper class for performance analyser features - * @return + * @return */ public PerformanceContainer getPerformance() { @@ -237,17 +237,17 @@ public class ParameterHelper } return m_aPerformanceContainer; } - + /** * Helper function to get the buildid of the current used OpenOffice.org * out of the AppExecutionCommand the build ID - * @return + * @return */ public String getBuildID() { String sAPP = (String)m_aCurrentParams.get(util.PropertyName.APP_EXECUTION_COMMAND); // return getBuildID(sAPP); -// TODO: here we need the getBuildID(string) method +// TODO: here we need the getBuildID(string) method String sBuildID = BuildID.getBuildID(sAPP); return sBuildID; } @@ -260,10 +260,10 @@ public class ParameterHelper return m_nResolutionInDPI; } // get methods - public XMultiServiceFactory getMultiServiceFactory() + public XMultiServiceFactory getMultiServiceFactory() { XMultiServiceFactory xMSF = (XMultiServiceFactory)m_aCurrentParams.getMSF(); - + // check if MultiServiceFactory is given if (getReferenceType().toLowerCase().equals("pdf") || getReferenceType().toLowerCase().equals("ps") || @@ -285,7 +285,7 @@ public class ParameterHelper public boolean isHidden() { // HIDDEN - + String sOfficeViewable = (String)m_aCurrentParams.get(PropertyName.OFFICE_VIEWABLE); if (sOfficeViewable != null) { @@ -341,7 +341,7 @@ public class ParameterHelper // if (m_sDefaultXMLFormatApplication == null) // { // // DEFAULT_XML_FORMAT_APP ------ -// +// // String sDefaultXMLFormatApp = (String)m_aCurrentParams.get( PropertyName.DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP ); // if (sDefaultXMLFormatApp == null || sDefaultXMLFormatApp.length() == 0) // { @@ -355,7 +355,7 @@ public class ParameterHelper // return m_sDefaultXMLFormatApplication; // } - + // Pages ------------------------------------------------------------------- /** @@ -394,7 +394,7 @@ public class ParameterHelper } return true; } - + public boolean getOverwrite() { boolean bOverwrite = m_aCurrentParams.getBool( PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE); @@ -409,7 +409,7 @@ public class ParameterHelper String sPrefix = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX ); if (sPrefix == null || sPrefix.length() == 0) { - GlobalLogWriter.println("Please set html prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); + GlobalLogWriter.println("Please set html prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); } else { |