summaryrefslogtreecommitdiff
path: root/qadevOOo/runner
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2010-12-04 13:28:03 +0900
committerCaolán McNamara <caolanm@redhat.com>2010-12-05 19:13:22 +0000
commitf20ff43473f1d33be368d61b8d0f6bcbb644df14 (patch)
tree9bff166cbb029acf5c3a7a7a68d67151ae47d9e3 /qadevOOo/runner
parente98d09d0ad16a6bd843f0b691d39dd0bac4ff357 (diff)
Replace all occured, occurance etc.
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r--[-rwxr-xr-x]qadevOOo/runner/convwatch/ReportDesignerTest.java2
-rw-r--r--qadevOOo/runner/graphical/IniFile.java2
-rw-r--r--qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java2
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java2
-rw-r--r--qadevOOo/runner/lib/MultiPropertyTest.java2
-rw-r--r--qadevOOo/runner/share/DescEntry.java2
-rw-r--r--qadevOOo/runner/stats/SQLExecution.java10
-rw-r--r--qadevOOo/runner/util/RegistryTools.java2
-rw-r--r--qadevOOo/runner/util/ValueChanger.java2
-rw-r--r--qadevOOo/runner/util/ValueComparer.java2
-rw-r--r--qadevOOo/runner/util/XMLTools.java2
-rw-r--r--qadevOOo/runner/util/dbg.java2
-rw-r--r--qadevOOo/runner/util/utils.java2
13 files changed, 17 insertions, 17 deletions
diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java
index 703a2b2f3073..28441bab5af4 100755..100644
--- a/qadevOOo/runner/convwatch/ReportDesignerTest.java
+++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java
@@ -686,7 +686,7 @@ public class ReportDesignerTest extends ComplexTestCase {
catch (com.sun.star.util.CloseVetoException e)
{
log.println("ERROR: CloseVetoException caught");
- log.println("CloseVetoException occured Can't close document.");
+ log.println("CloseVetoException occurred Can't close document.");
log.println("Message: " + e.getMessage());
}
}
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index bd54a66b65fd..4df9a394c742 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -675,7 +675,7 @@ public class IniFile implements Enumeration
}
/**
- * Helper to count the occurence of Sections
+ * Helper to count the occurrence of Sections
* @return returns the count of '^['.*']$' Elements
*/
public int getElementCount()
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
index a0592d5ce143..69083df762c2 100644
--- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
@@ -552,7 +552,7 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
catch (com.sun.star.util.CloseVetoException e)
{
GlobalLogWriter.println("ERROR: CloseVetoException caught");
- GlobalLogWriter.println("CloseVetoException occured Can't close document.");
+ GlobalLogWriter.println("CloseVetoException occurred Can't close document.");
GlobalLogWriter.println("Message: " + e.getMessage());
}
}
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index c414accd44ac..f1d7685ce3df 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -93,7 +93,7 @@ class Pump extends Thread
}
catch (java.io.IOException e)
{
- log.println(pref + "Exception occured: " + e);
+ log.println(pref + "Exception occurred: " + e);
}
}
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index a02f93c04347..94a6ed276f24 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -253,7 +253,7 @@ public class MultiPropertyTest extends MultiMethodTest
}
catch (Exception e)
{
- log.println("Exception occured while testing property '" + propName + "'");
+ log.println("Exception occurred while testing property '" + propName + "'");
e.printStackTrace(log);
tRes.tested(propName, false);
}
diff --git a/qadevOOo/runner/share/DescEntry.java b/qadevOOo/runner/share/DescEntry.java
index 6485cd840950..30a7785ae660 100644
--- a/qadevOOo/runner/share/DescEntry.java
+++ b/qadevOOo/runner/share/DescEntry.java
@@ -73,7 +73,7 @@ public class DescEntry {
public String ErrorMsg;
/**
- * Contains information if errors occured while gaining the Description
+ * Contains information if errors occurred while gaining the Description
*/
public boolean hasErrorMsg;
diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java
index c55da50327a6..a357c22804d9 100644
--- a/qadevOOo/runner/stats/SQLExecution.java
+++ b/qadevOOo/runner/stats/SQLExecution.java
@@ -81,7 +81,7 @@ public class SQLExecution {
/**
* Open a connection to the DataBase
- * @return True, if no error occured.
+ * @return True, if no error occurred.
*/
public boolean openConnection() {
if(m_bConnectionOpen) return true;
@@ -108,7 +108,7 @@ public class SQLExecution {
/**
* Close the connection to the DataBase
- * @return True, if no error occured.
+ * @return True, if no error occurred.
*/
public boolean closeConnection() {
if (!m_bConnectionOpen) return true;
@@ -130,7 +130,7 @@ public class SQLExecution {
* @param command The command to execute.
* @param sqlInput Input values for the command.
* @param sqlOutput The results of the command are put in this Hashtable.
- * @return True, if no error occured.
+ * @return True, if no error occurred.
*/
public boolean executeSQLCommand(String command, Hashtable sqlInput, Hashtable sqlOutput)
throws IllegalArgumentException {
@@ -144,7 +144,7 @@ public class SQLExecution {
* @param sqlOutput The results of the command are put in this Hashtable.
* @param mergeOutputIntoInput The output of the result is put into the
* sqlInput Hashtable.
- * @return True, if no error occured.
+ * @return True, if no error occurred.
*/
public boolean executeSQLCommand(String command, Hashtable sqlInput, Hashtable sqlOutput, boolean mergeOutputIntoInput)
throws IllegalArgumentException {
@@ -160,7 +160,7 @@ public class SQLExecution {
Vector sqlCommand = new Vector();
sqlCommand.add("");
boolean update = false;
- // synchronize all "$varname" occurences in the command string with
+ // synchronize all "$varname" occurrences in the command string with
// values from input
StringTokenizer token = new StringTokenizer(command, " ");
while (token.hasMoreTokens()) {
diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java
index 199eb1c01451..b9da3402c4d0 100644
--- a/qadevOOo/runner/util/RegistryTools.java
+++ b/qadevOOo/runner/util/RegistryTools.java
@@ -357,7 +357,7 @@ public class RegistryTools {
out.println("") ;
}
} catch (com.sun.star.uno.Exception e) {
- out.println("Exception occured : ") ;
+ out.println("Exception occurred : ") ;
e.printStackTrace(out) ;
} finally {
key.closeKey() ;
diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
index 8388b4c2222f..32586c6a0f3b 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -773,7 +773,7 @@ public class ValueChanger {
}
}
} catch (Exception e) {
- System.err.println("Exception occured while changing Enumeration value:") ;
+ System.err.println("Exception occurred while changing Enumeration value:") ;
e.printStackTrace(System.err) ;
}
if (newValue == null) newValue = oldValue ;
diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java
index dd9749119a8f..4090820e3988 100644
--- a/qadevOOo/runner/util/ValueComparer.java
+++ b/qadevOOo/runner/util/ValueComparer.java
@@ -72,7 +72,7 @@ public class ValueComparer {
}
}
catch (Exception e) {
- System.out.println("Exception occured while comparing Objects");
+ System.out.println("Exception occurred while comparing Objects");
e.printStackTrace();
}
return eq;
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index a744afe0a3f8..0967ddd65d27 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -355,7 +355,7 @@ public class XMLTools {
}
/**
- * Prints error message and all tags where error occured inside.
+ * Prints error message and all tags where error occurred inside.
* Also prints "Tag trace" in case if the full XML data isn't
* printed.
*/
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index 259500fe0c8f..2d79f3cb13de 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -133,7 +133,7 @@ public class dbg {
}
}
catch (Exception ex) {
- System.out.println("Exception occured while printing InterfaceInfo");
+ System.out.println("Exception occurred while printing InterfaceInfo");
ex.printStackTrace();
}
}
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 3f882f10fafb..f51b79aaad6c 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -570,7 +570,7 @@ public class utils {
* file already exists, the file is deleted.
*
* @returns <code>true</code> if the file was successfully copied,
- * <code>false</code> if some errors occured (e.g. file is locked, used
+ * <code>false</code> if some errors occurred (e.g. file is locked, used
* by another process).
*/
public static boolean tryOverwriteFile(