From 171de54bc442bdf01394fd42e4ccfa6ac5c2ae8a Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 15 Apr 2012 00:10:58 +0000 Subject: [PATCH] - CheckStyle. --- .../AbilityFactoryStoreSVar.java | 26 +++++++++---------- .../card/spellability/AbilityStatic.java | 2 +- src/main/java/forge/gui/home/VHomeUI.java | 8 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java index ede8e4614da..7e548959534 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java @@ -179,7 +179,7 @@ public class AbilityFactoryStoreSVar { */ public static String storeSVarStackDescription(final AbilityFactory af, final SpellAbility sa) { final HashMap params = af.getMapParams(); - + final StringBuilder sb = new StringBuilder(); if (sa instanceof AbilitySub) { @@ -187,7 +187,7 @@ public class AbilityFactoryStoreSVar { } else { sb.append(sa.getSourceCard().getName()).append(" - "); } - + if (params.containsKey("StackDescription")) { sb.append(params.get("StackDescription")); return sb.toString(); @@ -264,42 +264,42 @@ public class AbilityFactoryStoreSVar { * a {@link forge.card.spellability.SpellAbility} object. */ public static void storeSVarResolve(final AbilityFactory af, final SpellAbility sa) { - //SVar$ OldToughness | Type$ Count | Expression$ CardToughness + //SVar$ OldToughness | Type$ Count | Expression$ CardToughness final HashMap params = af.getMapParams(); Card source = sa.getSourceCard(); - + String key = null; String type = null; String expr = null; - - if (params.containsKey("SVar")) { + + if (params.containsKey("SVar")) { key = params.get("SVar"); } - + if (params.containsKey("Type")) { type = params.get("Type"); } - + if (params.containsKey("Expression")) { expr = params.get("Expression"); } - + if (key == null || type == null || expr == null) { System.out.println("SVar, Type and Expression paramaters required for StoreSVar. They are missing for " + source.getName()); return; } - + int value = 0; - + if (type.equals("Count")) { value = CardFactoryUtil.xCount(source, expr); } //TODO For other types call a different function - + StringBuilder numBuilder = new StringBuilder(); numBuilder.append("Number$"); numBuilder.append(value); - + source.setSVar(key, numBuilder.toString()); } diff --git a/src/main/java/forge/card/spellability/AbilityStatic.java b/src/main/java/forge/card/spellability/AbilityStatic.java index 7222c03fd35..8ac4b39f91d 100644 --- a/src/main/java/forge/card/spellability/AbilityStatic.java +++ b/src/main/java/forge/card/spellability/AbilityStatic.java @@ -42,7 +42,7 @@ public abstract class AbilityStatic extends Ability { public AbilityStatic(final Card sourceCard, final String manaCost) { super(sourceCard, manaCost); } - + public AbilityStatic(final Card sourceCard, final Cost abCost, final Target tgt) { super(sourceCard, abCost.getTotalMana()); this.setManaCost(abCost.getTotalMana()); diff --git a/src/main/java/forge/gui/home/VHomeUI.java b/src/main/java/forge/gui/home/VHomeUI.java index c4cabd8eca0..6429ae72cf6 100644 --- a/src/main/java/forge/gui/home/VHomeUI.java +++ b/src/main/java/forge/gui/home/VHomeUI.java @@ -134,7 +134,7 @@ public enum VHomeUI implements IVTopLevelUI { pnlParent.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE)); pnlParent.setLayout(null); pnlParent.add(pnlLeft); - pnlParent.add(pnlRight); + pnlParent.add(pnlRight); // Left pane holds scroller with menu panel. pnlMenu.setLayout(new MigLayout("insets 0, gap 0, wrap, hidemode 3")); @@ -162,7 +162,7 @@ public enum VHomeUI implements IVTopLevelUI { allGroupPanels.get(e).setLayout(new MigLayout("insets 0, gap 0, wrap")); allGroupPanels.get(e).setName(e.toString()); } - + // For each item: Add to its group, and add to the card layout in right panel. for (final IVSubmenu item : allSubmenus) { allSubmenuLabels.put(EMenuItem.valueOf(item.getItemEnum()), makeItemLabel(item)); @@ -183,7 +183,7 @@ public enum VHomeUI implements IVTopLevelUI { groupClick(e, allGroupLabels.get(e)); } } - + // Select previous EMenuItem selected = null; try { @@ -218,7 +218,7 @@ public enum VHomeUI implements IVTopLevelUI { @Override public void populate() { - FView.SINGLETON_INSTANCE.getLpnDocument().add(pnlParent, JLayeredPane.DEFAULT_LAYER); + FView.SINGLETON_INSTANCE.getLpnDocument().add(pnlParent, JLayeredPane.DEFAULT_LAYER); } private void groupClick(final EMenuGroup e0, final JLabel lbl0) {