Fix error-prone crash

triplea-game · Feb 22, 2018 · 3b109d8 · 3b109d8
1 parent f7df208
commit 3b109d8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/game-core/src/main/java/games/strategy/engine/data/MutableProperty.java b/game-core/src/main/java/games/strategy/engine/data/MutableProperty.java
@@ -91,7 +91,7 @@ public static <T> MutableProperty<T> of(
   /**
    * Convenience method to create a generic String instance of this interface.
    */
-  public static MutableProperty<String> of(
+  public static MutableProperty<String> ofString(
       final ThrowingConsumer<String, Exception> setter,
       final Supplier<String> getter,
       final Runnable resetter) {

diff --git a/game-core/src/main/java/games/strategy/engine/xml/TestAttachment.java b/game-core/src/main/java/games/strategy/engine/xml/TestAttachment.java
@@ -58,7 +58,7 @@ public void validate(final GameData data) {}
   @Override
   public Map<String, MutableProperty<?>> getPropertyMap() {
     return ImmutableMap.<String, MutableProperty<?>>builder()
-        .put("value", MutableProperty.of(this::setValue, this::getValue, this::resetValue))
+        .put("value", MutableProperty.ofString(this::setValue, this::getValue, this::resetValue))
         .build();
   }
 }
diff --git a/game-core/src/main/java/games/strategy/triplea/attachments/CanalAttachment.java b/game-core/src/main/java/games/strategy/triplea/attachments/CanalAttachment.java
@@ -172,7 +172,7 @@ public void validate(final GameData data) throws GameParseException {
   @Override
   public Map<String, MutableProperty<?>> getPropertyMap() {
     return ImmutableMap.<String, MutableProperty<?>>builder()
-        .put("canalName", MutableProperty.of(this::setCanalName, this::getCanalName, this::resetCanalName))
+        .put("canalName", MutableProperty.ofString(this::setCanalName, this::getCanalName, this::resetCanalName))
         .put("landTerritories",
             MutableProperty.of(
                 this::setLandTerritories,

diff --git a/game-core/src/main/java/games/strategy/triplea/attachments/UnitSupportAttachment.java b/game-core/src/main/java/games/strategy/triplea/attachments/UnitSupportAttachment.java
@@ -466,17 +466,17 @@ public Map<String, MutableProperty<?>> getPropertyMap() {
                 this::getImpArtTech,
                 this::resetImpArtTech))
         .put("dice",
-            MutableProperty.of(
+            MutableProperty.ofString(
                 this::setDice,
                 this::getDice,
                 this::resetDice))
         .put("side",
-            MutableProperty.of(
+            MutableProperty.ofString(
                 this::setSide,
                 this::getSide,
                 this::resetSide))
         .put("faction",
-            MutableProperty.of(
+            MutableProperty.ofString(
                 this::setFaction,
                 this::getFaction,
                 this::resetFaction))

diff --git a/game-core/src/test/java/games/strategy/engine/data/FakeAttachment.java b/game-core/src/test/java/games/strategy/engine/data/FakeAttachment.java
@@ -81,7 +81,7 @@ public void validate(final GameData data) {
   @Override
   public Map<String, MutableProperty<?>> getPropertyMap() {
     return ImmutableMap.<String, MutableProperty<?>>builder()
-        .put("name", MutableProperty.of(this::setName, this::getName, () -> {
+        .put("name", MutableProperty.ofString(this::setName, this::getName, () -> {
         }))
         .build();
   }