svn commit: r1441559 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core: conf/DefaultConfiguration.java conf/Property.java util/shell/commands/ConfigCommand.java

[kt...@apache.org]

Author: kturner
Date: Fri Feb  1 18:02:20 2013
New Revision: 1441559

URL: http://svn.apache.org/viewvc?rev=1441559&view=rev
Log:
ACCUMULO-958 fixed spelling, hid experimental options in shell

Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1441559&r1=1441558&r2=1441559&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Fri Feb  1 18:02:20 2013
@@ -47,7 +47,7 @@ public class DefaultConfiguration extend
   public Iterator<Entry<String,String>> iterator() {
     TreeMap<String,String> entries = new TreeMap<String,String>();
     for (Property prop : Property.values())
-      if (!prop.isExprimental() && !prop.getType().equals(PropertyType.PREFIX))
+      if (!prop.isExperimental() && !prop.getType().equals(PropertyType.PREFIX))
         entries.put(prop.getKey(), prop.getDefaultValue());
     
     return entries.entrySet().iterator();
@@ -78,7 +78,7 @@ public class DefaultConfiguration extend
     ArrayList<Property> prefixes = new ArrayList<Property>();
     TreeMap<String,Property> sortedProps = new TreeMap<String,Property>();
     for (Property prop : Property.values()) {
-      if (prop.isExprimental())
+      if (prop.isExperimental())
         continue;
 
       if (prop.getType().equals(PropertyType.PREFIX))
@@ -90,7 +90,7 @@ public class DefaultConfiguration extend
     doc.println("  <p>Jump to: ");
     String delimiter = "";
     for (Property prefix : prefixes) {
-      if (prefix.isExprimental())
+      if (prefix.isExperimental())
         continue;
 
       doc.print(delimiter + "<a href='#" + prefix.name() + "'>" + prefix.getKey() + "*</a>");
@@ -101,7 +101,7 @@ public class DefaultConfiguration extend
     doc.println("  <table>");
     for (Property prefix : prefixes) {
       
-      if (prefix.isExprimental())
+      if (prefix.isExperimental())
         continue;
 
       doc.println("   <tr><td colspan='5'><a name='" + prefix.name() + "' class='large'>" + prefix.getKey() + "*</a></td></tr>");
@@ -112,7 +112,7 @@ public class DefaultConfiguration extend
       
       boolean highlight = true;
       for (Property prop : sortedProps.values()) {
-        if (prop.isExprimental())
+        if (prop.isExperimental())
           continue;
 
         if (prop.getKey().startsWith(prefix.getKey())) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1441559&r1=1441558&r2=1441559&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java Fri Feb  1 18:02:20 2013
@@ -373,7 +373,7 @@ public enum Property {
     return this.description;
   }
   
-  public boolean isExprimental() {
+  public boolean isExperimental() {
     return experimental;
   }
 

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1441559&r1=1441558&r2=1441559&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Fri Feb  1 18:02:20 2013
@@ -53,7 +53,7 @@ public class ConfigCommand extends Comma
     final Token cmd = new Token(getName());
     final Token sub = new Token("-" + setOpt.getOpt());
     for (Property p : Property.values()) {
-      if (!(p.getKey().endsWith("."))) {
+      if (!(p.getKey().endsWith(".")) && !p.isExperimental()) {
         sub.addSubcommand(new Token(p.toString()));
       }
     }