external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-02-17 14:49:33 +00:00
parent 4bf610b677
commit 4ca06ed240
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/card/replacement/ReplacementHandler.java
View File

@@ -99,7 +99,7 @@ public class ReplacementHandler {
}
if (chosenRE != null) {
if(executeReplacement(runParams, chosenRE, decider)) {
if (executeReplacement(runParams, chosenRE, decider)) {
AllZone.getGameLog().add("ReplacementEffect", chosenRE.toString(), 2);
return true;
}
@@ -124,7 +124,7 @@ public class ReplacementHandler {
SpellAbility effectSA = null;
if(mapParams.containsKey("ReplaceWith")) {
if (mapParams.containsKey("ReplaceWith")) {
String effectSVar = mapParams.get("ReplaceWith");
String effectAbString = replacementEffect.getHostCard().getSVar(effectSVar);
@@ -138,7 +138,7 @@ public class ReplacementHandler {
//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);
}
@@ -153,7 +153,7 @@ public class ReplacementHandler {
}
} else {
//AI-logic
if(!replacementEffect.aiShouldRun(effectSA)) {
if (!replacementEffect.aiShouldRun(effectSA)) {
return false;
}
}

12
src/main/java/forge/model/FModel.java
View File

@@ -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<ViewField> 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<ViewField> fieldViews = Singletons.getView().getMatchView().getFieldViews();

2
src/main/java/forge/util/SectionUtil.java
View File

@@ -79,7 +79,7 @@ public class SectionUtil {
}
public static Map<String, String> parseKvPairs(List<String> lines) {
Map<String,String> result = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
Map<String, String> result = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
for (final String dd : lines) {
final String[] v = dd.split(":", 2);