From cc729bcf7c76d1eac33630eb6086d5c651dae93a Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 24 Mar 2012 14:50:10 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/deck/Deck.java | 2 +- src/main/java/forge/quest/QuestController.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/deck/Deck.java b/src/main/java/forge/deck/Deck.java index f4138af29c7..34b1985ac4c 100644 --- a/src/main/java/forge/deck/Deck.java +++ b/src/main/java/forge/deck/Deck.java @@ -210,7 +210,7 @@ public class Deck extends DeckBase implements Serializable { final Iterator lineIterator = lines.iterator(); while (lineIterator.hasNext()) { final String line = lineIterator.next(); - if (line.startsWith(";")) { continue; } // that is a comment or not-yet-supported card + if (line.startsWith(";")) { continue; } // that is a comment or not-yet-supported card if (line.startsWith("[")) { break; } // there comes another section final Matcher m = p.matcher(line.trim()); diff --git a/src/main/java/forge/quest/QuestController.java b/src/main/java/forge/quest/QuestController.java index 759f91a9888..e4555fb2bf0 100644 --- a/src/main/java/forge/quest/QuestController.java +++ b/src/main/java/forge/quest/QuestController.java @@ -74,7 +74,7 @@ public class QuestController { private QuestEventManager challengesManager = null; private QuestBazaarManager bazaar = null; - + private QuestPetStorage pets = null; // This is used by shop. Had no idea where else to place this @@ -100,12 +100,11 @@ public class QuestController { public void selectPet(Integer slot, String name) { selectedPets.put(slot, name); } - + public String getSelectedPet(Integer slot) { return selectedPets.get(slot); - } - - + } + // Cards - class uses data from here /** * Gets the cards. @@ -332,13 +331,12 @@ public class QuestController { } return this.challengesManager; } - - + public QuestPetStorage getPetsStorage() { - if ( this.pets == null ) { + if (this.pets == null) { this.pets = new QuestPetStorage(ForgeProps.getFile(NewConstants.Quest.BAZAAR)); } - + return this.pets; }