From 97e7d9c823c001d6f929b817b073cc7119f8130f Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 15 Oct 2004 18:20:28 +0000 Subject: [PATCH] Spaces after ifs. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3139 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../media/sprite/OrientableImageSprite.java | 6 +++--- .../parlor/card/client/CardGameController.java | 4 ++-- .../parlor/card/client/CardPanel.java | 18 +++++++++--------- .../com/threerings/parlor/card/data/Card.java | 14 +++++++------- .../com/threerings/parlor/card/data/Deck.java | 12 ++++++------ .../com/threerings/parlor/card/data/Hand.java | 6 +++--- .../parlor/card/server/CardGameManager.java | 8 ++++---- .../trick/TrickCardGameControllerDelegate.java | 6 +++--- .../trick/TrickCardGameManagerDelegate.java | 6 +++--- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/java/com/threerings/media/sprite/OrientableImageSprite.java b/src/java/com/threerings/media/sprite/OrientableImageSprite.java index 93df08bb2..2e823e46b 100644 --- a/src/java/com/threerings/media/sprite/OrientableImageSprite.java +++ b/src/java/com/threerings/media/sprite/OrientableImageSprite.java @@ -1,5 +1,5 @@ // -// $Id: OrientableImageSprite.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $ +// $Id: OrientableImageSprite.java,v 1.5 2004/10/15 18:20:28 andrzej Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -75,7 +75,7 @@ public class OrientableImageSprite extends ImageSprite { double theta; - switch(_orient) { + switch (_orient) { case NORTH: default: theta = 0.0; @@ -181,7 +181,7 @@ public class OrientableImageSprite extends ImageSprite graphics.transform(getRotationTransform()); - if(_frames != null) { + if (_frames != null) { _frames.paintFrame( graphics, _frameIdx, diff --git a/src/java/com/threerings/parlor/card/client/CardGameController.java b/src/java/com/threerings/parlor/card/client/CardGameController.java index cafe4f790..a9a51904f 100644 --- a/src/java/com/threerings/parlor/card/client/CardGameController.java +++ b/src/java/com/threerings/parlor/card/client/CardGameController.java @@ -1,5 +1,5 @@ // -// $Id: CardGameController.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ +// $Id: CardGameController.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -54,7 +54,7 @@ public abstract class CardGameController extends GameController // Documentation inherited public void messageReceived (MessageEvent event) { - if(event.getName().equals(TAKE_HAND)) { + if (event.getName().equals(TAKE_HAND)) { handDealt((Hand)event.getArgs()[0]); } } diff --git a/src/java/com/threerings/parlor/card/client/CardPanel.java b/src/java/com/threerings/parlor/card/client/CardPanel.java index 190493919..ea04a4b9b 100644 --- a/src/java/com/threerings/parlor/card/client/CardPanel.java +++ b/src/java/com/threerings/parlor/card/client/CardPanel.java @@ -1,5 +1,5 @@ // -// $Id: CardPanel.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ +// $Id: CardPanel.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -103,18 +103,18 @@ public abstract class CardPanel extends VirtualMediaPanel _spritemgr.getHitSprites(al, me.getX(), me.getY()); - if(al.size() > 0) { + if (al.size() > 0) { Iterator it = al.iterator(); int highestLayer = Integer.MIN_VALUE; CardSprite highestSprite = null; - while(it.hasNext()) { + while (it.hasNext()) { Sprite sprite = (Sprite)it.next(); - if(sprite instanceof CardSprite) { + if (sprite instanceof CardSprite) { CardSprite cs = (CardSprite)sprite; - if(cs.getRenderOrder() > highestLayer) { + if (cs.getRenderOrder() > highestLayer) { highestLayer = cs.getRenderOrder(); highestSprite = cs; } @@ -123,7 +123,7 @@ public abstract class CardPanel extends VirtualMediaPanel _activeCardSprite = highestSprite; - if(_activeCardSprite != null) { + if (_activeCardSprite != null) { _handleX = _activeCardSprite.getX() - me.getX(); _handleY = _activeCardSprite.getY() - me.getY(); @@ -135,14 +135,14 @@ public abstract class CardPanel extends VirtualMediaPanel } } public void mouseReleased (MouseEvent me) { - if(_activeCardSprite != null && _hasBeenDragged) { + if (_activeCardSprite != null && _hasBeenDragged) { _activeCardSprite.queueNotification( new CardSpriteDraggedOp(_activeCardSprite, me) ); } } public void mouseClicked (MouseEvent me) { - if(_activeCardSprite != null) { + if (_activeCardSprite != null) { _activeCardSprite.queueNotification( new CardSpriteClickedOp(_activeCardSprite, me) ); @@ -155,7 +155,7 @@ public abstract class CardPanel extends VirtualMediaPanel MouseMotionAdapter mma = new MouseMotionAdapter() { public void mouseDragged (MouseEvent me) { - if(_activeCardSprite != null && + if (_activeCardSprite != null && _activeCardSprite.isDraggable()) { _activeCardSprite.setLocation( me.getX() + _handleX, diff --git a/src/java/com/threerings/parlor/card/data/Card.java b/src/java/com/threerings/parlor/card/data/Card.java index 5333124bc..0d1ecaacd 100644 --- a/src/java/com/threerings/parlor/card/data/Card.java +++ b/src/java/com/threerings/parlor/card/data/Card.java @@ -1,5 +1,5 @@ // -// $Id: Card.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $ +// $Id: Card.java,v 1.5 2004/10/15 18:20:28 andrzej Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -125,7 +125,7 @@ public class Card implements CardCodes, // Documentation inherited. public Comparable getKey () { - if(_key == null) { + if (_key == null) { _key = new Byte(_value); } @@ -150,7 +150,7 @@ public class Card implements CardCodes, */ public boolean equals (Object other) { - if(other instanceof Card) { + if (other instanceof Card) { return _value == ((Card)other)._value; } else { @@ -167,17 +167,17 @@ public class Card implements CardCodes, { int number = getNumber(); - if(number == JOKER) { + if (number == JOKER) { return "Jk"; } else { StringBuffer sb = new StringBuffer(); - if(number >= 2 && number <= 9) { + if (number >= 2 && number <= 9) { sb.append(Integer.toString(number)); } else { - switch(number) { + switch (number) { case 10: sb.append('T'); break; case JACK: sb.append('J'); break; case QUEEN: sb.append('Q'); break; @@ -187,7 +187,7 @@ public class Card implements CardCodes, } } - switch(getSuit()) { + switch (getSuit()) { case HEARTS: sb.append('h'); break; case DIAMONDS: sb.append('d'); break; case CLUBS: sb.append('c'); break; diff --git a/src/java/com/threerings/parlor/card/data/Deck.java b/src/java/com/threerings/parlor/card/data/Deck.java index fb9eb00c0..b42121dc1 100644 --- a/src/java/com/threerings/parlor/card/data/Deck.java +++ b/src/java/com/threerings/parlor/card/data/Deck.java @@ -1,5 +1,5 @@ // -// $Id: Deck.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ +// $Id: Deck.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -72,13 +72,13 @@ public class Deck implements CardCodes, { cards.clear(); - for(int i=HEARTS;i<=SPADES;i++) { - for(int j=2;j<=ACE;j++) { + for (int i=HEARTS;i<=SPADES;i++) { + for (int j=2;j<=ACE;j++) { cards.add(new Card(j, i)); } } - if(includeJokers) { + if (includeJokers) { cards.add(new Card(JOKER, -1)); cards.add(new Card(JOKER, -1)); } @@ -101,13 +101,13 @@ public class Deck implements CardCodes, */ public Hand dealHand (int size) { - if(cards.size() < size) { + if (cards.size() < size) { return null; } else { Hand hand = new Hand(); - for(int i=0;i