summaryrefslogtreecommitdiff
path: root/wizards
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 /wizards
parent726fc58d0cbdb0fa6d71e5c896889a7c5b64cd9c (diff)
java: simplify conditions involving logical negation
Change-Id: Ib45e58273e650ef9a31dbdb5f71e995a5976f50e
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/db/QueryMetaData.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/event/MethodInvocation.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 4b994ac667d9..a098eea1484b 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -125,7 +125,7 @@ public class QueryMetaData extends CommandMetaData
for (int n = 0; n < FieldColumns.length; n++)
{
String sDisplayFieldName = FieldColumns[n].getDisplayFieldName();
- if (!(JavaTools.FieldInList(_DisplayFieldNames, sDisplayFieldName) > -1))
+ if (JavaTools.FieldInList(_DisplayFieldNames, sDisplayFieldName) <= -1)
{
oRemainingFieldColumns.add(FieldColumns[n]);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 57d1215a17b1..da043ee00220 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -373,7 +373,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
CurDBColumn = getDoc().DBColumnsVector.get(ColIndex);
addLinkedTextSection(xTextCursor, ReportTextDocument.COPYOFGROUPSECTION + Integer.toString(ColIndex + 1), CurDBColumn, CurGroupValue);
OldGroupFieldValues[ColIndex] = CurGroupValue;
- breset = !(ColIndex == GroupFieldCount - 1);
+ breset = ColIndex != GroupFieldCount - 1;
}
}
getRecordParser().getcurrentRecordData(DataVector);
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 80b5b9c3ae03..a67928adb23c 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -343,7 +343,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
public void toggleCommandListBox(String[] _NewItems)
{
- boolean bdoenable = !(QueryMetaData.getIncludedCommandNames(_NewItems).length >= CurDBMetaData.getMaxTablesInSelect());
+ boolean bdoenable = QueryMetaData.getIncludedCommandNames(_NewItems).length < CurDBMetaData.getMaxTablesInSelect();
toggleCommandListBox(bdoenable);
}
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 6ed54d9f2e4c..f7a6864e53e3 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -593,7 +593,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
}
else
{
- enableNextButton(!(getCurrentStep() == nMaxStep));
+ enableNextButton(getCurrentStep() != nMaxStep);
}
}
}
diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
index 1924573a432b..5ac4f0e56a6f 100644
--- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
+++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
@@ -59,7 +59,7 @@ public class MethodInvocation
{
mMethod = method;
mObject = obj;
- mWithParam = !(paramClass == null);
+ mWithParam = paramClass != null;
}
/**