TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save valid property in JSON

Browse Source
This commit is contained in:
serso 2016-03-08 23:30:31 +01:00
parent 6c095e0552
commit a753ca0562
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/solovyev/android/calculator/DisplayState.java
View File

@ -26,7 +26,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ContextMenu; import android.view.ContextMenu;
import jscl.math.Generic;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.solovyev.android.calculator.jscl.JsclOperation; import org.solovyev.android.calculator.jscl.JsclOperation;
@ -34,8 +34,6 @@ import org.solovyev.android.calculator.jscl.JsclOperation;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import jscl.math.Generic;
public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo { public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
public static final Creator<DisplayState> CREATOR = new Creator<DisplayState>() { public static final Creator<DisplayState> CREATOR = new Creator<DisplayState>() {
@ -50,6 +48,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
} }
}; };
private static final String JSON_TEXT = "t"; private static final String JSON_TEXT = "t";
private static final String JSON_VALID = "v";
@Nonnull @Nonnull
public final String text; public final String text;
public final boolean valid; public final boolean valid;
@ -66,7 +65,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
} }
DisplayState(@Nonnull JSONObject json) { DisplayState(@Nonnull JSONObject json) {
this(json.optString(JSON_TEXT), true, Calculator.NO_SEQUENCE); this(json.optString(JSON_TEXT), json.optBoolean(JSON_VALID, true), Calculator.NO_SEQUENCE);
} }
private DisplayState(Parcel in) { private DisplayState(Parcel in) {
@ -123,6 +122,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
public JSONObject toJson() throws JSONException { public JSONObject toJson() throws JSONException {
final JSONObject json = new JSONObject(); final JSONObject json = new JSONObject();
json.put(JSON_TEXT, text); json.put(JSON_TEXT, text);
json.put(JSON_VALID, valid);
return json; return json;
} }