From aeb44f00f00898c5eabbf823f4db102a03456ba0 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 18 Feb 2012 21:41:16 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/deck/DeckBase.java | 16 ++++++++-------- src/main/java/forge/deck/DeckSection.java | 8 ++++---- src/main/java/forge/deck/DeckSet.java | 15 ++++++++++----- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/main/java/forge/deck/DeckBase.java b/src/main/java/forge/deck/DeckBase.java index b706f3d4258..6a4dca0e06d 100644 --- a/src/main/java/forge/deck/DeckBase.java +++ b/src/main/java/forge/deck/DeckBase.java @@ -12,14 +12,14 @@ import forge.util.IHasName; public abstract class DeckBase implements IHasName, Serializable, Comparable { private static final long serialVersionUID = -7538150536939660052L; // gameType is from Constant.GameType, like GameType.Regular - + private final String name; private String comment = null; public DeckBase(String name0) { name = name0; } - + @Override public int compareTo(final DeckBase d) { return this.getName().compareTo(d.getName()); @@ -33,15 +33,15 @@ public abstract class DeckBase implements IHasName, Serializable, Comparable getCardPool(); - + public void setComment(final String comment) { this.comment = comment; } @@ -56,9 +56,9 @@ public abstract class DeckBase implements IHasName, Serializable, Comparable { @@ -37,7 +37,7 @@ public class DeckSection extends ItemPool { public DeckSection() { super(CardPrinted.class); } - + public DeckSection(Iterable> cards) { this(); addAll(cards); @@ -80,8 +80,8 @@ public class DeckSection extends ItemPool { */ public void add(final String cardName, final String setCode, int amount) { this.add(CardDb.instance().getCard(cardName, setCode), amount); - } - + } + /** * Adds the. * diff --git a/src/main/java/forge/deck/DeckSet.java b/src/main/java/forge/deck/DeckSet.java index 3f29163cbc4..605e1317c49 100644 --- a/src/main/java/forge/deck/DeckSet.java +++ b/src/main/java/forge/deck/DeckSet.java @@ -21,7 +21,7 @@ public class DeckSet extends DeckBase implements IHasName { private static final long serialVersionUID = -1628725522049635829L; private Deck humanDeck; private List aiDecks = new ArrayList(); - + public final Deck getHumanDeck() { return humanDeck; } @@ -29,8 +29,12 @@ public class DeckSet extends DeckBase implements IHasName { return aiDecks; } public final void setHumanDeck(Deck humanDeck) { this.humanDeck = humanDeck; } - - public final void addAiDeck(Deck aiDeck) { if ( aiDeck != null ) this.aiDecks.add(aiDeck); } + + public final void addAiDeck(Deck aiDeck) { + if (aiDeck != null) { + this.aiDecks.add(aiDeck); + } + } @Override public ItemPoolView getCardPool() { @@ -38,8 +42,9 @@ public class DeckSet extends DeckBase implements IHasName { } public void addAiDecks(Deck[] computer) { - for(int i = 0; i < computer.length; i++) + for (int i = 0; i < computer.length; i++) { aiDecks.add(computer[i]); + } } /* (non-Javadoc) * @see forge.deck.DeckBase#newInstance(java.lang.String) @@ -48,5 +53,5 @@ public class DeckSet extends DeckBase implements IHasName { protected DeckBase newInstance(String name0) { return new DeckSet(name0); } - + }