From ba1a7045c092ad0f6ba7ac345c0014765e2be8df Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 30 Oct 2014 11:44:55 +0000
Subject: [PATCH] AutoRefactored code.
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index cb3d1f1..fccbc94 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -1124,7 +1124,7 @@
if (!oldValues.equals(currentValues)) {
result = MenuResult.success(true);
} else {
- result = MenuResult.<Boolean> cancel();
+ result = MenuResult.cancel();
}
LocalizableMessage option = getKeepDefaultValuesMenuOption(d, defaultValues, oldValues, currentValues);
@@ -1474,10 +1474,10 @@
// The second (and possibly third) option is to always change
// the property's value.
- if (currentValue == null || !currentValue) {
+ if (!Boolean.TRUE.equals(currentValue)) {
LocalizableMessage svalue = getPropertyValues(d, Collections.singleton(true));
- if (defaultValue != null && defaultValue) {
+ if (Boolean.TRUE.equals(defaultValue)) {
option = INFO_EDITOR_OPTION_CHANGE_TO_DEFAULT_VALUE.get(svalue);
} else {
option = INFO_EDITOR_OPTION_CHANGE_TO_VALUE.get(svalue);
@@ -1486,10 +1486,10 @@
builder.addNumberedOption(option, MenuResult.success(true));
}
- if (currentValue == null || currentValue) {
+ if (!Boolean.FALSE.equals(currentValue)) {
LocalizableMessage svalue = getPropertyValues(d, Collections.singleton(false));
- if (defaultValue != null && !defaultValue) {
+ if (Boolean.FALSE.equals(defaultValue)) {
option = INFO_EDITOR_OPTION_CHANGE_TO_DEFAULT_VALUE.get(svalue);
} else {
option = INFO_EDITOR_OPTION_CHANGE_TO_VALUE.get(svalue);
@@ -1977,18 +1977,12 @@
// Create the appropriate property action.
MenuCallback<Boolean> callback;
- if (pd.hasOption(PropertyOption.MULTI_VALUED)) {
- if (isReadOnly) {
- callback = new ReadOnlyPropertyViewer(mo, pd);
- } else {
- callback = new MultiValuedPropertyEditor(mo, pd);
- }
+ if (isReadOnly) {
+ callback = new ReadOnlyPropertyViewer(mo, pd);
+ } else if (pd.hasOption(PropertyOption.MULTI_VALUED)) {
+ callback = new MultiValuedPropertyEditor(mo, pd);
} else {
- if (isReadOnly) {
- callback = new ReadOnlyPropertyViewer(mo, pd);
- } else {
- callback = new SingleValuedPropertyEditor(mo, pd);
- }
+ callback = new SingleValuedPropertyEditor(mo, pd);
}
// Create the numeric option.
@@ -2027,7 +2021,7 @@
if (result.isSuccess()) {
if (result.getValue()) {
- return MenuResult.<Void> success();
+ return MenuResult.success();
}
} else if (result.isCancel()) {
return MenuResult.cancel();
--
Gitblit v1.10.0