From d0b5e78f7a09bf4037e36293011ecbf0e14f3f22 Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 10 Dec 2013 01:13:34 +0000 Subject: [PATCH] Code cleanup --- .../forge/gui/match/controllers/CHand.java | 20 ++++++++++--------- .../main/java/forge/view/arcane/HandArea.java | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java index f77b2263332..6a7b18ff466 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java @@ -72,28 +72,28 @@ public class CHand implements ICDoc { public void update(final Observable a, final Object b) { FThreads.invokeInEdtNowOrLater(updateRoutine); } - - private final Runnable updateRoutine = new Runnable() { + + private final Runnable updateRoutine = new Runnable() { @Override public void run() { updateHand(); } }; - + public void updateHand() { FThreads.assertExecutedByEdt(true); - + final HandArea p = view.getHandArea(); VField vf = CMatchUI.SINGLETON_INSTANCE.getFieldViewFor(player); - if ( null == vf ) + if (vf == null) { return; + } final Rectangle rctLibraryLabel = vf.getDetailsPanel().getLblLibrary().getBounds(); final List cc = player.getZone(ZoneType.Hand).getCards(); // Animation starts from the library label and runs to the hand panel. // This check prevents animation running if label hasn't been realized yet. - if (rctLibraryLabel.isEmpty() ) { + if (rctLibraryLabel.isEmpty()) { return; } -/* || p.getWidth() <= 0 */ List tmp, diff; tmp = new ArrayList(); @@ -104,7 +104,8 @@ public class CHand implements ICDoc { diff.removeAll(cc); if (diff.size() == p.getCardPanels().size()) { p.clear(); - } else { + } + else { for (final Card card : diff) { p.removeCardPanel(p.getCardPanel(card.getUniqueNumber())); } @@ -137,7 +138,8 @@ public class CHand implements ICDoc { if (Singletons.getView().getFrame().isShowing()) { Animation.moveCard(startX, startY, startWidth, endX, endY, endWidth, animationPanel, toPanel, layeredPane, 500); - } else { + } + else { Animation.moveCard(toPanel); } } diff --git a/forge-gui/src/main/java/forge/view/arcane/HandArea.java b/forge-gui/src/main/java/forge/view/arcane/HandArea.java index 364e95d4f7d..3ffe592d6aa 100644 --- a/forge-gui/src/main/java/forge/view/arcane/HandArea.java +++ b/forge-gui/src/main/java/forge/view/arcane/HandArea.java @@ -66,7 +66,7 @@ public class HandArea extends CardArea { CPrompt.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt); super.mouseLeftClicked(panel, evt); } - + /** {@inheritDoc} */ @Override public final void mouseRightClicked(final CardPanel panel, final MouseEvent evt) {