From dff07c9a412e85162f1358a5a1dbfb3adbe30961 Mon Sep 17 00:00:00 2001
From: salyh <hendrikdev22@gmail.com>
Date: Sat, 12 Jul 2014 17:03:50 +0200
Subject: [PATCH 17/20] removed unneccesary code

Signed-off-by: salyh <hendrikdev22@gmail.com>
---
 .../org/apache/fleece/core/JsonBaseStreamParser.java | 20 +++++++++-----------
 .../apache/fleece/jaxrs/xml/WadlDocumentToJson.java  |  4 ++--
 .../main/java/org/apache/fleece/mapper/Mapper.java   | 10 +++++-----
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonBaseStreamParser.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonBaseStreamParser.java
index abbdeaf..4a815ab 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonBaseStreamParser.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonBaseStreamParser.java
@@ -103,6 +103,11 @@ public abstract class JsonBaseStreamParser implements JsonChars,
     }
 
     private boolean ifConstructingStringValueAdd(char c) throws IOException {
+        
+        if(!constructingStringValue) {
+            return false;
+        }
+        
         if (escaped) {
 
             if (c == 'u') {
@@ -129,17 +134,10 @@ public abstract class JsonBaseStreamParser implements JsonChars,
 
             escaped = false;
         }
+        
+        appendValue(c);
 
-        return ifConstructingStringValueAdd(c, false);
-    }
-
-    private boolean ifConstructingStringValueAdd(final char c,
-            final boolean escape) {
-        if (constructingStringValue) {
-
-            appendValue(escape ? Strings.asEscapedChar(c) : c);
-        }
-        return constructingStringValue;
+        return true;
     }
 
     protected abstract char readNextChar() throws IOException;
@@ -742,7 +740,7 @@ public abstract class JsonBaseStreamParser implements JsonChars,
 
     }
 
-    private boolean isNumber(final char c) {
+    private static boolean isNumber(final char c) {
         return isAsciiDigit(c) || c == DOT || c == MINUS || c == PLUS
                 || c == EXP_LOWERCASE || c == EXP_UPPERCASE;
     }
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java b/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java
index a580e75..74d70d6 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java
+++ b/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java
@@ -46,7 +46,7 @@ public class WadlDocumentToJson {
         return builder.add(item.getNodeName(), createNode(item)).build().toString();
     }
 
-    private void addChildrens(final String nodeName, final JsonObjectBuilder builder, final NodeList children) {
+    private void addChildrens(/*final String nodeName, */final JsonObjectBuilder builder, final NodeList children) {
         final Map<String, Collection<Node>> nodesByName = new LinkedHashMap<String, Collection<Node>>();
         for (int i = 0; i < children.getLength(); i++) {
             final Node node = children.item(i);
@@ -91,7 +91,7 @@ public class WadlDocumentToJson {
             if (childBuilder == null) {
                 childBuilder = builderFactory.createObjectBuilder();
             }
-            addChildrens(node.getNodeName(), childBuilder, node.getChildNodes());
+            addChildrens(/*node.getNodeName(),*/ childBuilder, node.getChildNodes());
         }
         return childBuilder;
     }
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java b/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java
index 815426f..3ce2578 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java
+++ b/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java
@@ -126,12 +126,12 @@ public class Mapper {
         return generator;
     }
 
-    private <T> String convertFrom(final Class<T> aClass, final T value) {
+    /*private <T> String convertFrom(final Class<T> aClass, final T value) {
         final Converter<T> converter = (Converter<T>) findConverter(aClass);
         return doConverFrom(value, converter);
-    }
+    }*/
 
-    private <T> String doConverFrom(final T value, final Converter<T> converter) {
+    private static <T> String doConverFrom(final T value, final Converter<T> converter) {
         if (converter == null) {
             throw new MapperException("can't convert " + value + " to String");
         }
@@ -237,9 +237,9 @@ public class Mapper {
             return;
         }
 
-        JsonGenerator gen = null;
+        //JsonGenerator gen = null;
         try {
-            gen = doWriteObject(generator, object);
+            /*gen = */doWriteObject(generator, object);
         } finally {
             doCloseOrFlush(generator);
         }
-- 
1.8.5.2 (Apple Git-48)