Allow numeric values in configuration

In preparation for #25.
Add minimal JSON parser from [1].
Accept long and JsonValue directly in Configuration#addOption.

[1] https://github.com/ralfstx/minimal-json

Author: ralfstx

bundles/com.eclipsesource.jshint/META-INF/MANIFEST.MF

@@ -7,5 +7,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: EclipseSource
 Bundle-ActivationPolicy: lazy
 Export-Package: com.eclipsesource.jshint;version="0.9.5",
- com.eclipsesource.jshint.internal;version="0.9.5";x-friends:="com.eclipsesource.jshint.test"
+ com.eclipsesource.jshint.internal;version="0.9.5";x-friends:="com.eclipsesource.jshint.test",
+ com.eclipsesource.json;version="0.9.0"
 Require-Bundle: org.mozilla.javascript;bundle-version="1.7.2"

bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/Configuration.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 EclipseSource.
+ * Copyright (c) 2012, 2013 EclipseSource.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,8 +10,8 @@
  ******************************************************************************/
 package com.eclipsesource.jshint;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonValue;
 
 
 /**
@@ -21,27 +21,56 @@
  */
 public class Configuration {
 
-  private final Map<String,Object> options;
-  private final Map<String, Object> predefs;
+  private final JsonObject options;
+  private final JsonObject predefs;
 
   public Configuration() {
-    predefs = new LinkedHashMap<String, Object>();
-    options = new LinkedHashMap<String, Object>();
+    options = new JsonObject();
+    predefs = new JsonObject();
   }
 
   /**
    * Adds an option. If the option is already defined, it is overridden.
    *
-   * @param option
+   * @param name
    *          the name of the option
    * @param value
-   *          the value for this option, <code>true</code> to enable the option, <code>false</code>
-   *          to disable it
-   * @return the configuration to allow chaining
+   *          the value for this option
+   * @return the configuration itself to allow chaining
+   * @see http://www.jshint.com/docs/
+   */
+  public Configuration addOption( String name, boolean value ) {
+    options.remove( name ).add( name, value );
+    return this;
+  }
+
+  /**
+   * Adds an option. If the option is already defined, it is overridden.
+   *
+   * @param name
+   *          the name of the option
+   * @param value
+   *          the value for this option
+   * @return the configuration itself to allow chaining
+   * @see http://www.jshint.com/docs/
+   */
+  public Configuration addOption( String name, long value ) {
+    options.remove( name ).add( name, value );
+    return this;
+  }
+
+  /**
+   * Adds an option. If the option is already defined, it is overridden.
+   *
+   * @param name
+   *          the name of the option
+   * @param value
+   *          the value for this option
+   * @return the configuration itself to allow chaining
    * @see http://www.jshint.com/docs/
    */
-  public Configuration addOption( String option, boolean value ) {
-    options.put( option, Boolean.valueOf( value ) );
+  public Configuration addOption( String name, JsonValue value ) {
+    options.remove( name ).add( name, value );
     return this;
   }
 
@@ -57,42 +86,19 @@ public Configuration addOption( String option, boolean value ) {
    * @return the configuration to allow chaining
    */
   public Configuration addPredefined( String identifier, boolean overwrite ) {
-    predefs.put( identifier, Boolean.valueOf( overwrite ) );
+    predefs.remove( identifier ).add( identifier, overwrite );
     return this;
   }
 
   public String toJson() {
-    StringBuilder builder = new StringBuilder();
-    builder.append( "{" );
     if( !predefs.isEmpty() ) {
-      builder.append( "\"predef\": {" );
-      addMap( builder, predefs );
-      builder.append( "}" );
-      if( !options.isEmpty() ) {
-        builder.append( ", " );
-      }
+      options.remove( "predef" ).add( "predef", predefs );
     }
-    addMap( builder, options );
-    builder.append( "}" );
-    return builder.toString();
+    return options.toString();
   }
 
   Object getOption( String option ) {
     return options.get( option );
   }
 
-  private void addMap( StringBuilder builder, Map<String, Object> map ) {
-    boolean first = true;
-    for( String key : map.keySet() ) {
-      if( !first ) {
-        builder.append( ", " );
-      }
-      builder.append( '"' );
-      builder.append( key );
-      builder.append( "\": " );
-      builder.append( map.get( key ) );
-      first = false;
-    }
-  }
-
 }