Revision 8c8c6fcf
Added by Leszek Koltunski about 2 years ago
src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
---|---|---|
128 | 128 |
|
129 | 129 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
130 | 130 |
|
131 |
private void parseMetadata2(JSONObject object) throws JSONException |
|
131 |
private void parseMetadata2or3(JSONObject object) throws JSONException
|
|
132 | 132 |
{ |
133 | 133 |
mLongName = object.getString("longname"); |
134 | 134 |
mShortName = object.getString("shortname"); |
... | ... | |
414 | 414 |
|
415 | 415 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
416 | 416 |
|
417 |
private void parseAxis2(JSONArray object) throws JSONException |
|
417 |
private void parseAxis2or3(JSONArray object) throws JSONException
|
|
418 | 418 |
{ |
419 | 419 |
int numAxis = object.length(); |
420 | 420 |
|
... | ... | |
613 | 613 |
|
614 | 614 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
615 | 615 |
|
616 |
private void parseVersion2(JSONObject object) throws JSONException |
|
616 |
private void parseVersion2or3(JSONObject object) throws JSONException
|
|
617 | 617 |
{ |
618 | 618 |
JSONObject metadata = object.getJSONObject("metadata"); |
619 |
parseMetadata2(metadata); |
|
619 |
parseMetadata2or3(metadata);
|
|
620 | 620 |
JSONObject mesh = object.getJSONObject("mesh"); |
621 | 621 |
parseMesh(mesh); |
622 | 622 |
JSONArray axis = object.getJSONArray("axis"); |
623 |
parseAxis2(axis); |
|
623 |
parseAxis2or3(axis);
|
|
624 | 624 |
JSONArray quats = object.getJSONArray("quats"); |
625 | 625 |
parseQuats(quats); |
626 | 626 |
JSONObject scrambling = object.getJSONObject("scrambling"); |
... | ... | |
663 | 663 |
|
664 | 664 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
665 | 665 |
|
666 |
private void parseVersion2Metadata(JSONObject object) throws JSONException |
|
666 |
private void parseVersion2or3Metadata(JSONObject object) throws JSONException
|
|
667 | 667 |
{ |
668 | 668 |
JSONObject metadata = object.getJSONObject("metadata"); |
669 |
parseMetadata2(metadata); |
|
669 |
parseMetadata2or3(metadata);
|
|
670 | 670 |
} |
671 | 671 |
|
672 | 672 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
690 | 690 |
{ |
691 | 691 |
parseVersion1(object); |
692 | 692 |
} |
693 |
else if( major==2 ) |
|
693 |
else if( major==2 || major==3 )
|
|
694 | 694 |
{ |
695 |
parseVersion2(object); |
|
695 |
parseVersion2or3(object);
|
|
696 | 696 |
} |
697 | 697 |
else |
698 | 698 |
{ |
... | ... | |
730 | 730 |
{ |
731 | 731 |
parseVersion1Metadata(object); |
732 | 732 |
} |
733 |
else if( major==2 ) |
|
733 |
else if( major==2 || major==3 )
|
|
734 | 734 |
{ |
735 |
parseVersion2Metadata(object); |
|
735 |
parseVersion2or3Metadata(object);
|
|
736 | 736 |
} |
737 | 737 |
else |
738 | 738 |
{ |
... | ... | |
770 | 770 |
JSONObject object = new JSONObject(contents.toString()); |
771 | 771 |
int major = object.getInt("major"); |
772 | 772 |
|
773 |
if( major==1 || major==2 ) |
|
773 |
if( major==1 || major==2 || major==3 )
|
|
774 | 774 |
{ |
775 | 775 |
JSONObject metadata = object.getJSONObject("metadata"); |
776 | 776 |
return metadata.getInt("scrambles"); |
Also available in: Unified diff
Bump MAJOR version to 3 (we cannot intermix the new Mixup json objects with version 2 app interpreter)