Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stream.Collector initialized + some updates #201

Closed
wants to merge 82 commits into from

Commits on May 20, 2014

  1. education

    douglascrockford committed May 20, 2014
    Configuration menu
    Copy the full SHA
    1272d80 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aab1017 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2014

  1. deleted

    douglascrockford committed May 22, 2014
    Configuration menu
    Copy the full SHA
    8114b97 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Configuration menu
    Copy the full SHA
    9b6872b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2015

  1. Configuration menu
    Copy the full SHA
    d6ba318 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2015

  1. s/covert/convert/

    stleary committed May 1, 2015
    Configuration menu
    Copy the full SHA
    37f099e View commit details
    Browse the repository at this point in the history
  2. Merge pull request stleary#120 from douglascrockford/Spelling-error-i…

    …n-CDL
    
    Fix spelling error in CDL.java comment
    stleary committed May 1, 2015
    Configuration menu
    Copy the full SHA
    03807e2 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2015

  1. Merge pull request stleary#118 from douglascrockford/fix-for-JSONML-t…

    …oString-JSONArray
    
    fix toString(JSONArray) to emit object.toString() values
    stleary committed May 2, 2015
    Configuration menu
    Copy the full SHA
    b56fe9f View commit details
    Browse the repository at this point in the history

Commits on May 6, 2015

  1. Configuration menu
    Copy the full SHA
    a851bf0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request stleary#122 from douglascrockford/merge-branch-for…

    …-issue-110
    
    Merge branch for issue stleary#110
    stleary committed May 6, 2015
    Configuration menu
    Copy the full SHA
    0cf7491 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. iterable

    stleary committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    d2cd1a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2015

  1. Merge pull request stleary#132 from douglascrockford/iterable-JSONArray

    made JSONArray iterable.
    stleary committed Jun 7, 2015
    Configuration menu
    Copy the full SHA
    04eab16 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2015

  1. Configuration menu
    Copy the full SHA
    8bc62cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d6bf7d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b39ccc2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    03c4fc7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a76d726 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2015

  1. latest

    stleary committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    6ab6f06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    474f285 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. latest

    stleary committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    410afaf View commit details
    Browse the repository at this point in the history
  2. update version dates

    stleary committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    71d9ad2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2015

  1. Merge pull request stleary#135 from douglascrockford/big-numbers

    Proposed BigInteger, BigDecimal support
    stleary committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    4f8b25d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. Update README

    stleary committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    96b2e38 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2015

  1. latest

    stleary committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    ca30016 View commit details
    Browse the repository at this point in the history
  2. enum support

    stleary committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    9785b4f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5fc22e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. Configuration menu
    Copy the full SHA
    ce2de45 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. Update README

    stleary committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    b0191a6 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. JSONObject and JSONArray initialization:

    JSONObject(Map<String, ?> map) allows to initialize the JSONObject with
    a Map<String, String>
    
    JSONArray(Collection<?> collection) allows to initialize a JSONArray
    with a Collection<JSONObject>
    Lukas Treyer committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    0afd266 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2015

  1. changed all method signatures containing collections and maps to accept

    wildcard generic types, e.g. Collection<?> instead of
    Collection<Object>. This was proposed by other pull requests (stleary#111,
    stleary#112) already. Consider this commit as merge with stleary#111 and stleary#112.
    
    JSONArray:
    	- put(Collection<?> value) {...}
    	- put(Map<String, ?> value) {...}
    	- put(int index, Collection<?> value) throws JSONException {...}
    	- put(int index, Map<String, ?> value) throws JSONException {...}
    
    JSONObject:
    	- put(String key, Collection<?> value) throws JSONException {...}
    	- put(String key, Map<String, ?> value) throws JSONException {...}
    
    
    Changed all code affected by new JSONObject and JSONArray constructors:
    	
    JSONObject:
    	- valueToString(Object value) throws JSONException {
    		- value instanceof Map
    		- value instanceof Collection
    	  }
    	- wrap(Object object) {
    		- value instanceof Map
    		- value instanceof Collection
    	  }
    	- writeValue(Writer writer, Object value,
    			 int indentFactor, int indent){
            - value instanceof Map
            - value instanceof Collection
          }
    Lukas Treyer committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    409eb9f View commit details
    Browse the repository at this point in the history
  2. changed Map<String, ?> method parameters to Map<?,?>

    changed Iterator to foreach loop in JSONArray ctor
    JSONArray(Collection<?> collection) and JSONObject ctor
    JSONObject(Map<?,?> map)
    Lukas Treyer committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    25b5aa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Properly overrides the Exception class.

    John J. Aylward committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    4e77383 View commit details
    Browse the repository at this point in the history
  2. Fixes possible NPE

    John J. Aylward committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    ceba8e8 View commit details
    Browse the repository at this point in the history
  3. Allows a custom message to be passed with a cause.

    John J. Aylward committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    e239e19 View commit details
    Browse the repository at this point in the history
  4. Expands javadoc

    John J. Aylward committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    0e13241 View commit details
    Browse the repository at this point in the history
  5. makes params final

    John J. Aylward committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    1b06a80 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5ddc515 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. fixes file date

    johnjaylward committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    1448163 View commit details
    Browse the repository at this point in the history
  2. updates file dates

    johnjaylward committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    637c1fe View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2015

  1. Merge pull request stleary#160 from johnjaylward/FixXMLNPE

    Fixes possible NullPointerException in XML.toString(object, tagName)
    stleary committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    09b6af4 View commit details
    Browse the repository at this point in the history
  2. Fix NullPointerException in XML.toString(object, tagName)

    Setting version date to match commit date.
    stleary committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    6757e04 View commit details
    Browse the repository at this point in the history
  3. Merge pull request stleary#159 from johnjaylward/FixExceptionInheritance

    Properly overrides the Exception class.
    stleary committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    b0a9507 View commit details
    Browse the repository at this point in the history
  4. 1 Configuration menu
    Copy the full SHA
    e7f4eb5 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2015

  1. Configuration menu
    Copy the full SHA
    a07d391 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2015

  1. Modifies XML output to be handled the same for a native java array as…

    … well as a JSONArray.
    John J. Aylward committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    91c6f09 View commit details
    Browse the repository at this point in the history
  2. Changes JSONArray for loops to use the new iterators.

    John J. Aylward committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    7886c96 View commit details
    Browse the repository at this point in the history
  3. Formatting

    John J. Aylward committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    105426b View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2015

  1. Merge pull request stleary#168 from douglascrockford/readme-maven-info

    Include latest Maven release information
    stleary committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    dfd1911 View commit details
    Browse the repository at this point in the history
  2. Merge pull request stleary#153 from treyerl/master

    JSONObject and JSONArray initialization for Map&lt;?,?> and Collection&lt;?>
    stleary committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    564ad2c View commit details
    Browse the repository at this point in the history
  3. Update JSONObject.java

    Update version for stleary#153
    stleary committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    33ae025 View commit details
    Browse the repository at this point in the history
  4. Update JSONArray.java

    Update version for stleary#153
    stleary committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    a109f58 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2015

  1. Configuration menu
    Copy the full SHA
    5f2e77f View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2015

  1. Merge pull request stleary#175 from douglascrockford/release-20151123

    Update readme for 20151123 release
    stleary committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    44275e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2015

  1. Update JavaDoc for JSONObject Constructors

    Two JSONObject constructors incorrectly specify a @throws JSONException
    tag in the JavaDoc for those constructors. Remove the relevant JavaDoc.
    andrew-fletcher committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    cadba94 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2015

  1. Merge pull request stleary#179 from andrew-fletcher/UpdateJavaDocForJ…

    …SONOBject
    
    Remove throws JSONException JavaDoc from 2 methods that do not throw this exception.
    stleary committed Dec 6, 2015
    Configuration menu
    Copy the full SHA
    2ec538f View commit details
    Browse the repository at this point in the history
  2. Update version

    Update version after merge of stleary#179
    stleary committed Dec 6, 2015
    Configuration menu
    Copy the full SHA
    39e3ccc View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2015

  1. Configuration menu
    Copy the full SHA
    ec8f649 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Configuration menu
    Copy the full SHA
    23cf659 View commit details
    Browse the repository at this point in the history
  2. Merge pull request stleary#180 from netheril96/my

    Remove executable bit
    stleary committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    03dd662 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4830259 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2015

  1. Configuration menu
    Copy the full SHA
    8688494 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2015

  1. Merge pull request stleary#185 from douglascrockford/write-with-inden…

    …t-params
    
    change to public: write(writer, indentfactor, indent)
    stleary committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    e6f5047 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2016

  1. Merge pull request stleary#170 from johnjaylward/HandleArraysConsiste…

    …ntly
    
    Handle arrays consistently
    stleary committed Jan 1, 2016
    Configuration menu
    Copy the full SHA
    757fd56 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a971736 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e2a0bb1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2b2fac3 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2016

  1. Merge pull request stleary#186 from douglascrockford/update-readme-wi…

    …th-number-info
    
    Update README with number information
    stleary committed Jan 3, 2016
    Configuration menu
    Copy the full SHA
    9950350 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Configuration menu
    Copy the full SHA
    5b67330 View commit details
    Browse the repository at this point in the history
  2. Fixes stleary#187 -0 now returns as a double.

    John J. Aylward committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    07b2d65 View commit details
    Browse the repository at this point in the history
  3. fixes error in -0 check

    John J. Aylward committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    39b1c0c View commit details
    Browse the repository at this point in the history
  4. Removes custom XML stringToValue method in favor of keeping a consistent

    implementation in JSONObject
    John J. Aylward committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    3007fc8 View commit details
    Browse the repository at this point in the history
  5. adds back in the XML.stringToValue method, but deprecates it.

    John J. Aylward committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    c2b3f2b View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2016

  1. Merge pull request stleary#188 from johnjaylward/FixNegativeZero

    Fix negative zero
    stleary committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    97f1b27 View commit details
    Browse the repository at this point in the history
  2. Version date

    stleary committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    62486fd View commit details
    Browse the repository at this point in the history
  3. Version date

    stleary committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    93c79ca View commit details
    Browse the repository at this point in the history
  4. Version date

    stleary committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    ba2585f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Java 1.6 compatibility.

    skreutzer committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    60349ec View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2016

  1. Merge pull request stleary#195 from publishing-systems/master

    Java 1.6 compatibility.
    stleary committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    07a0f60 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2016

  1. Update README

    Include some text about 1.6 compatibility and add the latest release information.
    stleary committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    2657915 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. initial

    AmirHossein committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    b95ad85 View commit details
    Browse the repository at this point in the history
  2. merge

    AmirHossein committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    766445c View commit details
    Browse the repository at this point in the history
  3. Optional getters added

    AmirHossein committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    429cd0b View commit details
    Browse the repository at this point in the history