From f9f1caafc6e5d0436f944b1b67876c13fa627917 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Tue, 24 Jun 2025 18:57:53 +0200 Subject: [PATCH] extract some code --- .../ui/gamedataeditors/CommonEditor.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java index 18a1d0f..8203071 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java @@ -445,18 +445,14 @@ public class CommonEditor { } else if (source == conditionApply && (Boolean) value) { selectedCondition.magnitude = (Integer) conditionMagnitude.getValue(); selectedCondition.duration = conditionForever.isSelected() ? ActorCondition.DURATION_FOREVER : (Integer) conditionDuration.getValue(); - if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) { - selectedCondition.duration = 1; - } + setDurationToDefaultIfNone(); updateEffectTimedConditionWidgets(selectedCondition); conditionsModel.itemChanged(selectedCondition); updateHit = true; } else if (source == conditionImmunity && (Boolean) value) { selectedCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedCondition.duration = conditionForever.isSelected() ? ActorCondition.DURATION_FOREVER : (Integer) conditionDuration.getValue(); - if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) { - selectedCondition.duration = 1; - } + setDurationToDefaultIfNone(); updateEffectTimedConditionWidgets(selectedCondition); conditionsModel.itemChanged(selectedCondition); updateHit = true; @@ -466,9 +462,7 @@ public class CommonEditor { updateHit = true; } else if (source == conditionTimed && (Boolean) value) { selectedCondition.duration = (Integer) conditionDuration.getValue(); - if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) { - selectedCondition.duration = 1; - } + setDurationToDefaultIfNone(); updateEffectTimedConditionWidgets(selectedCondition); conditionsModel.itemChanged(selectedCondition); updateHit = true; @@ -487,6 +481,12 @@ public class CommonEditor { } return updateHit; } + + private void setDurationToDefaultIfNone() { + if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) { + selectedCondition.duration = 1; + } + } } //region list-models