[Libreoffice-commits] core.git: qadevOOo/qa qadevOOo/runner qadevOOo/tests
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 03:59:49 PST 2014
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 2
qadevOOo/runner/base/java_fat.java | 14 +--
qadevOOo/runner/convwatch/Basename.java | 8 +-
qadevOOo/runner/convwatch/BorderRemover.java | 2
qadevOOo/runner/convwatch/BuildID.java | 6 -
qadevOOo/runner/convwatch/ConvWatch.java | 10 +-
qadevOOo/runner/convwatch/ConvWatchStarter.java | 2
qadevOOo/runner/convwatch/DB.java | 38 +++++-----
qadevOOo/runner/convwatch/DBHelper.java | 4 -
qadevOOo/runner/convwatch/EnhancedComplexTestCase.java | 8 +-
qadevOOo/runner/convwatch/FileHelper.java | 4 -
qadevOOo/runner/convwatch/FilenameHelper.java | 2
qadevOOo/runner/convwatch/GfxCompare.java | 2
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 14 +--
qadevOOo/runner/convwatch/HTMLOutputter.java | 6 -
qadevOOo/runner/convwatch/IniFile.java | 12 +--
qadevOOo/runner/convwatch/MSOfficePrint.java | 4 -
qadevOOo/runner/convwatch/OSHelper.java | 6 -
qadevOOo/runner/convwatch/OfficePrint.java | 24 +++---
qadevOOo/runner/convwatch/PRNCompare.java | 18 ++---
qadevOOo/runner/convwatch/PerformanceContainer.java | 3
qadevOOo/runner/convwatch/PixelCounter.java | 16 ++--
qadevOOo/runner/convwatch/ReportDesignerTest.java | 12 +--
qadevOOo/runner/convwatch/SimpleFileSemaphore.java | 4 -
qadevOOo/runner/graphical/BuildID.java | 12 +--
qadevOOo/runner/graphical/FileHelper.java | 14 +--
qadevOOo/runner/graphical/HTMLResult.java | 2
qadevOOo/runner/graphical/IniFile.java | 20 ++---
qadevOOo/runner/graphical/JPEGComparator.java | 2
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 4 -
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 46 ++++++-------
qadevOOo/runner/graphical/ParameterHelper.java | 2
qadevOOo/runner/graphical/PerformanceContainer.java | 2
qadevOOo/runner/graphical/PixelCounter.java | 16 ++--
qadevOOo/runner/helper/ConfigHelper.java | 12 +--
qadevOOo/runner/helper/FileTools.java | 4 -
qadevOOo/runner/helper/ProcessHandler.java | 2
qadevOOo/runner/helper/StreamSimulator.java | 26 +++----
qadevOOo/runner/helper/URLHelper.java | 12 +--
qadevOOo/runner/lib/TestResult.java | 2
qadevOOo/runner/util/compare/GraphicalComparator.java | 2
qadevOOo/runner/util/compare/PDFComparator.java | 12 +--
qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java | 8 +-
qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java | 4 -
qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java | 2
qadevOOo/tests/java/ifc/task/_XInteractionHandler.java | 4 -
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 4 -
qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java | 2
49 files changed, 219 insertions(+), 220 deletions(-)
New commits:
commit faabee67550fb8eaebe5f58e224508de81d2c641
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 19:41:12 2014 +0100
Remove visual noise from qadevOOo
Change-Id: I3d65145422039d629d2375c9fef030cd6ee41124
Reviewed-on: https://gerrit.libreoffice.org/8291
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
index e021f0b..d52b450 100644
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@ -36,7 +36,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
-// ------------------------------------------
+
public class Skeleton
{
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java
index 031474f..1013173 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -94,7 +94,7 @@ public class java_fat implements TestBase
// String officeProviderName = (String) m_aParams.get("OfficeProvider");
// AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName);
-//
+
// if (office == null) {
// System.out.println("ERROR: Wrong parameter 'OfficeProvider', " +
// " it cannot be instantiated.");
@@ -309,7 +309,7 @@ public class java_fat implements TestBase
return retValue;
}
-//
+
private TestEnvironment getTestEnvironment(TestCase tCase, DescEntry entry)
{
TestEnvironment tEnv = null;
@@ -349,7 +349,7 @@ public class java_fat implements TestBase
}
return tEnv;
}
- // -------------------------------------------------------------------------
+
private TestCase getTestCase(DescEntry _aEntry)
{
TestCase tCase = null;
@@ -402,20 +402,20 @@ public class java_fat implements TestBase
// 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', " +
// " it cannot be instantiated.");
// System.exit(-1);
// }
-//
+
// XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager(
// m_aParams);
-//
+
// if (msf == null) {
// return null;
// }
-//
+
// m_aParams.put("ServiceFactory", msf);
// AppProvider office = startOffice(m_aParams);
diff --git a/qadevOOo/runner/convwatch/Basename.java b/qadevOOo/runner/convwatch/Basename.java
index 57e6494..3d5d385 100644
--- a/qadevOOo/runner/convwatch/Basename.java
+++ b/qadevOOo/runner/convwatch/Basename.java
@@ -18,7 +18,7 @@
package convwatch;
-// -----------------------------------------------------------------------------
+
// Helper stuff to
// abstract class Name
// {
@@ -32,7 +32,7 @@ package convwatch;
// {
// public String getName() {return "-test";}
// }
-//
+
// public class Basename /* extends *//* implements */ {
// String fs;
// Basename()
@@ -45,8 +45,8 @@ package convwatch;
// String sJPEGName = _sOutputPath + fs + sBaseNameNoSuffix + "-" + _sGS_PageOutput + _aPostNameAdd.getName() + ".jpg";
// return sJPEGName;
// }
-//
+
// public static void main( String[] argv ) {
-//
+
// }
// }
diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java
index c3290fc..95d7e30 100644
--- a/qadevOOo/runner/convwatch/BorderRemover.java
+++ b/qadevOOo/runner/convwatch/BorderRemover.java
@@ -24,7 +24,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
import java.lang.reflect.Method;
-// -----------------------------------------------------------------------------
+
class Rect
{
int x;
diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java
index 50865d4..8734ef8 100644
--- a/qadevOOo/runner/convwatch/BuildID.java
+++ b/qadevOOo/runner/convwatch/BuildID.java
@@ -132,7 +132,7 @@ public class BuildID
// String sBuildID;
// sBuildID = getBuildID(sApp);
// System.out.println("BuildID is: " + sBuildID);
-//
+
// Date aDate = new Date();
// long nStart = aDate.getTime();
// System.out.println("Time:" + nStart);
@@ -140,10 +140,10 @@ public class BuildID
// // sApp = "/opt/staroffice8_net/program/soffice";
// // sBuildID = getBuildID(sApp);
// // System.out.println("BuildID is: " + sBuildID);
-// //
+
// // sApp = "\"/opt/staroffice8_net/program/soffice\" test blah";
// // sBuildID = getBuildID(sApp);
-// //
+
// // System.out.println("BuildID is: " + sBuildID);
// System.exit(1);
// }
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index 60a475f..5e0d662 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -214,7 +214,7 @@ public class ConvWatch
return aList;
}
- // -----------------------------------------------------------------------------
+
// This creates a status for exact on document
static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID)
{
@@ -284,7 +284,7 @@ public class ConvWatch
return bResultIsOk;
}
- // -----------------------------------------------------------------------------
+
static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID)
{
@@ -320,7 +320,7 @@ public class ConvWatch
}
- // -----------------------------------------------------------------------------
+
public static boolean check(GraphicalTestArguments _aGTA,
String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile)
@@ -344,7 +344,7 @@ public class ConvWatch
return bResultIsOk;
}
- // -----------------------------------------------------------------------------
+
public static boolean checkDiffDiff(GraphicalTestArguments _aGTA,
String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile,
String _sAbsoluteDiffPath)
@@ -412,7 +412,7 @@ public class ConvWatch
// a.setDocFile( "1_Gov.ppt");
// a.setReferencePath( "/cws/so-cwsserv06/qadev18/SRC680/src.m47/convwatch.keep/input/msoffice/xp/PowerPoint");
// a.setReferenceFile( "1_Gov.prn" );
- //
+
// a.setOutputPath( "/tmp/convwatch_java");
// a.setPostScriptFile("1_Gov.ps" );
// }
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 5e1e095..abf071c 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -294,7 +294,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
}
- // -----------------------------------------------------------------------------
+
void runGDCWithStatus(HTMLOutputter _aHTMLoutput, LISTOutputter _aLISToutput, String _sInputFile, String _sOutputPath, String _sReferencePath, String _sDiffPath, String _sNewSubDir )
{
// start a fresh Office
diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java
index c4f68e7..58dfdf2 100644
--- a/qadevOOo/runner/convwatch/DB.java
+++ b/qadevOOo/runner/convwatch/DB.java
@@ -213,12 +213,12 @@ public class DB extends DBHelper
// int _nResolution )
// {
// Connection aCon = new ShareConnection().getConnection();
- //
+
// String sFilename = _sFilename.replace('\\', '/');
- //
+
// String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename);
// ExecSQL(aCon, sDeleteOld);
- //
+
// String sValueLine = "type, filename, basename, fileformat, buildid, resolution, date";
// StringBuffer aDataLine = new StringBuffer();
// aDataLine.append( Quote(_sSourceType) ) . append( sComma ) .
@@ -228,7 +228,7 @@ public class DB extends DBHelper
// append( Quote( _sBuildID) ) . append( sComma ) .
// append( _nResolution) . append( sComma ) .
// append( Quote( today() ) );
- //
+
// SQLinsertValues(aCon, "file", sValueLine, aDataLine.toString());
// }
@@ -236,12 +236,12 @@ public class DB extends DBHelper
// String _sState)
// {
// Connection aCon = new ShareConnection().getConnection();
- //
+
// String sFilename = _sFilename.replace('\\', '/');
- //
+
// // String sDeleteOld = "DELETE FROM file WHERE filename = " + Quote(sFilename);
// // ExecSQL(aCon, sDeleteOld);
- //
+
// String sSet = "state=" + Quote(_sState);
// String sWhere = getWhereClause() + sAND + "name=" + Quote(sFilename);
// SQLupdateValue( aCon, "currentdocs", sSet, sWhere );
@@ -494,25 +494,25 @@ public class DB extends DBHelper
// {
// if (_sDBInfoString == null) return;
// fillVariables(_sDBInfoString);
- //
+
// Connection aCon = new ShareConnection().getConnection();
- //
+
// String sDeleteSQL = "DELETE FROM currentdocs WHERE " + getWhereClause();
- //
+
// ExecSQL(aCon, sDeleteSQL);
// }
- //
+
// public static void fileInsert(String _sDBInfoString,
// String _sFilename,
// String _sRemovePath)
// {
// if (_sDBInfoString == null) return;
// fillVariables(_sDBInfoString);
- //
+
// String sFilename = _sFilename.replace('\\', '/');
- //
+
// Connection aCon = new ShareConnection().getConnection();
- //
+
// String sValueLine = "environment, referenceversion, currentversion, documentpool, name, state";
// StringBuffer aDataLine = new StringBuffer();
// aDataLine.append( Quote(m_sEnvironment) ) . append( sComma ) .
@@ -521,7 +521,7 @@ public class DB extends DBHelper
// append( Quote( m_sDocumentPool) ) . append( sComma ) .
// append( Quote( sFilename) ) . append( sComma ) .
// append( Quote( "undone"));
- //
+
// SQLinsertValues(aCon, "currentdocs", sValueLine, aDataLine.toString());
// }
@@ -529,7 +529,7 @@ public class DB extends DBHelper
// public static void insertinto_file(String _sFilename, String _sFileFormat, String _sBuildID)
// {
// Connection aCon = new ShareConnection().getConnection();
- //
+
// String sValueLine = "type, filename, fileformat, buildid, date";
// StringBuffer aDataLine = new StringBuffer();
// aDataLine.append( "1" ) . append( sComma ) .
@@ -537,17 +537,17 @@ public class DB extends DBHelper
// append( Quote( _sFileFormat) ) . append( sComma ) .
// append( Quote( _sBuildID) ) . append( sComma ) .
// append( Quote( today() ) );
- //
+
// SQLinsertValues(aCon, "file", sValueLine, aDataLine.toString());
// }
// public static void main( String[] args )
// {
- //
+
// String _sFilename = "";
// String _sFileFormat = "";
// String _sBuildID = "";
- //
+
// // insertinto_file("c:\temp\test.txt", "test", "txt", "nix", "", 0);
// fillVariables("p:m128,c:m134,d:demo");
// }
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index 9dc9b25..0788a4b 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -105,7 +105,7 @@ public class DBHelper
}
// String aInsertStr = "";
- //
+
// aInsertStr = "INSERT INTO " + _sTableName + " (" + value_names + " ) VALUES (" + values + ")";
// ExecSQL(_aCon, aInsertStr);
StringBuffer aInsertStr = new StringBuffer();
@@ -125,7 +125,7 @@ public class DBHelper
}
// String aUpdateStr = "";
- //
+
// aUpdateStr = "UPDATE " + _sTableName + " SET " + _sSet + " WHERE " + _sWhere;
// ExecSQL( _aCon, aUpdateStr );
StringBuffer aUpdateStr = new StringBuffer();
diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
index b3d5eb9..77d7f66 100644
--- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
@@ -32,7 +32,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
// {
// // System.out.println("before()");
// }
- //
+
// public void after()
// {
// // System.out.println("after()");
@@ -62,7 +62,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
}
}
- // -----------------------------------------------------------------------------
+
protected void checkEnvironment(Object[] _aList)
{
@@ -81,7 +81,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
}
}
- // -----------------------------------------------------------------------------
+
protected abstract Object[] mustInstalledSoftware();
public boolean needCheckForInstalledSoftware()
@@ -102,7 +102,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
return false;
}
- // -----------------------------------------------------------------------------
+
public GraphicalTestArguments getGraphicalTestArguments()
{
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 202f3d7..b14bc26 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -66,7 +66,7 @@ public class FileHelper
// System.out.println( _sFile );
// System.out.println( aFile.getAbsolutePath() );
// MessageBox("Der JavaProzess wartet auf eine interaktion ihrerseits.");
- //
+
// File aFile2 = new File(_sFile);
// if (aFile2.exists())
// {
@@ -181,7 +181,7 @@ public class FileHelper
// makeDirectories("", "/tmp/a/b");
// creates all directories /tmp/a/b
- //
+
public static void makeDirectories(String first, String path)
{
makeDirectories(first, path, "0777");
diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java
index d3bda99..9e23520 100644
--- a/qadevOOo/runner/convwatch/FilenameHelper.java
+++ b/qadevOOo/runner/convwatch/FilenameHelper.java
@@ -39,7 +39,7 @@ interface Filenamer
public String getSystemPath();
}
-// -----------------------------------------------------------------------------
+
abstract class FilenameHelper_impl implements Filenamer
{
diff --git a/qadevOOo/runner/convwatch/GfxCompare.java b/qadevOOo/runner/convwatch/GfxCompare.java
index 6fe7672..a61505e 100644
--- a/qadevOOo/runner/convwatch/GfxCompare.java
+++ b/qadevOOo/runner/convwatch/GfxCompare.java
@@ -87,7 +87,7 @@ public class GfxCompare extends EnhancedComplexTestCase
compare(sFile1, sFile2);
}
- // -----------------------------------------------------------------------------
+
String createJPEG(String _sFile, String _sAdditional)
{
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index c0d12f3..d58546c 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -103,7 +103,7 @@ public class GraphicalTestArguments
{
m_aCurrentParams = param;
// collect interesting information from the ComplexTestCase
- // ....
+
// REFERENCE_TYPE ----------
String sReferenceType = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_TYPE );
@@ -151,7 +151,7 @@ public class GraphicalTestArguments
m_bIncludeSubdirectories = false;
}
- // ----------------------------------------
+
m_nMaxPages = param.getInt( PropertyName.DOC_COMPARATOR_PRINT_MAX_PAGE );
m_sOnlyPage = (String)param.get(PropertyName.DOC_COMPARATOR_PRINT_ONLY_PAGE);
@@ -162,7 +162,7 @@ public class GraphicalTestArguments
m_nResolutionInDPI = 212;
}
- // ----------------------------------------
+
String sImportFilterName = (String)param.get(PropertyName.DOC_CONVERTER_IMPORT_FILTER_NAME);
if (sImportFilterName != null && sImportFilterName.length() > 0)
{
@@ -175,7 +175,7 @@ public class GraphicalTestArguments
GlobalLogWriter.get().println("Must quit.");
}
}
- // ----------------------------------------
+
String sExportFilterName = (String)param.get(PropertyName.DOC_CONVERTER_EXPORT_FILTER_NAME);
if (sExportFilterName != null && sExportFilterName.length() > 0)
{
@@ -188,13 +188,13 @@ public class GraphicalTestArguments
}
}
- // ----------------------------------------
+
String sOfficeProgram = (String)param.get(PropertyName.DOC_CONVERTER_OFFICE_PROGRAM);
if (sOfficeProgram != null && sOfficeProgram.length() > 0)
{
m_sOfficeProgram = sOfficeProgram;
}
- // ----------------------------------------
+
String sREUSE_OFFICE = (String)param.get( PropertyName.DOC_CONVERTER_REUSE_OFFICE);
if (sREUSE_OFFICE == null)
{
@@ -361,7 +361,7 @@ public class GraphicalTestArguments
public GraphicalTestArguments(TestParameters param, Log xxx)
{
// collect interesting information from the ComplexTestCase
- // ....
+
}
*/
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java
index b745002..b9e8f06 100644
--- a/qadevOOo/runner/convwatch/HTMLOutputter.java
+++ b/qadevOOo/runner/convwatch/HTMLOutputter.java
@@ -142,7 +142,7 @@ public class HTMLOutputter
// sbUNIXPath.append(_sHREF.substring(index + 2));
// String sUNIXPath = sbUNIXPath.toString();
// sUNIXPath = utils.replaceAll13(sUNIXPath, "\\", "/");
- //
+
// a.append("<A HREF=\"");
// a.append(sUNIXPath);
// a.append("\">");
@@ -216,7 +216,7 @@ public class HTMLOutputter
}
}
-// -----------------------------------------------------------------------------
+
String stronghtml(String _sValue)
{
StringBuffer a = new StringBuffer();
@@ -332,7 +332,7 @@ public class HTMLOutputter
}
}
-// -----------------------------------------------------------------------------
+
public void checkDiffDiffSection(String _sDocumentName)
{
try
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java
index e641895..c3ae9a0 100644
--- a/qadevOOo/runner/convwatch/IniFile.java
+++ b/qadevOOo/runner/convwatch/IniFile.java
@@ -105,7 +105,7 @@ class IniFile
return m_aList.size() > 1 ? true : false;
}
- // -----------------------------------------------------------------------------
+
boolean isRemark(String _sLine)
{
@@ -368,7 +368,7 @@ class IniFile
m_bListContainUnsavedChanges = true;
}
}
- // -----------------------------------------------------------------------------
+
// String replaceEvaluatedValue(String _sSection, String _sValue)
// {
// String sValue = _sValue;
@@ -394,7 +394,7 @@ class IniFile
// }
// return sValue;
// }
- // -----------------------------------------------------------------------------
+
// public String getLocalEvaluatedValue(String _sSection, String _sKey)
// {
@@ -403,7 +403,7 @@ class IniFile
// return sValue;
// }
- // -----------------------------------------------------------------------------
+
// this is a special behaviour.
// public String getGlobalLocalEvaluatedValue(String _sSection, String _sKey)
@@ -418,7 +418,7 @@ class IniFile
// }
// sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue);
// sLocalValue = replaceEvaluatedKey("global", sLocalValue);
- //
+
// return sLocalValue;
// }
@@ -436,7 +436,7 @@ class IniFile
// 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/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 40eeeaa..aa796fc 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -46,7 +46,7 @@ public class MSOfficePrint
public void setPrinterName(String _s) {m_sPrinterName = _s;}
- // -----------------------------------------------------------------------------
+
static boolean isWordDocument(String _sSuffix)
{
if (_sSuffix.toLowerCase().endsWith(".doc") ||
@@ -154,7 +154,7 @@ public class MSOfficePrint
}
}
- // -----------------------------------------------------------------------------
+
/**
* print the given file (_sInputFile) to the file name (_sPrintFile)
*/
diff --git a/qadevOOo/runner/convwatch/OSHelper.java b/qadevOOo/runner/convwatch/OSHelper.java
index 1f833e7..5bb40b6 100644
--- a/qadevOOo/runner/convwatch/OSHelper.java
+++ b/qadevOOo/runner/convwatch/OSHelper.java
@@ -17,7 +17,7 @@
*/
package convwatch;
-//
+
// class OSHelper
// {
// public static boolean isWindows()
@@ -60,7 +60,7 @@ package convwatch;
// }
// return false;
// }
-//
+
// public static boolean isUnix()
// {
// if (isLinuxIntel() ||
@@ -71,5 +71,5 @@ package convwatch;
// }
// return false;
// }
-//
+
// }
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index d8f867b..14d7f36 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -57,7 +57,7 @@ public class OfficePrint {
// static long m_nStartTime;
// // static Date m_aDateCache = null;
-//
+
// /*
// simple helper functions to start/stop a timer, to know how long a process need in milliseconds
// */
@@ -318,7 +318,7 @@ public class OfficePrint {
return filterName;
}
- // -----------------------------------------------------------------------------
+
public static boolean storeAsPDF(GraphicalTestArguments _aGTA,
String _sInputURL,
@@ -358,7 +358,7 @@ public class OfficePrint {
return bBack;
}
- // -----------------------------------------------------------------------------
+
/**
* print the document found in file (_sInputURL) to as postscript to file (_sPrintFileURL)
@@ -404,7 +404,7 @@ public class OfficePrint {
return bBack;
}
- // -----------------------------------------------------------------------------
+
public static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA)
{
createInfoFile(_sFile, _aGTA, "");
@@ -509,7 +509,7 @@ public class OfficePrint {
- // -----------------------------------------------------------------------------
+
private static boolean impl_printToFileWithOOo(GraphicalTestArguments _aGTA,
XComponent _aDoc,
String _sOutputURL,
@@ -776,7 +776,7 @@ public class OfficePrint {
return false;
}
- // -----------------------------------------------------------------------------
+
/**
* create a reference file
* _sAbsoluteInputPath contains the source file, if not exists, return with failure.
@@ -918,9 +918,9 @@ public class OfficePrint {
return bBack;
}
- // -----------------------------------------------------------------------------
+
// TODO: move this away!
- // -----------------------------------------------------------------------------
+
static void showType(String _sInputURL, XMultiServiceFactory _xMSF)
{
if (_sInputURL.length() == 0)
@@ -952,7 +952,7 @@ public class OfficePrint {
}
- // -----------------------------------------------------------------------------
+
public static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
@@ -1041,7 +1041,7 @@ public class OfficePrint {
return null;
}
- // -----------------------------------------------------------------------------
+
static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
@@ -1117,7 +1117,7 @@ public class OfficePrint {
}
return null;
}
- // -----------------------------------------------------------------------------
+
public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
{
@@ -1211,7 +1211,7 @@ public class OfficePrint {
return null;
}
- // -----------------------------------------------------------------------------
+
public static void convertDocument(String _sInputFile, String _sOutputPath, GraphicalTestArguments _aGTA) throws ConvWatchCancelException
{
XMultiServiceFactory xMSF = _aGTA.getMultiServiceFactory();
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index 73e2bd5..894aa4d 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -28,14 +28,14 @@ import helper.StringHelper;
import java.util.ArrayList;
import util.utils;
-// -----------------------------------------------------------------------------
+
// --------------------------------- PRNCompare ---------------------------------
// class DifferenceType
// {
// final static int NO_DIFFERENCE = 1;
// final static int DIFFERENCE = 2;
-//
+
// public int nValue = NO_DIFFERENCE;
// public boolean equals(int _n)
// {
@@ -44,7 +44,7 @@ import util.utils;
// }
// }
-// -----------------------------------------------------------------------------
+
public class PRNCompare
{
// OSHelper m_aHelper;
@@ -162,7 +162,7 @@ public class PRNCompare
m_sDocumentType = _sTypeName;
}
- // -----------------------------------------------------------------------------
+
public StatusHelper[] compare()
{
@@ -653,13 +653,13 @@ public class PRNCompare
// {
// sComposite = "composite.exe";
// }
- //
+
// String sCommand = sComposite +" -compose difference " +
// StringHelper.doubleQuoteIfNeed(sOldGfx) + " " +
// StringHelper.doubleQuoteIfNeed(sNewGfx) + " " +
// StringHelper.doubleQuoteIfNeed(sDiffGfx);
- //
- //
+
+
// // System.out.println(sCommand);
// // executeSynchronously(sCommand);
// ProcessHandler aHandler = new ProcessHandler(sCommand);
@@ -699,7 +699,7 @@ public class PRNCompare
return aCurrentStatus;
}
- // -----------------------------------------------------------------------------
+
/**
* count how much pixel differ and between Old or New and the Difference graphics
*
@@ -770,7 +770,7 @@ public class PRNCompare
// LLA: 20040804 sample how to build jpegs from reference files
// a.createJPEGFromPostscript("/tmp/convwatch_java",
// "/home/apitest/WorkFromHome/20040804/reference", "worddoc.prn" );
-//
+
// a.createJPEGFromPostscript("/tmp/convwatch_java",
// "/home/apitest/WorkFromHome/20040804/reference", "worddoc.ps" );
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index c4253c2..0d90fec 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -221,8 +221,7 @@ public class PerformanceContainer /* extends *//* implements */ {
}
// public static void main(String[] args) {
-//
-///*
+
// BorderRemover a = new BorderRemover();
// try
// {
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java
index bf110eb..ccce8c9 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -21,7 +21,7 @@ package convwatch;
// import java.awt.Image;
import convwatch.ImageHelper;
-// -----------------------------------------------------------------------------
+
abstract class CountPixel
{
int m_nCount = 0;
@@ -29,7 +29,7 @@ abstract class CountPixel
public abstract void count(int _nRGB);
}
-// -----------------------------------------------------------------------------
+
class CountNotWhite extends CountPixel
{
public CountNotWhite()
@@ -52,7 +52,7 @@ class CountNotWhite extends CountPixel
}
}
-// -----------------------------------------------------------------------------
+
class CountNotBlack extends CountPixel
{
public CountNotBlack()
@@ -74,7 +74,7 @@ class CountNotBlack extends CountPixel
}
}
-// -----------------------------------------------------------------------------
+
class graphics_stuff
{
public int stuff()
@@ -129,7 +129,7 @@ class graphics_stuff
}
}
-// -----------------------------------------------------------------------------
+
public class PixelCounter {
// private Image m_aImage;
@@ -166,13 +166,13 @@ public class PixelCounter {
return a.countNotBlackPixel(_sFile);
}
- // -----------------------------------------------------------------------------
+
// public static void main(String[] args) {
-//
+
// String a = helper.StringHelper.createValueString(10, 4);
// int dummy = 1;
-///*
+//
// BorderRemover a = new BorderRemover();
// try
// {
diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java
index 36b513e..129908a 100644
--- a/qadevOOo/runner/convwatch/ReportDesignerTest.java
+++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java
@@ -53,15 +53,15 @@ import helper.OfficeWatcher;
// import java.text.SimpleDateFormat;
// import java.text.ParsePosition;
// import java.sql.Time;
-//
+
// import java.io.BufferedReader;
// import java.io.File;
// import java.io.FileReader;
// import java.io.IOException;
// import java.io.FilenameFilter;
-//
+
// import java.util.Vector;
-//
+
// import helper.AppProvider;
// import java.text.DecimalFormat;
// import util.DynamicClassLoader;
@@ -352,7 +352,7 @@ public class ReportDesignerTest extends ComplexTestCase {
stopOffice();
}
-// -----------------------------------------------------------------------------
+
private void startTestForFile(String _sDocument /*, int _nType*/)
{
File aFile = new File(_sDocument);
@@ -366,7 +366,7 @@ public class ReportDesignerTest extends ComplexTestCase {
// context = createUnoService("com.sun.star.sdb.DatabaseContext")
// oDataBase = context.getByName("hh")
// oDBDoc = oDataBase.DatabaseDocument
-//
+
// dim args(1) as new com.sun.star.beans.PropertyValue
// args(0).Name = "ActiveConnection"
// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection")
@@ -455,7 +455,7 @@ public class ReportDesignerTest extends ComplexTestCase {
// return getFileFormat(_nType);
}
-// -----------------------------------------------------------------------------
+
private void createDBEntry(/*int _nType*/)
{
// try to connect the database
diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
index 7d929af..db087ba 100644
--- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
+++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
@@ -65,7 +65,7 @@ public class SimpleFileSemaphore /* extends *//* implements */
{
return m_aInternSemaphoreFile;
}
-// ------------------------------------------------------------------------------
+
// wait until resource is available
public void P(File _aSemaphore)
{
@@ -114,7 +114,7 @@ public class SimpleFileSemaphore /* extends *//* implements */
}
}
-// ------------------------------------------------------------------------------
+
// block a resource
public void V(File _aSemaphore)
{
diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java
index ce21a0c..04a18b9 100644
--- a/qadevOOo/runner/graphical/BuildID.java
+++ b/qadevOOo/runner/graphical/BuildID.java
@@ -147,7 +147,7 @@ public class BuildID
// String sBuildID;
// sBuildID = getBuildID(sApp);
// System.out.println("BuildID is: " + sBuildID);
-//
+
// Date aDate = new Date();
// long nStart = aDate.getTime();
// System.out.println("Time:" + nStart);
@@ -155,10 +155,10 @@ public class BuildID
// // sApp = "/opt/staroffice8_net/program/soffice";
// // sBuildID = getBuildID(sApp);
// // System.out.println("BuildID is: " + sBuildID);
-// //
+
// // sApp = "\"/opt/staroffice8_net/program/soffice\" test blah";
// // sBuildID = getBuildID(sApp);
-// //
+
// // System.out.println("BuildID is: " + sBuildID);
// System.exit(1);
// }
@@ -191,15 +191,15 @@ public class BuildID
// String sBuildID;
// sBuildID = getBuildID(sApp);
// System.out.println("BuildID is: " + sBuildID);
-//
+
// 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/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index f551cff..bcd8061 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -74,7 +74,7 @@ public class FileHelper
// System.out.println( _sFile );
// System.out.println( aFile.getAbsolutePath() );
// MessageBox("Der JavaProzess wartet auf eine interaktion ihrerseits.");
- //
+
// File aFile2 = new File(_sFile);
// if (aFile2.exists())
// {
@@ -212,7 +212,7 @@ public class FileHelper
// makeDirectories("", "/tmp/a/b");
// creates all directories /tmp/a/b
- //
+
public static void makeDirectories(String first, String path)
{
makeDirectories(first, path, "0777");
@@ -413,16 +413,16 @@ public class FileHelper
// {
// File inputFile = new File(_sSource);
// File outputFile = new File(_sDestination);
-//
+
// java.io.FileReader in = new java.io.FileReader(inputFile);
// java.io.FileWriter out = new java.io.FileWriter(outputFile);
// int c;
-//
+
// while ((c = in.read()) != -1)
// {
// out.write(c);
// }
-//
+
// in.close();
// out.close();
// }
@@ -578,7 +578,7 @@ public class FileHelper
return sNewPath;
}
- // -----------------------------------------------------------------------------
+
public static void createInfoFile(String _sFile, ParameterHelper _aGTA)
{
createInfoFile(_sFile, _aGTA, "");
@@ -689,7 +689,7 @@ public class FileHelper
// {
// sExtension = sExtension.substring(1);
// }
-//
+
// DB.writeToDB(_aGTA.getInputFile(),
// sNameNoSuffix,
// sExtension,
diff --git a/qadevOOo/runner/graphical/HTMLResult.java b/qadevOOo/runner/graphical/HTMLResult.java
index b1a04bb..d81e677 100644
--- a/qadevOOo/runner/graphical/HTMLResult.java
+++ b/qadevOOo/runner/graphical/HTMLResult.java
@@ -189,7 +189,7 @@ public class HTMLResult
}
}
-// -----------------------------------------------------------------------------
+
private String stronghtml(String _sValue)
{
StringBuffer a = new StringBuffer();
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index 1c1c807c..12f1e4f 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -141,7 +141,7 @@ public class IniFile implements Enumeration<String>
}
return false;
}
- // -----------------------------------------------------------------------------
+
private boolean isRemark(String _sLine)
{
@@ -503,7 +503,7 @@ public class IniFile implements Enumeration<String>
m_bListContainUnsavedChanges = true;
}
}
- // -----------------------------------------------------------------------------
+
// String replaceEvaluatedValue(String _sSection, String _sValue)
// {
// String sValue = _sValue;
@@ -529,7 +529,7 @@ public class IniFile implements Enumeration<String>
// }
// return sValue;
// }
- // -----------------------------------------------------------------------------
+
// public String getLocalEvaluatedValue(String _sSection, String _sKey)
// {
@@ -538,7 +538,7 @@ public class IniFile implements Enumeration<String>
// return sValue;
// }
- // -----------------------------------------------------------------------------
+
// this is a special behaviour.
// public String getGlobalLocalEvaluatedValue(String _sSection, String _sKey)
@@ -553,7 +553,7 @@ public class IniFile implements Enumeration<String>
// }
// sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue);
// sLocalValue = replaceEvaluatedKey("global", sLocalValue);
- //
+
// return sLocalValue;
// }
public void removeSection(String _sSectionToRemove)
@@ -588,8 +588,8 @@ public class IniFile implements Enumeration<String>
// {
// 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
@@ -599,12 +599,12 @@ public class IniFile implements Enumeration<String>
// // 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();
// }
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index dcf9cc4..b47878a 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -402,7 +402,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
String sDestination = FileHelper.appendPath(sDestinationPath, sNewSourceBasename);
FileHelper.copy(sSource, sDestination);
sSourceBasename = sNewSourceBasename;
- //
+
JPEGCreator.convertToNearSameFileWithWidth340(sDestination);
}
String sDifferenceBasename = "Difference_between_" + FileHelper.getNameNoSuffix(sSourceBasename) + "_and_" + FileHelper.getNameNoSuffix(sDestinationBasename) + ".jpg";
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index ba1b64a..5913e0d 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -123,7 +123,7 @@ public class MSOfficePostscriptCreator implements IOffice
// we don't have an office to stop
}
- // -----------------------------------------------------------------------------
+
private boolean isWordDocument(String _sSuffix)
{
if (_sSuffix.toLowerCase().endsWith(".doc") ||
@@ -237,7 +237,7 @@ public class MSOfficePostscriptCreator implements IOffice
}
}
- // -----------------------------------------------------------------------------
+
/**
* print the given file (_sInputFile) to the file name (_sPrintFile)
* @param _aGTA
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index f6529df..30a81d1 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -367,7 +367,7 @@ public class OpenOfficePostscriptCreator implements IOffice
return filterName;
}
- // -----------------------------------------------------------------------------
+
// public boolean storeAsPDF(ParameterHelper _aGTA,
// String _sInputURL,
@@ -375,7 +375,7 @@ public class OpenOfficePostscriptCreator implements IOffice
// {
// boolean bBack = false;
// XComponent aDoc = loadFromURL(_aGTA, _sInputURL);
-//
+
// if (aDoc == null)
// {
// GlobalLogWriter.println("Can't load document.");
@@ -383,7 +383,7 @@ public class OpenOfficePostscriptCreator implements IOffice
// }
// bBack = storeAsPDF(_aGTA, aDoc, _sOutputURL);
// FileHelper.createInfoFile(_sOutputURL, _aGTA, "as pdf");
-//
+
// GlobalLogWriter.println("Close document.");
// aDoc.dispose();
// return bBack;
@@ -412,7 +412,7 @@ public class OpenOfficePostscriptCreator implements IOffice
return bBack;
}
- // -----------------------------------------------------------------------------
+
/**
* print the document found in file (_sInputURL) to as postscript to file (_sPrintFileURL)
@@ -431,7 +431,7 @@ public class OpenOfficePostscriptCreator implements IOffice
// {
// // waitInSeconds(1);
// boolean bBack = false;
-//
+
// XComponent aDoc = loadFromURL(_aGTA, _sInputURL);
// if (aDoc != null)
// {
@@ -443,7 +443,7 @@ public class OpenOfficePostscriptCreator implements IOffice
// disallowStore();
// }
// bBack = impl_printToFileWithOOo(_aGTA, aDoc, _sOutputURL, _sPrintFileURL);
-//
+
// GlobalLogWriter.println("Close document.");
// aDoc.dispose();
// }
@@ -456,7 +456,7 @@ public class OpenOfficePostscriptCreator implements IOffice
- // -----------------------------------------------------------------------------
+
private boolean impl_printToFileWithOOo(ParameterHelper _aGTA,
XComponent _aDoc,
String _sOutputURL,
@@ -749,7 +749,7 @@ public class OpenOfficePostscriptCreator implements IOffice
return false;
}
- // -----------------------------------------------------------------------------
+
/**
* create a reference file
* _sAbsoluteInputPath contains the source file, if not exists, return with failure.
@@ -769,11 +769,11 @@ public class OpenOfficePostscriptCreator implements IOffice
// {
// throw new OfficeException("buildReference(): Input file: " + _sAbsoluteInputFile + " does not exist.");
// }
-//
+
// String fs = System.getProperty("file.separator");
-//
+
// String sInputFileURL = URLHelper.getFileURLFromSystemPath(_sAbsoluteInputFile);
-//
+
// String sInputFileBasename = FileHelper.getBasename(_sAbsoluteInputFile);
// String sOutputFileURL = null;
// String sOutputPath;
@@ -789,17 +789,17 @@ public class OpenOfficePostscriptCreator implements IOffice
// }
// // sOutputFileURL = URLHelper.getFileURLFromSystemPath(sOutputPath + fs + sInputFileBasename);
// sOutputFileURL = null;
-//
+
// String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename);
// String sPrintFileURL;
-//
+
// String sAbsolutePrintFilename = sOutputPath + fs + sPrintFilename + ".prn";
// if (FileHelper.exists(sAbsolutePrintFilename) && _aGTA.getOverwrite() == false)
// {
// GlobalLogWriter.println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite.");
// return true;
// }
-//
+
// if (_aGTA.getReferenceType().toLowerCase().equals("msoffice"))
// {
// sPrintFileURL = URLHelper.getFileURLFromSystemPath(sAbsolutePrintFilename);
@@ -833,11 +833,11 @@ public class OpenOfficePostscriptCreator implements IOffice
// {
// boolean bBack = false;
// String sPrintFileURL = null;
-//
-//
+
+
// // remember the current timer, to know how long a print process need.
// // startTimer();
-//
+
// if (_aGTA.getReferenceType().toLowerCase().equals("ooo"))
// {
// bBack = printToFileWithOOo(_aGTA, _sInputFileURL, _sOutputFileURL, _sPrintFileURL);
@@ -885,9 +885,9 @@ public class OpenOfficePostscriptCreator implements IOffice
// return bBack;
// }
- // -----------------------------------------------------------------------------
+
// TODO: move this away!
- // -----------------------------------------------------------------------------
+
void showType(String _sInputURL, XMultiServiceFactory _xMSF)
{
if (_sInputURL.length() == 0)
@@ -919,7 +919,7 @@ public class OpenOfficePostscriptCreator implements IOffice
}
- // -----------------------------------------------------------------------------
+
public String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
@@ -1008,7 +1008,7 @@ public class OpenOfficePostscriptCreator implements IOffice
return null;
}
- // -----------------------------------------------------------------------------
+
String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
@@ -1084,7 +1084,7 @@ public class OpenOfficePostscriptCreator implements IOffice
}
return null;
}
- // -----------------------------------------------------------------------------
+
public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
{
@@ -1178,7 +1178,7 @@ public class OpenOfficePostscriptCreator implements IOffice
return null;
}
- // -----------------------------------------------------------------------------
+
public void convertDocument(String _sInputFile, String _sOutputPath, ParameterHelper _aGTA) throws OfficeException
{
XMultiServiceFactory xMSF = _aGTA.getMultiServiceFactory();
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index 8d2c440..fd41f63 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -328,7 +328,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)
// {
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index c5d2bb1..26c9d39 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -254,6 +254,6 @@ public class PerformanceContainer /* extends *//* implements */ {
// {
// System.out.println("Exception caught.");
// }
-//
+
// }
}
diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java
index b7e1b64..69c1b23 100644
--- a/qadevOOo/runner/graphical/PixelCounter.java
+++ b/qadevOOo/runner/graphical/PixelCounter.java
@@ -19,7 +19,7 @@
package graphical;
-// -----------------------------------------------------------------------------
+
abstract class CountPixel
{
protected int m_nCount = 0;
@@ -27,7 +27,7 @@ abstract class CountPixel
public abstract void count(int _nRGB);
}
-// -----------------------------------------------------------------------------
+
class CountNotWhite extends CountPixel
{
public CountNotWhite()
@@ -73,7 +73,7 @@ class CountNotWhite extends CountPixel
}
}
-// -----------------------------------------------------------------------------
+
class CountNotBlack extends CountPixel
{
public CountNotBlack()
@@ -118,7 +118,7 @@ class CountNotBlack extends CountPixel
}
}
-// -----------------------------------------------------------------------------
+
class graphics_stuff
{
// public int stuff()
@@ -178,7 +178,7 @@ class graphics_stuff
}
}
-// -----------------------------------------------------------------------------
+
public class PixelCounter {
// private Image m_aImage;
@@ -215,13 +215,13 @@ public class PixelCounter {
return a.countNotBlackPixel(_sFile);
}
- // -----------------------------------------------------------------------------
+
// public static void main(String[] args) {
-//
+
// String a = helper.StringHelper.createValueString(10, 4);
// int dummy = 1;
-///*
+//
// BorderRemover a = new BorderRemover();
// try
// {
diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java
index bbef1cf..8c81f8a 100644
--- a/qadevOOo/runner/helper/ConfigHelper.java
+++ b/qadevOOo/runner/helper/ConfigHelper.java
@@ -88,7 +88,7 @@ public class ConfigHelper
private XMultiServiceFactory m_xSMGR = null;
private XHierarchicalNameAccess m_xConfig = null;
- //-----------------------------------------------
+
public ConfigHelper(XMultiServiceFactory xSMGR ,
String sConfigPath ,
boolean bReadOnly )
@@ -124,7 +124,7 @@ public class ConfigHelper
throw new com.sun.star.uno.Exception("Could not open configuration \""+sConfigPath+"\"");
}
- //-----------------------------------------------
+
public Object readRelativeKey(String sRelPath,
String sKey )
throws com.sun.star.container.NoSuchElementException
@@ -142,7 +142,7 @@ public class ConfigHelper
}
}
- //-----------------------------------------------
+
public void writeRelativeKey(String sRelPath,
String sKey ,
Object aValue )
@@ -161,7 +161,7 @@ public class ConfigHelper
}
}
- //-----------------------------------------------
+
/**
* Updates the configuration.<p>
* This must be called after you have changed the configuration
@@ -180,7 +180,7 @@ public class ConfigHelper
{}
}
- //-----------------------------------------------
+
public static Object readDirectKey(XMultiServiceFactory xSMGR ,
String sConfigFile,
String sRelPath ,
@@ -191,7 +191,7 @@ public class ConfigHelper
return aConfig.readRelativeKey(sRelPath, sKey);
}
- //-----------------------------------------------
+
public static void writeDirectKey(XMultiServiceFactory xSMGR ,
String sConfigFile,
String sRelPath ,
diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/runner/helper/FileTools.java
index 760da29..8ce58e2 100644
--- a/qadevOOo/runner/helper/FileTools.java
+++ b/qadevOOo/runner/helper/FileTools.java
@@ -117,11 +117,11 @@ public class FileTools {
* @param dir the directory to clean from content
*/
// public static boolean cleanDir(File dir){
- //
+
// boolean success = true;
// if (dir.isDirectory()){
// File [] theFiles = dir.listFiles();
- //
+
// if (theFiles.length != 0 )
// for (int i = 0; i < theFiles.length; i++){
// success &= theFiles[i].delete();
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index c70dd1d3..acc7cfe 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -861,7 +861,7 @@ public class ProcessHandler
{
bUseOutput = false;
}
- // -------------------------------------------------------------------------
+
class ProcessWatcher extends Thread
{
diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java
index ad4dfc9..e288404 100644
--- a/qadevOOo/runner/helper/StreamSimulator.java
+++ b/qadevOOo/runner/helper/StreamSimulator.java
@@ -35,7 +35,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.XOutputStream ,
com.sun.star.io.XSeekable
{
- //_________________________________
+
/**
* @member m_sFileName name of the corrsponding file on disk
* @member m_xInStream the internal input stream for reading
@@ -56,7 +56,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
public boolean m_bInWasUsed ;
public boolean m_bOutWasUsed ;
- //_________________________________
+
/**
* construct a new instance of this class
* It set the name of the correspojnding file on disk, which
@@ -124,7 +124,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
////m_aProtocol.log("finalize was called. Please check if it was right or not.\n");
} */
- //_________________________________
+
/**
* following methods simulates the XInputStream.
* The notice all actions inside the internal protocol
@@ -167,7 +167,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
return nRead;
}
- //_________________________________
+
public int readSomeBytes( /*OUT*/ byte[][] lData ,
/*IN*/ int nMaxBytesToRead ) throws com.sun.star.io.NotConnectedException ,
@@ -205,7 +205,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
return nRead;
}
- //_________________________________
+
public void skipBytes( /*IN*/ int nBytesToSkip ) throws com.sun.star.io.NotConnectedException ,
com.sun.star.io.BufferSizeExceededException ,
@@ -236,7 +236,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
public int available() throws com.sun.star.io.NotConnectedException,
com.sun.star.io.IOException
@@ -266,7 +266,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
return nAvailable;
}
- //_________________________________
+
public void closeInput() throws com.sun.star.io.NotConnectedException,
com.sun.star.io.IOException
@@ -294,7 +294,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
/**
* following methods simulates the XOutputStream.
* The notice all actions inside the internal protocol
@@ -330,7 +330,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
public void flush() throws com.sun.star.io.NotConnectedException ,
com.sun.star.io.BufferSizeExceededException ,
@@ -360,7 +360,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
public void closeOutput() throws com.sun.star.io.NotConnectedException ,
com.sun.star.io.BufferSizeExceededException,
@@ -391,7 +391,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
/**
* following methods simulates the XSeekable.
* The notice all actions inside the internal protocol
@@ -431,7 +431,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
//m_aProtocol.log("\tOK\n}\n");
}
- //_________________________________
+
public long getPosition() throws com.sun.star.io.IOException
{
@@ -465,7 +465,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
return nPos;
}
- //_________________________________
+
public long getLength() throws com.sun.star.io.IOException
{
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index d4504f8..58a481b 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -38,7 +38,7 @@ import com.sun.star.util.XURLTransformer;
*/
public class URLHelper
{
- // ____________________
+
/**
* Because the office need URLs for loading/saving documents
@@ -79,7 +79,7 @@ public class URLHelper
return sFileURL;
}
- // ____________________
+
/**
* The same as getFileURLFromSystemPath() before but uses string parameter instead
@@ -98,7 +98,7 @@ public class URLHelper
return getFileURLFromSystemPath(new File(sSystemPath));
}
- // ____________________
+
/**
* Does the same as getFileURLFromSystemPath() before ... but uses
@@ -144,7 +144,7 @@ public class URLHelper
return sURL;
}
- // ____________________
+
/**
* The same as getURLWithProtocolFromSystemPath() before but uses string parameter instead
@@ -177,7 +177,7 @@ public class URLHelper
return getURLWithProtocolFromSystemPath(new File(sSystemPath), new File(sBasePath), sServerPath);
}
- // ____________________
+
/**
* This convert an URL (formated as a string) to a struct com.sun.star.util.URL.
@@ -225,7 +225,7 @@ public class URLHelper
return aURL;
}
- //_________________________________
+
/**
* Return a name list of all available files of a directory.
* We filter pure sub directories names. All other files
diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java
index 4d89fc7..9dbd268 100644
--- a/qadevOOo/runner/lib/TestResult.java
+++ b/qadevOOo/runner/lib/TestResult.java
@@ -94,4 +94,4 @@ public class TestResult {
return testedMethods.get( method );
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java
index a0deec1..420f024 100644
--- a/qadevOOo/runner/util/compare/GraphicalComparator.java
+++ b/qadevOOo/runner/util/compare/GraphicalComparator.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import util.compare.DocComparator;
import convwatch.ConvWatchException;
-// -----------------------------------------------------------------------------
+
class GraphicalComparator implements DocComparator
{
GraphicalTestArguments m_aArguments;
diff --git a/qadevOOo/runner/util/compare/PDFComparator.java b/qadevOOo/runner/util/compare/PDFComparator.java
index 88242d0..4efe701 100644
--- a/qadevOOo/runner/util/compare/PDFComparator.java
+++ b/qadevOOo/runner/util/compare/PDFComparator.java
@@ -38,16 +38,16 @@ class PDFComparator extends GraphicalComparator implements DocComparator
// all in GraphicalComparator implemented.
// public boolean isReferenceExistent() throws IOException;
- //
+
// public void createReference() throws IOException;
- //
+
// public boolean compare() throws IOException;
- //
- //
+
+
// public boolean isDiffReferenceExistent() throws IOException;
- //
+
// public void createDiffReference() throws IOException;
- //
+
// public boolean compareDiff() throws IOException;
}
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index d5b16ec..c19f13f 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -592,17 +592,17 @@ public class CheckModuleAPI extends ComplexTestCase
// class _FolderFilter implements FileFilter
// {
-//
+
// private String mFolderName;
-//
+
// public FolderFilter(String folderName)
// {
// mFolderName = folderName;
// }
-//
+
// public boolean accept_(File pathname)
// {
-//
+
// boolean found = false;
// if (pathname.isDirectory())
// {
diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
index b3aee22..396d06b 100644
--- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
@@ -59,7 +59,7 @@ public class _XTasksSupplier extends MultiMethodTest {
// int cnt = 0 ;
// boolean result = true ;
// XTask task = null ;
-//
+
// XEnumerationAccess enumAcc = oObj.getTasks() ;
// XEnumeration enum = enumAcc.createEnumeration() ;
// while (enum.hasMoreElements()) {
@@ -78,7 +78,7 @@ public class _XTasksSupplier extends MultiMethodTest {
// result &= (task != null) ;
// }
// log.println("Totaly tasks: " + cnt) ;
-//
+
// if (cnt > 0 && result) tRes.tested("getTasks()", true) ;
log.println("DEPRECATED");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java
index b8b1b87..8c33d9f 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java
@@ -118,4 +118,4 @@ public class _XSheetAnnotationAnchor extends MultiMethodTest {
return bResult;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
index a30e9bc..5e44e9c 100644
--- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
+++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
@@ -103,7 +103,7 @@ public class _XInteractionHandler extends MultiMethodTest {
XFrame docFr = xModelDoc.getCurrentController().getFrame() ;
docFr.dispose() ;
- ///*
+ /
try {
Object dsk = msf.createInstance
@@ -124,7 +124,7 @@ public class _XInteractionHandler extends MultiMethodTest {
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace();
- } //
+ }
}
}) ;
thr.start() ;
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 490162d..b2e4097 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -244,9 +244,9 @@ public class OGridControlModel extends GenericModelTest {
// HashSet exclude = new HashSet();
-//
+
// exclude.add("FormatKey");
-//
+
// tEnv.addObjRelation("XUpdateBroadcaster.Checker",
// new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue));
return tEnv;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
index 5839796..5282155 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
@@ -98,7 +98,7 @@ public class SwXTextFrameText extends TestCase {
SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() );
// create testobject here
- ////////////////////////////////////
+
try {
oFrame1 = SOfficeFactory.createTextFrame(xTextDoc, 500, 500);
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
index ddf8ec8..bc2c0ba 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
@@ -67,7 +67,7 @@ public class UnoTreeControl extends TestCase {
protected void cleanup(TestParameters tParam, PrintWriter log) {
// log.println(" disposing xTextDoc ");
-//
+
// util.DesktopTools.closeDoc(xTextDoc);
}
More information about the Libreoffice-commits
mailing list