Merge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8)

Manually merged CRLF changes + additional small patch for changes that SHOULD NOT be in the changeset but that the SVN -> GIT sync script has added

1 files changed, 21 insertions, 21 deletions

diff --git a/src/com/vaadin/external/json/JSONString.java b/src/com/vaadin/external/json/JSONString.java
index 7b574d1915..cc7e4d8c07 100644
--- a/src/com/vaadin/external/json/JSONString.java
+++ b/src/com/vaadin/external/json/JSONString.java
@@ -1,21 +1,21 @@
-package com.vaadin.external.json;

-

-import java.io.Serializable;

-

-/**

- * The <code>JSONString</code> interface allows a <code>toJSONString()</code>

- * method so that a class can change the behavior of

- * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>, and

- * <code>JSONWriter.value(</code>Object<code>)</code>. The

- * <code>toJSONString</code> method will be used instead of the default behavior

- * of using the Object's <code>toString()</code> method and quoting the result.

- */

-public interface JSONString extends Serializable {

-    /**

-     * The <code>toJSONString</code> method allows a class to produce its own

-     * JSON serialization.

-     * 

-     * @return A strictly syntactically correct JSON text.

-     */

-    public String toJSONString();

-}

+package com.vaadin.external.json;
+
+import java.io.Serializable;
+
+/**
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
+ * method so that a class can change the behavior of
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>, and
+ * <code>JSONWriter.value(</code>Object<code>)</code>. The
+ * <code>toJSONString</code> method will be used instead of the default behavior
+ * of using the Object's <code>toString()</code> method and quoting the result.
+ */
+public interface JSONString extends Serializable {
+    /**
+     * The <code>toJSONString</code> method allows a class to produce its own
+     * JSON serialization.
+     * 
+     * @return A strictly syntactically correct JSON text.
+     */
+    public String toJSONString();
+}