From 4ca06ed240ea345878b18989f5436360f50da332 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 17 Feb 2012 14:49:33 +0000 Subject: [PATCH] - CheckStyle. --- .../card/replacement/ReplacementHandler.java | 22 +++++++++---------- src/main/java/forge/model/FModel.java | 12 ++++++++-- src/main/java/forge/util/SectionUtil.java | 8 +++---- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/main/java/forge/card/replacement/ReplacementHandler.java b/src/main/java/forge/card/replacement/ReplacementHandler.java index 7105fab9032..567bf660533 100644 --- a/src/main/java/forge/card/replacement/ReplacementHandler.java +++ b/src/main/java/forge/card/replacement/ReplacementHandler.java @@ -98,8 +98,8 @@ public class ReplacementHandler { } } - if (chosenRE != null) { - if(executeReplacement(runParams, chosenRE, decider)) { + if (chosenRE != null) { + if (executeReplacement(runParams, chosenRE, decider)) { AllZone.getGameLog().add("ReplacementEffect", chosenRE.toString(), 2); return true; } @@ -121,10 +121,10 @@ public class ReplacementHandler { HashMap mapParams = replacementEffect.getMapParams(); replacementEffect.setHasRun(true); - + SpellAbility effectSA = null; - - if(mapParams.containsKey("ReplaceWith")) { + + if (mapParams.containsKey("ReplaceWith")) { String effectSVar = mapParams.get("ReplaceWith"); String effectAbString = replacementEffect.getHostCard().getSVar(effectSVar); @@ -134,14 +134,14 @@ public class ReplacementHandler { replacementEffect.setReplacingObjects(runParams, effectSA); } - + //Decider gets to choose wether or not to apply the replacement. if (replacementEffect.getMapParams().containsKey("Optional")) { Player optDecider = decider; - if(mapParams.containsKey("OptionalDecider") && effectSA != null) { + if (mapParams.containsKey("OptionalDecider") && effectSA != null) { optDecider = AbilityFactory.getDefinedPlayers(replacementEffect.getHostCard(), mapParams.get("OptionalDecider"), effectSA).get(0); } - + if (optDecider.isHuman()) { StringBuilder buildQuestion = new StringBuilder("Apply replacement effect of "); buildQuestion.append(replacementEffect.getHostCard()); @@ -153,7 +153,7 @@ public class ReplacementHandler { } } else { //AI-logic - if(!replacementEffect.aiShouldRun(effectSA)) { + if (!replacementEffect.aiShouldRun(effectSA)) { return false; } } @@ -164,7 +164,7 @@ public class ReplacementHandler { replacementEffect.setHasRun(false); return true; //Nothing should replace the event. } - } + } if (replacementEffect.getHostCard().getController().isHuman()) { AllZone.getGameAction().playSpellAbilityNoStack(effectSA, false); @@ -174,7 +174,7 @@ public class ReplacementHandler { } replacementEffect.setHasRun(false); - + return true; } diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 209d9bf656c..85f8e4a5f13 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -310,7 +310,11 @@ public class FModel { return this.gameState; } - /** TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase. */ + /** + * TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase. + * + * @return a boolean. + */ public final boolean savePrefs() { final ForgePreferences fp = preferences; final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); @@ -354,7 +358,11 @@ public class FModel { return true; } - /** TODO: Needs to be reworked for efficiency with rest of prefs loads in codebase. */ + /** + * TODO: Needs to be reworked for efficiency with rest of prefs loads in codebase. + * + * @return a boolean. + */ public final boolean loadPrefs() { final ForgePreferences fp = Singletons.getModel().getPreferences(); final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); diff --git a/src/main/java/forge/util/SectionUtil.java b/src/main/java/forge/util/SectionUtil.java index 2ec2e646531..d6541e12963 100644 --- a/src/main/java/forge/util/SectionUtil.java +++ b/src/main/java/forge/util/SectionUtil.java @@ -77,15 +77,15 @@ public class SectionUtil { return result; } - + public static Map parseKvPairs(List lines) { - Map result = new TreeMap(String.CASE_INSENSITIVE_ORDER); - + Map result = new TreeMap(String.CASE_INSENSITIVE_ORDER); + for (final String dd : lines) { final String[] v = dd.split(":", 2); result.put(v[0], v.length > 1 ? v[1].trim() : ""); } - + return result; } }