1 files changed, 29 insertions, 22 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/OptionUtil.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/OptionUtil.java
index 2aa68611..76ae9feb 100644
--- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/OptionUtil.java
+++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/OptionUtil.java
@@ -43,6 +43,13 @@ import de.lmu.ifi.dbs.elki.utilities.pairs.Pair;
  */
 public final class OptionUtil {
   /**
+   * Fake constructor. Use static method.
+   */
+  private OptionUtil() {
+    // Do not instantiate.
+  }
+
+  /**
    * Returns a string representation of the specified list of options containing
    * the names of the options.
    * 
@@ -50,16 +57,16 @@ public final class OptionUtil {
    * @param options the list of options
    * @return the names of the options
    */
-  public static <O extends Parameter<?, ?>> String optionsNamesToString(List<O> options) {
-    StringBuffer buffer = new StringBuffer();
-    buffer.append("[");
+  public static <O extends Parameter<?>> String optionsNamesToString(List<O> options) {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append('[');
     for(int i = 0; i < options.size(); i++) {
       buffer.append(options.get(i).getName());
       if(i != options.size() - 1) {
-        buffer.append(",");
+        buffer.append(',');
       }
     }
-    buffer.append("]");
+    buffer.append(']');
     return buffer.toString();
   }
 
@@ -71,16 +78,16 @@ public final class OptionUtil {
    * @param options the list of options
    * @return the names of the options
    */
-  public static <O extends Parameter<?, ?>> String optionsNamesToString(O[] options) {
-    StringBuffer buffer = new StringBuffer();
-    buffer.append("[");
+  public static <O extends Parameter<?>> String optionsNamesToString(O[] options) {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append('[');
     for(int i = 0; i < options.length; i++) {
       buffer.append(options[i].getName());
       if(i != options.length - 1) {
-        buffer.append(",");
+        buffer.append(',');
       }
     }
-    buffer.append("]");
+    buffer.append(']');
     return buffer.toString();
   }
 
@@ -92,18 +99,18 @@ public final class OptionUtil {
    * @param parameters the list of number parameters
    * @return the names and the values of the parameters
    */
-  public static <N extends Parameter<?, ?>> String parameterNamesAndValuesToString(List<N> parameters) {
-    StringBuffer buffer = new StringBuffer();
-    buffer.append("[");
+  public static <N extends Parameter<?>> String parameterNamesAndValuesToString(List<N> parameters) {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append('[');
     for(int i = 0; i < parameters.size(); i++) {
       buffer.append(parameters.get(i).getName());
-      buffer.append(":");
+      buffer.append(':');
       buffer.append(parameters.get(i).getValueAsString());
       if(i != parameters.size() - 1) {
         buffer.append(", ");
       }
     }
-    buffer.append("]");
+    buffer.append(']');
     return buffer.toString();
   }
 
@@ -116,15 +123,15 @@ public final class OptionUtil {
    * @param indent Indentation string
    * @param options List of options
    */
-  public static void formatForConsole(StringBuffer buf, int width, String indent, Collection<Pair<Object, Parameter<?, ?>>> options) {
-    for(Pair<Object, Parameter<?, ?>> pair : options) {
+  public static void formatForConsole(StringBuilder buf, int width, String indent, Collection<Pair<Object, Parameter<?>>> options) {
+    for(Pair<Object, Parameter<?>> pair : options) {
       String currentOption = pair.getSecond().getName();
       String syntax = pair.getSecond().getSyntax();
       String longDescription = pair.getSecond().getFullDescription();
 
       buf.append(SerializedParameterization.OPTION_PREFIX);
       buf.append(currentOption);
-      buf.append(" ");
+      buf.append(' ');
       buf.append(syntax);
       buf.append(FormatUtil.NEWLINE);
       println(buf, width, longDescription, indent);
@@ -139,7 +146,7 @@ public final class OptionUtil {
    * @param data Data to write.
    * @param indent Indentation
    */
-  public static void println(StringBuffer buf, int width, String data, String indent) {
+  public static void println(StringBuilder buf, int width, String data, String indent) {
     for(String line : FormatUtil.splitAtLastBlank(data, width - indent.length())) {
       buf.append(indent);
       buf.append(line);
@@ -158,7 +165,7 @@ public final class OptionUtil {
    * @param indent Text indent
    * @return Formatted description
    */
-  public static StringBuffer describeParameterizable(StringBuffer buf, Class<?> pcls, int width, String indent) {
+  public static StringBuilder describeParameterizable(StringBuilder buf, Class<?> pcls, int width, String indent) {
     try {
       println(buf, width, "Description for class " + pcls.getName(), "");
 
@@ -189,7 +196,7 @@ public final class OptionUtil {
       TrackParameters track = new TrackParameters(config);
       @SuppressWarnings("unused")
       Object p = ClassGenericsUtil.tryInstantiate(Object.class, pcls, track);
-      Collection<Pair<Object, Parameter<?, ?>>> options = track.getAllParameters();
+      Collection<Pair<Object, Parameter<?>>> options = track.getAllParameters();
       if(options.size() > 0) {
         OptionUtil.formatForConsole(buf, width, indent, options);
       }
@@ -198,7 +205,7 @@ public final class OptionUtil {
     }
     catch(Exception e) {
       LoggingUtil.exception("Error instantiating class to describe.", e.getCause());
-      buf.append("No description available: " + e);
+      buf.append("No description available: ").append(e);
       return buf;
     }
   }