瀏覽代碼

Simplify boolean expressions

tags/8.2.0.alpha2
Ahmed Ashour 6 年之前
父節點
當前提交
03349e8c66

+ 1
- 1
client/src/main/java/com/vaadin/client/DateTimeService.java 查看文件

@@ -177,7 +177,7 @@ public class DateTimeService {

public static int getNumberOfDaysInMonth(Date date) {
final int month = date.getMonth();
if (month == 1 && true == isLeapYear(date)) {
if (month == 1 && isLeapYear(date)) {
return 29;
}
return maxDaysInMonth[month];

+ 1
- 1
client/src/main/java/com/vaadin/client/VTooltip.java 查看文件

@@ -617,7 +617,7 @@ public class VTooltip extends VOverlay {
Element element = Element.as(event.getEventTarget());

// We can ignore move event if it's handled by move or over already
if (currentElement == element && handledByFocus == true) {
if (currentElement == element && handledByFocus) {
return;
}


+ 1
- 1
client/src/main/java/com/vaadin/client/ui/dd/VOr.java 查看文件

@@ -39,7 +39,7 @@ public final class VOr extends VAcceptCriterion implements VAcceptCallback {
for (int i = 0; i < childCount; i++) {
VAcceptCriterion crit = VAnd.getCriteria(drag, configuration, i);
crit.accept(drag, configuration.getChildUIDL(i), this);
if (accepted == true) {
if (accepted) {
callback.accepted(drag);
return;
}

+ 2
- 2
client/src/main/java/com/vaadin/client/widgets/Grid.java 查看文件

@@ -1753,10 +1753,10 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* if the editor handler is not set
*/
public void setEnabled(boolean enabled) {
if (enabled == false && state != State.INACTIVE) {
if (!enabled && state != State.INACTIVE) {
throw new IllegalStateException(
"Cannot disable: editor is in edit mode");
} else if (enabled == true && getHandler() == null) {
} else if (enabled && getHandler() == null) {
throw new IllegalStateException(
"Cannot enable: EditorHandler not set");
}

+ 2
- 2
compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java 查看文件

@@ -1750,10 +1750,10 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* if the editor handler is not set
*/
public void setEnabled(boolean enabled) {
if (enabled == false && state != State.INACTIVE) {
if (!enabled && state != State.INACTIVE) {
throw new IllegalStateException(
"Cannot disable: editor is in edit mode");
} else if (enabled == true && getHandler() == null) {
} else if (enabled && getHandler() == null) {
throw new IllegalStateException(
"Cannot enable: EditorHandler not set");
}

+ 5
- 5
compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java 查看文件

@@ -386,8 +386,8 @@ public class MethodProperty<T> extends AbstractProperty<T> {
}
if (j == c.length) {

// all paramteters matched
if (found == true) {
// all parameters matched
if (found) {
throw new MethodException(this,
"Could not uniquely identify " + getMethodName
+ "-method");
@@ -397,7 +397,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
}
}
}
if (found != true) {
if (!found) {
throw new MethodException(this,
"Could not find " + getMethodName + "-method");
}
@@ -440,7 +440,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
if (j == c.length) {

// all parameters match
if (found == true) {
if (found) {
throw new MethodException(this,
"Could not identify unique " + setMethodName
+ "-method");
@@ -450,7 +450,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
}
}
}
if (found != true) {
if (!found) {
throw new MethodException(this,
"Could not identify " + setMethodName + "-method");
}

+ 2
- 2
compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java 查看文件

@@ -119,7 +119,7 @@ public class NativeSelect extends AbstractSelect
@Override
public void setMultiSelect(boolean multiSelect)
throws UnsupportedOperationException {
if (multiSelect == true) {
if (multiSelect) {
throw new UnsupportedOperationException(
"Multiselect not supported");
}
@@ -128,7 +128,7 @@ public class NativeSelect extends AbstractSelect
@Override
public void setNewItemsAllowed(boolean allowNewOptions)
throws UnsupportedOperationException {
if (allowNewOptions == true) {
if (allowNewOptions) {
throw new UnsupportedOperationException(
"newItemsAllowed not supported");
}

+ 1
- 1
server/src/main/java/com/vaadin/server/JsonPaintTarget.java 查看文件

@@ -876,7 +876,7 @@ public class JsonPaintTarget implements PaintTarget {

@Override
public String getJsonPresentation() {
return "\"" + name + "\":" + (value == true ? "true" : "false");
return "\"" + name + "\":" + (value ? "true" : "false");
}

}

Loading…
取消
儲存