Spaces after ifs.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3139 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2004-10-15 18:20:28 +00:00
parent 8ad2aefdf2
commit 97e7d9c823
9 changed files with 40 additions and 40 deletions
@@ -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 // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -75,7 +75,7 @@ public class OrientableImageSprite extends ImageSprite
{ {
double theta; double theta;
switch(_orient) { switch (_orient) {
case NORTH: case NORTH:
default: default:
theta = 0.0; theta = 0.0;
@@ -181,7 +181,7 @@ public class OrientableImageSprite extends ImageSprite
graphics.transform(getRotationTransform()); graphics.transform(getRotationTransform());
if(_frames != null) { if (_frames != null) {
_frames.paintFrame( _frames.paintFrame(
graphics, graphics,
_frameIdx, _frameIdx,
@@ -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 // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -54,7 +54,7 @@ public abstract class CardGameController extends GameController
// Documentation inherited // Documentation inherited
public void messageReceived (MessageEvent event) public void messageReceived (MessageEvent event)
{ {
if(event.getName().equals(TAKE_HAND)) { if (event.getName().equals(TAKE_HAND)) {
handDealt((Hand)event.getArgs()[0]); handDealt((Hand)event.getArgs()[0]);
} }
} }
@@ -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 // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // 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()); _spritemgr.getHitSprites(al, me.getX(), me.getY());
if(al.size() > 0) { if (al.size() > 0) {
Iterator it = al.iterator(); Iterator it = al.iterator();
int highestLayer = Integer.MIN_VALUE; int highestLayer = Integer.MIN_VALUE;
CardSprite highestSprite = null; CardSprite highestSprite = null;
while(it.hasNext()) { while (it.hasNext()) {
Sprite sprite = (Sprite)it.next(); Sprite sprite = (Sprite)it.next();
if(sprite instanceof CardSprite) { if (sprite instanceof CardSprite) {
CardSprite cs = (CardSprite)sprite; CardSprite cs = (CardSprite)sprite;
if(cs.getRenderOrder() > highestLayer) { if (cs.getRenderOrder() > highestLayer) {
highestLayer = cs.getRenderOrder(); highestLayer = cs.getRenderOrder();
highestSprite = cs; highestSprite = cs;
} }
@@ -123,7 +123,7 @@ public abstract class CardPanel extends VirtualMediaPanel
_activeCardSprite = highestSprite; _activeCardSprite = highestSprite;
if(_activeCardSprite != null) { if (_activeCardSprite != null) {
_handleX = _activeCardSprite.getX() - me.getX(); _handleX = _activeCardSprite.getX() - me.getX();
_handleY = _activeCardSprite.getY() - me.getY(); _handleY = _activeCardSprite.getY() - me.getY();
@@ -135,14 +135,14 @@ public abstract class CardPanel extends VirtualMediaPanel
} }
} }
public void mouseReleased (MouseEvent me) { public void mouseReleased (MouseEvent me) {
if(_activeCardSprite != null && _hasBeenDragged) { if (_activeCardSprite != null && _hasBeenDragged) {
_activeCardSprite.queueNotification( _activeCardSprite.queueNotification(
new CardSpriteDraggedOp(_activeCardSprite, me) new CardSpriteDraggedOp(_activeCardSprite, me)
); );
} }
} }
public void mouseClicked (MouseEvent me) { public void mouseClicked (MouseEvent me) {
if(_activeCardSprite != null) { if (_activeCardSprite != null) {
_activeCardSprite.queueNotification( _activeCardSprite.queueNotification(
new CardSpriteClickedOp(_activeCardSprite, me) new CardSpriteClickedOp(_activeCardSprite, me)
); );
@@ -155,7 +155,7 @@ public abstract class CardPanel extends VirtualMediaPanel
MouseMotionAdapter mma = new MouseMotionAdapter() { MouseMotionAdapter mma = new MouseMotionAdapter() {
public void mouseDragged (MouseEvent me) public void mouseDragged (MouseEvent me)
{ {
if(_activeCardSprite != null && if (_activeCardSprite != null &&
_activeCardSprite.isDraggable()) { _activeCardSprite.isDraggable()) {
_activeCardSprite.setLocation( _activeCardSprite.setLocation(
me.getX() + _handleX, me.getX() + _handleX,
@@ -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 // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -125,7 +125,7 @@ public class Card implements CardCodes,
// Documentation inherited. // Documentation inherited.
public Comparable getKey () public Comparable getKey ()
{ {
if(_key == null) { if (_key == null) {
_key = new Byte(_value); _key = new Byte(_value);
} }
@@ -150,7 +150,7 @@ public class Card implements CardCodes,
*/ */
public boolean equals (Object other) public boolean equals (Object other)
{ {
if(other instanceof Card) { if (other instanceof Card) {
return _value == ((Card)other)._value; return _value == ((Card)other)._value;
} }
else { else {
@@ -167,17 +167,17 @@ public class Card implements CardCodes,
{ {
int number = getNumber(); int number = getNumber();
if(number == JOKER) { if (number == JOKER) {
return "Jk"; return "Jk";
} }
else { else {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if(number >= 2 && number <= 9) { if (number >= 2 && number <= 9) {
sb.append(Integer.toString(number)); sb.append(Integer.toString(number));
} }
else { else {
switch(number) { switch (number) {
case 10: sb.append('T'); break; case 10: sb.append('T'); break;
case JACK: sb.append('J'); break; case JACK: sb.append('J'); break;
case QUEEN: sb.append('Q'); 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 HEARTS: sb.append('h'); break;
case DIAMONDS: sb.append('d'); break; case DIAMONDS: sb.append('d'); break;
case CLUBS: sb.append('c'); break; case CLUBS: sb.append('c'); break;
@@ -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 // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -72,13 +72,13 @@ public class Deck implements CardCodes,
{ {
cards.clear(); cards.clear();
for(int i=HEARTS;i<=SPADES;i++) { for (int i=HEARTS;i<=SPADES;i++) {
for(int j=2;j<=ACE;j++) { for (int j=2;j<=ACE;j++) {
cards.add(new Card(j, i)); cards.add(new Card(j, i));
} }
} }
if(includeJokers) { if (includeJokers) {
cards.add(new Card(JOKER, -1)); cards.add(new Card(JOKER, -1));
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) public Hand dealHand (int size)
{ {
if(cards.size() < size) { if (cards.size() < size) {
return null; return null;
} }
else { else {
Hand hand = new Hand(); Hand hand = new Hand();
for(int i=0;i<size;i++) { for (int i=0;i<size;i++) {
hand.cards.add(cards.get(cards.size()-1)); hand.cards.add(cards.get(cards.size()-1));
cards.remove(cards.size()-1); cards.remove(cards.size()-1);
} }
@@ -1,5 +1,5 @@
// //
// $Id: Hand.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ // $Id: Hand.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -57,8 +57,8 @@ public class Hand implements CardCodes,
Iterator it = cards.iterator(); Iterator it = cards.iterator();
while(it.hasNext()) { while (it.hasNext()) {
if(((Card)it.next()).getSuit() == suit) { if (((Card)it.next()).getSuit() == suit) {
members++; members++;
} }
} }
@@ -1,5 +1,5 @@
// //
// $Id: CardGameManager.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $ // $Id: CardGameManager.java,v 1.5 2004/10/15 18:20:28 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,7 +50,7 @@ public class CardGameManager extends GameManager
*/ */
public Hand dealHand (Deck deck, int size, int playerIndex) public Hand dealHand (Deck deck, int size, int playerIndex)
{ {
if(deck.cards.size() < size) { if (deck.cards.size() < size) {
return null; return null;
} }
else { else {
@@ -80,13 +80,13 @@ public class CardGameManager extends GameManager
*/ */
public Hand[] dealHands (Deck deck, int size) public Hand[] dealHands (Deck deck, int size)
{ {
if(deck.cards.size() < size * _playerCount) { if (deck.cards.size() < size * _playerCount) {
return null; return null;
} }
else { else {
Hand[] hands = new Hand[_playerCount]; Hand[] hands = new Hand[_playerCount];
for(int i=0;i<_playerCount;i++) { for (int i=0;i<_playerCount;i++) {
hands[i] = dealHand(deck, size, i); hands[i] = dealHand(deck, size, i);
} }
@@ -1,5 +1,5 @@
// //
// $Id: TrickCardGameControllerDelegate.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ // $Id: TrickCardGameControllerDelegate.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,10 +50,10 @@ public class TrickCardGameControllerDelegate extends TurnGameControllerDelegate
TrickCardGameObject tcgObj = (TrickCardGameObject)_gameObj; TrickCardGameObject tcgObj = (TrickCardGameObject)_gameObj;
if(ace.getName().equals(tcgObj.getPlayingHandFieldName())) { if (ace.getName().equals(tcgObj.getPlayingHandFieldName())) {
_tcgctrl.playingHandDidChange(tcgObj.getPlayingHand()); _tcgctrl.playingHandDidChange(tcgObj.getPlayingHand());
} }
else if(ace.getName().equals(tcgObj.getPlayingTrickFieldName())) { else if (ace.getName().equals(tcgObj.getPlayingTrickFieldName())) {
_tcgctrl.playingTrickDidChange(tcgObj.getPlayingTrick()); _tcgctrl.playingTrickDidChange(tcgObj.getPlayingTrick());
} }
} }
@@ -1,5 +1,5 @@
// //
// $Id: TrickCardGameManagerDelegate.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $ // $Id: TrickCardGameManagerDelegate.java,v 1.4 2004/10/15 18:20:28 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -48,7 +48,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
// Documentation inherited. // Documentation inherited.
public void setFirstTurnHolder () public void setFirstTurnHolder ()
{ {
if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) { if (_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) {
super.setFirstTurnHolder(); super.setFirstTurnHolder();
} }
else { else {
@@ -59,7 +59,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
// Documentation inherited. // Documentation inherited.
public void setNextTurnHolder () public void setNextTurnHolder ()
{ {
if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) { if (_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) {
super.setNextTurnHolder(); super.setNextTurnHolder();
} }
else { else {