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/GetPropSubCommandHandler.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
index 36f8aa9..f106a01 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
@@ -48,7 +48,6 @@
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.config.OptionalRelationDefinition;
import org.forgerock.opendj.config.PropertyDefinition;
-import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.RelationDefinition;
import org.forgerock.opendj.config.RelativeInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.SetRelationDefinition;
@@ -273,18 +272,12 @@
builder.appendHeading(INFO_DSCFG_HEADING_PROPERTY_VALUE.get());
builder.addSortKey(0);
for (PropertyDefinition<?> pd : pdList) {
- if (pd.hasOption(PropertyOption.HIDDEN)) {
+ if (cannotDisplay(app, pd, propertyNames)) {
continue;
}
- if (!app.isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED)) {
- continue;
- }
-
- if (propertyNames.isEmpty() || propertyNames.contains(pd.getName())) {
- displayProperty(app, builder, child, pd, valuePrinter);
- setCommandBuilderUseful(true);
- }
+ displayProperty(app, builder, child, pd, valuePrinter);
+ setCommandBuilderUseful(true);
}
PrintStream out = app.getOutputStream();
--
Gitblit v1.10.0