fix a crash caused by style
This commit is contained in:
parent
356f84c053
commit
24c0af8162
|
@ -198,6 +198,9 @@ public class ControlButtonData implements Cloneable, Observable, CustomControl {
|
||||||
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||||
|
|
||||||
data.setText(Optional.ofNullable(obj.get("text")).map(JsonElement::getAsString).orElse(""));
|
data.setText(Optional.ofNullable(obj.get("text")).map(JsonElement::getAsString).orElse(""));
|
||||||
|
if (!ButtonStyles.isInitialized()) {
|
||||||
|
ButtonStyles.init();
|
||||||
|
}
|
||||||
if (obj.get("style").toString().contains("\"name\"")) {
|
if (obj.get("style").toString().contains("\"name\"")) {
|
||||||
data.setStyle(gson.fromJson(Optional.ofNullable(obj.get("style")).map(JsonElement::getAsJsonObject).orElse(gson.toJsonTree(ControlButtonStyle.DEFAULT_BUTTON_STYLE).getAsJsonObject()), new TypeToken<ControlButtonStyle>() {}.getType()));
|
data.setStyle(gson.fromJson(Optional.ofNullable(obj.get("style")).map(JsonElement::getAsJsonObject).orElse(gson.toJsonTree(ControlButtonStyle.DEFAULT_BUTTON_STYLE).getAsJsonObject()), new TypeToken<ControlButtonStyle>() {}.getType()));
|
||||||
ButtonStyles.addStyle(data.getStyle());
|
ButtonStyles.addStyle(data.getStyle());
|
||||||
|
|
|
@ -175,9 +175,11 @@ public class ControlDirectionData implements Cloneable, Observable, CustomContro
|
||||||
ControlDirectionData data = new ControlDirectionData(Optional.ofNullable(obj.get("id")).map(JsonElement::getAsString).orElse(UUID.randomUUID().toString()));
|
ControlDirectionData data = new ControlDirectionData(Optional.ofNullable(obj.get("id")).map(JsonElement::getAsString).orElse(UUID.randomUUID().toString()));
|
||||||
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||||
|
|
||||||
|
if (!DirectionStyles.isInitialized()) {
|
||||||
|
DirectionStyles.init();
|
||||||
|
}
|
||||||
if (obj.get("style").toString().contains("\"name\"")) {
|
if (obj.get("style").toString().contains("\"name\"")) {
|
||||||
data.setStyle(gson.fromJson(Optional.ofNullable(obj.get("style")).map(JsonElement::getAsJsonObject).orElse(gson.toJsonTree(ControlDirectionStyle.DEFAULT_DIRECTION_STYLE).getAsJsonObject()), new TypeToken<ControlDirectionStyle>(){}.getType()));
|
data.setStyle(gson.fromJson(Optional.ofNullable(obj.get("style")).map(JsonElement::getAsJsonObject).orElse(gson.toJsonTree(ControlDirectionStyle.DEFAULT_DIRECTION_STYLE).getAsJsonObject()), new TypeToken<ControlDirectionStyle>(){}.getType()));
|
||||||
DirectionStyles.init();
|
|
||||||
DirectionStyles.addStyle(data.getStyle());
|
DirectionStyles.addStyle(data.getStyle());
|
||||||
} else {
|
} else {
|
||||||
data.setStyle(DirectionStyles.findStyleByName(obj.get("style").getAsString()));
|
data.setStyle(DirectionStyles.findStyleByName(obj.get("style").getAsString()));
|
||||||
|
|
Loading…
Reference in New Issue