From cbabf3a2b06c69420e7bb524c59afdd4669021e2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Jun 2015 09:41:44 +0000
Subject: [PATCH] Extracted cannotDisplay() methods.
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
index b1829ad..dd9a010 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
@@ -248,10 +248,7 @@
if (app.isInteractive()) {
SortedSet<PropertyDefinition<?>> properties = new TreeSet<>();
for (PropertyDefinition<?> pd : d.getAllPropertyDefinitions()) {
- if (pd.hasOption(PropertyOption.HIDDEN)) {
- continue;
- }
- if (!app.isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED)) {
+ if (cannotDisplay(app, pd)) {
continue;
}
properties.add(pd);
@@ -346,6 +343,11 @@
}
}
+ private static boolean cannotDisplay(ConsoleApplication app, PropertyDefinition<?> pd) {
+ return pd.hasOption(PropertyOption.HIDDEN)
+ || (!app.isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED));
+ }
+
/**
* Check that any referenced components are enabled if required.
*/
--
Gitblit v1.10.0