From 8433427527214c83f56c533259efd7f56a1863b3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Nov 2014 10:50:04 +0000
Subject: [PATCH] AutoRefactored: - work with null checked expressions first - revert conditions - collapse if statements - push negations down - invert equals()
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 fccbc94..7e5fe48 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
@@ -1117,9 +1117,8 @@
builder.setPrompt(INFO_EDITOR_PROMPT_MODIFY_MENU.get(d.getName()));
// First option is for leaving the property unchanged or
- // applying changes, but only if the state of the property is
- // valid.
- if (!(d.hasOption(PropertyOption.MANDATORY) && currentValues.isEmpty())) {
+ // applying changes, but only if the state of the property is valid.
+ if (!d.hasOption(PropertyOption.MANDATORY) || !currentValues.isEmpty()) {
MenuResult<Boolean> result;
if (!oldValues.equals(currentValues)) {
result = MenuResult.success(true);
@@ -1313,10 +1312,10 @@
// properties should apply here.
DefaultBehaviorQuery<T> query = DefaultBehaviorQuery.query(pd);
LocalizableMessage aliasDescription = query.getAliasDescription();
- if (aliasDescription == null) {
- app.println(INFO_EDITOR_HEADING_READ_ONLY_ALIAS_UNDEFINED.get(pd.getName()));
- } else {
+ if (aliasDescription != null) {
app.println(INFO_EDITOR_HEADING_READ_ONLY_ALIAS.get(pd.getName(), aliasDescription));
+ } else {
+ app.println(INFO_EDITOR_HEADING_READ_ONLY_ALIAS_UNDEFINED.get(pd.getName()));
}
break;
case 1:
--
Gitblit v1.10.0