summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-20 15:30:36 +0200
committerNoel Grandin <noel@peralex.com>2014-10-07 13:20:02 +0200
commitdc53e3027bb1a278164f15d0a31f20c15608d10e (patch)
tree84fe7e21121789981ac18e53e1f45453a064e279 /qadevOOo
parent726fc58d0cbdb0fa6d71e5c896889a7c5b64cd9c (diff)
java: simplify conditions involving logical negation
Change-Id: Ib45e58273e650ef9a31dbdb5f71e995a5976f50e
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/convwatch/MSOfficePrint.java2
-rw-r--r--qadevOOo/runner/convwatch/PerformanceContainer.java2
-rw-r--r--qadevOOo/runner/graphical/MSOfficePostscriptCreator.java2
-rw-r--r--qadevOOo/runner/graphical/PerformanceContainer.java2
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java2
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XAreaLink.java4
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java10
-rw-r--r--qadevOOo/tests/java/ifc/table/_XCellCursor.java6
-rw-r--r--qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java2
9 files changed, 16 insertions, 16 deletions
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 821678284557..b80bdf57331e 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -788,7 +788,7 @@ public class MSOfficePrint
if (aLine != null)
{
aLine = aLine.trim();
- if ( (! (aLine.length() < 2) ) &&
+ if ( (aLine.length() >= 2 ) &&
(! aLine.startsWith("#")) &&
(! aLine.startsWith(";")) )
{
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index 9db65e08b328..f9747fcd017e 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -161,7 +161,7 @@ public class PerformanceContainer /* extends *//* implements */ {
{
sLine = aRandomAccessFile.readLine();
if ( (sLine != null) &&
- (! (sLine.length() < 2) ) &&
+ (sLine.length() >= 2 ) &&
(! sLine.startsWith("#")))
{
if (sLine.startsWith("WordStartTime="))
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index aeebf6927588..9e2a9c38ced1 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -635,7 +635,7 @@ public class MSOfficePostscriptCreator implements IOffice
if (aLine != null)
{
aLine = aLine.trim();
- if ( (! (aLine.length() < 2) ) &&
+ if ( (aLine.length() >= 2 ) &&
(! aLine.startsWith("#")) &&
(! aLine.startsWith(";")) )
{
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index 9291d01b5c00..e21f68432be5 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -177,7 +177,7 @@ public class PerformanceContainer /* extends *//* implements */ {
{
sLine = aRandomAccessFile.readLine();
if ( (sLine != null) &&
- (! (sLine.length() < 2) ) &&
+ (sLine.length() >= 2 ) &&
(! sLine.startsWith("#")))
{
if (sLine.startsWith("WordStartTime="))
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index d5ac4bacbaf1..58fdd0126756 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -671,7 +671,7 @@ public class OfficeProvider implements AppProvider
if (sep.equalsIgnoreCase("\\"))
{
- if (!(idx2 < 0))
+ if (idx2 >= 0)
{
sysDir = sysDir.substring(1);
}
diff --git a/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java b/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java
index ea20c57ff3ec..c5026eb692f0 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XAreaLink.java
@@ -49,7 +49,7 @@ public class _XAreaLink extends MultiMethodTest {
log.println("testing getDestArea()");
boolean bResult = false;
oORAdd = oObj.getDestArea();
- if (!(oORAdd == null)){ bResult = true; }
+ if (oORAdd != null){ bResult = true; }
tRes.tested("getDestArea()", bResult) ;
}
@@ -63,7 +63,7 @@ public class _XAreaLink extends MultiMethodTest {
boolean bResult = false;
String src = null;
src = oObj.getSourceArea() ;
- if (!(src == null)){ bResult = true; }
+ if (src != null){ bResult = true; }
tRes.tested("getSourceArea()", bResult) ;
}
diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
index 162121cf76e6..e573ea45f63d 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
@@ -40,35 +40,35 @@ public class _XScenarioEnhanced extends MultiMethodTest {
CellRangeAddress first = getting[0];
- if (!(first.Sheet == 1)) {
+ if (first.Sheet != 1) {
log.println(
"wrong RangeAddress is returned, expected Sheet=0 and got " +
first.Sheet);
res = false;
}
- if (!(first.StartColumn == 0)) {
+ if (first.StartColumn != 0) {
log.println(
"wrong RangeAddress is returned, expected StartColumn=0 and got " +
first.StartColumn);
res = false;
}
- if (!(first.EndColumn == 10)) {
+ if (first.EndColumn != 10) {
log.println(
"wrong RangeAddress is returned, expected EndColumn=10 and got " +
first.EndColumn);
res = false;
}
- if (!(first.StartRow == 0)) {
+ if (first.StartRow != 0) {
log.println(
"wrong RangeAddress is returned, expected StartRow=0 and got " +
first.StartRow);
res = false;
}
- if (!(first.EndRow == 10)) {
+ if (first.EndRow != 10) {
log.println(
"wrong RangeAddress is returned, expected EndRow=10 and got " +
first.EndRow);
diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java b/qadevOOo/tests/java/ifc/table/_XCellCursor.java
index ff7971ad57fc..9c2591f91c42 100644
--- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java
+++ b/qadevOOo/tests/java/ifc/table/_XCellCursor.java
@@ -77,7 +77,7 @@ public class _XCellCursor extends MultiMethodTest {
oAddr = oRange.getRangeAddress();
startCol2 = oAddr.StartColumn;
- if (!(startCol == startCol2)){
+ if (startCol != startCol2){
bResult = true;
}
tRes.tested( "gotoNext()", bResult );
@@ -105,7 +105,7 @@ public class _XCellCursor extends MultiMethodTest {
oAddr = oRange.getRangeAddress();
startRow2 = oAddr.StartRow;
startCol2 = oAddr.StartColumn;
- if (!(startCol == startCol2) || (startRow == startRow2)){
+ if ((startCol != startCol2) || (startRow == startRow2)){
bResult = true;
}
tRes.tested( "gotoOffset()", bResult );
@@ -131,7 +131,7 @@ public class _XCellCursor extends MultiMethodTest {
oAddr = oRange.getRangeAddress();
startCol2 = oAddr.StartColumn;
- if (!(startCol == startCol2)){
+ if (startCol != startCol2){
bResult = true;
}
tRes.tested( "gotoPrevious()", bResult );
diff --git a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java
index b9a8f558ed4d..bc7fc151073b 100644
--- a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java
+++ b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java
@@ -49,7 +49,7 @@ public class _XSearchDescriptor extends MultiMethodTest {
log.println("test for getSearchString() ");
searchStr = oObj.getSearchString();
- if (!(searchStr == null)){ bResult = true; }
+ if (searchStr != null){ bResult = true; }
tRes.tested("getSearchString()", bResult);
}