From 0a513d14b86d6192e71d1cfeb1b7719fcddd4f74 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 23 Jul 2007 17:55:12 +0000
Subject: [PATCH] Fix issue 1819: add support for tagging properties as advanced.

---
 opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
index 88eebee..e55d148 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
@@ -387,6 +387,9 @@
   private static final String FIELD_YES =
     Messages.getString("general.yes"); //$NON-NLS-1$
 
+  private final static String HEADING_ADVANCED = Messages
+      .getString(KEY_PREFIX + "heading.advanced"); //$NON-NLS-1$
+
   private final static String HEADING_DEFAULT = Messages.getString(KEY_PREFIX
       + "heading.default"); //$NON-NLS-1$
 
@@ -493,6 +496,8 @@
     this.subCommand.addArgument(this.typeArgument);
 
     // Register common arguments.
+    registerAdvancedModeArgument(this.subCommand,
+        MSGID_DSCFG_DESCRIPTION_ADVANCED_HELP);
     registerPropertyNameArgument(this.subCommand);
 
     this.types = new TreeMap<String, AbstractManagedObjectDefinition<?, ?>>();
@@ -545,6 +550,15 @@
 
     // Display options.
     builder.startRow();
+    builder.appendCell(HEADING_ADVANCED);
+    builder.appendCell(HEADING_SEPARATOR);
+    if (pd.hasOption(PropertyOption.ADVANCED)) {
+      builder.appendCell(FIELD_YES);
+    } else {
+      builder.appendCell(FIELD_NO);
+    }
+
+    builder.startRow();
     builder.appendCell(HEADING_MULTI_VALUED);
     builder.appendCell(HEADING_SEPARATOR);
     if (pd.hasOption(PropertyOption.MULTI_VALUED)) {
@@ -725,6 +739,10 @@
           continue;
         }
 
+        if (!isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED)) {
+          continue;
+        }
+
         if (!propertyNames.isEmpty() && !propertyNames.contains(pd.getName())) {
           continue;
         }
@@ -781,6 +799,10 @@
           continue;
         }
 
+        if (!isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED)) {
+          continue;
+        }
+
         if (!propertyNames.isEmpty() && !propertyNames.contains(pd.getName())) {
           continue;
         }

--
Gitblit v1.10.0