Updated Branches: refs/heads/master ecb474f65 -> f3d6e19a9
fix file names Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3d6e19a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3d6e19a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3d6e19a Branch: refs/heads/master Commit: f3d6e19a9469cd07b674988610429e65dbaafd7d Parents: ecb474f Author: Igor Vaynberg <[email protected]> Authored: Mon Apr 1 13:01:31 2013 -0700 Committer: Igor Vaynberg <[email protected]> Committed: Mon Apr 1 13:01:31 2013 -0700 ---------------------------------------------------------------------- .../wicket/ajax/json/JSONSequenceStringer.java | 57 ----------- .../org/apache/wicket/ajax/json/JSONStringer.java | 79 +++++++++++++++ .../wicket/ajax/json/JsonSequenceStringer.java | 57 +++++++++++ .../org/apache/wicket/ajax/json/JsonStringer.java | 79 --------------- 4 files changed, 136 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f3d6e19a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONSequenceStringer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONSequenceStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONSequenceStringer.java deleted file mode 100644 index 1e0b8df..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONSequenceStringer.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.ajax.json; - -import java.io.IOException; - -import org.apache.wicket.util.io.StringBufferWriter; - -/** - * An efficient implementation of a JSON stringer. The efficiency comes from the fact that istead of - * a {@link String} this class can return a {@link CharSequence}. This is better for downstream - * method that can accept a {@link CharSequence} becuase it requires one less memory copy of the - * internal {@link AppendingStringBufferWriter} to a {@link String} to get the JSON. - * - * @author igor - */ -public class JSONSequenceStringer extends JSONWriter -{ - public JSONSequenceStringer() - { - super(new StringBufferWriter()); - } - - /** - * @return JSON text as a {@link CharSequence} - */ - public CharSequence toCharSequence() - { - - if (mode != 'd') - return null; - - try - { - writer.flush(); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - return ((StringBufferWriter)writer).getStringBuffer(); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/f3d6e19a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java new file mode 100755 index 0000000..76b2b4e --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java @@ -0,0 +1,79 @@ +package org.apache.wicket.ajax.json; + +/* +Copyright (c) 2006 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +import java.io.StringWriter; + +/** + * JSONStringer provides a quick and convenient way of producing JSON text. + * The texts produced strictly conform to JSON syntax rules. No whitespace is + * added, so the results are ready for transmission or storage. Each instance of + * JSONStringer can produce one JSON text. + * <p> + * A JSONStringer instance provides a <code>value</code> method for appending + * values to the + * text, and a <code>key</code> + * method for adding keys before values in objects. There are <code>array</code> + * and <code>endArray</code> methods that make and bound array values, and + * <code>object</code> and <code>endObject</code> methods which make and bound + * object values. All of these methods return the JSONWriter instance, + * permitting cascade style. For example, <pre> + * myString = new JSONStringer() + * .object() + * .key("JSON") + * .value("Hello, World!") + * .endObject() + * .toString();</pre> which produces the string <pre> + * {"JSON":"Hello, World!"}</pre> + * <p> + * The first method called must be <code>array</code> or <code>object</code>. + * There are no methods for adding commas or colons. JSONStringer adds them for + * you. Objects and arrays can be nested up to 20 levels deep. + * <p> + * This can sometimes be easier than using a JSONObject to build a string. + * @author JSON.org + * @version 2008-09-18 + */ +public class JSONStringer extends JSONWriter { + /** + * Make a fresh JSONStringer. It can be used to build one JSON text. + */ + public JSONStringer() { + super(new StringWriter()); + } + + /** + * Return the JSON text. This method is used to obtain the product of the + * JSONStringer instance. It will return <code>null</code> if there was a + * problem in the construction of the JSON text (such as the calls to + * <code>array</code> were not properly balanced with calls to + * <code>endArray</code>). + * @return The JSON text. + */ + @Override + public String toString() { + return this.mode == 'd' ? this.writer.toString() : null; + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/f3d6e19a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java new file mode 100644 index 0000000..be56a57 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.ajax.json; + +import java.io.IOException; + +import org.apache.wicket.util.io.StringBufferWriter; + +/** + * An efficient implementation of a JSON stringer. The efficiency comes from the fact that istead of + * a {@link String} this class can return a {@link CharSequence}. This is better for downstream + * method that can accept a {@link CharSequence} becuase it requires one less memory copy of the + * internal {@link AppendingStringBufferWriter} to a {@link String} to get the JSON. + * + * @author igor + */ +public class JsonSequenceStringer extends JSONWriter +{ + public JsonSequenceStringer() + { + super(new StringBufferWriter()); + } + + /** + * @return JSON text as a {@link CharSequence} + */ + public CharSequence toCharSequence() + { + + if (mode != 'd') + return null; + + try + { + writer.flush(); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + return ((StringBufferWriter)writer).getStringBuffer(); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/f3d6e19a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonStringer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonStringer.java deleted file mode 100755 index c25d79f..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonStringer.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.apache.wicket.ajax.json; - -/* -Copyright (c) 2006 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.io.StringWriter; - -/** - * JSONStringer provides a quick and convenient way of producing JSON text. - * The texts produced strictly conform to JSON syntax rules. No whitespace is - * added, so the results are ready for transmission or storage. Each instance of - * JSONStringer can produce one JSON text. - * <p> - * A JSONStringer instance provides a <code>value</code> method for appending - * values to the - * text, and a <code>key</code> - * method for adding keys before values in objects. There are <code>array</code> - * and <code>endArray</code> methods that make and bound array values, and - * <code>object</code> and <code>endObject</code> methods which make and bound - * object values. All of these methods return the JSONWriter instance, - * permitting cascade style. For example, <pre> - * myString = new JSONStringer() - * .object() - * .key("JSON") - * .value("Hello, World!") - * .endObject() - * .toString();</pre> which produces the string <pre> - * {"JSON":"Hello, World!"}</pre> - * <p> - * The first method called must be <code>array</code> or <code>object</code>. - * There are no methods for adding commas or colons. JSONStringer adds them for - * you. Objects and arrays can be nested up to 20 levels deep. - * <p> - * This can sometimes be easier than using a JSONObject to build a string. - * @author JSON.org - * @version 2008-09-18 - */ -public class JsonStringer extends JSONWriter { - /** - * Make a fresh JSONStringer. It can be used to build one JSON text. - */ - public JsonStringer() { - super(new StringWriter()); - } - - /** - * Return the JSON text. This method is used to obtain the product of the - * JSONStringer instance. It will return <code>null</code> if there was a - * problem in the construction of the JSON text (such as the calls to - * <code>array</code> were not properly balanced with calls to - * <code>endArray</code>). - * @return The JSON text. - */ - @Override - public String toString() { - return this.mode == 'd' ? this.writer.toString() : null; - } -}
