AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yet more formatting changes. Should be just about compliant with the standard.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3138 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2004-10-15 03:09:46 +00:00
parent 0b0fcf9d15
commit 8ad2aefdf2
9 changed files with 97 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/card/data/Card.java
+10 -19
View File
@@ -1,5 +1,5 @@
//
// $Id: Card.java,v 1.3 2004/10/15 00:14:23 andrzej Exp $
// $Id: Card.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -125,8 +125,7 @@ public class Card implements CardCodes,
// Documentation inherited.
public Comparable getKey ()
{
if(_key == null)
{
if(_key == null) {
_key = new Byte(_value);
}
@@ -151,12 +150,10 @@ public class Card implements CardCodes,
*/
public boolean equals (Object other)
{
if(other instanceof Card)
{
if(other instanceof Card) {
return _value == ((Card)other)._value;
}
else
{
else {
return false;
}
}
@@ -170,22 +167,17 @@ public class Card implements CardCodes,
{
int number = getNumber();
if(number == JOKER)
{
if(number == JOKER) {
return "Jk";
}
else
{
else {
StringBuffer sb = new StringBuffer();
if(number >= 2 && number <= 9)
{
if(number >= 2 && number <= 9) {
sb.append(Integer.toString(number));
}
else
{
switch(number)
{
else {
switch(number) {
case 10: sb.append('T'); break;
case JACK: sb.append('J'); break;
case QUEEN: sb.append('Q'); break;
@@ -195,8 +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;
src/java/com/threerings/parlor/card/data/Deck.java
+7 -13
View File
@@ -1,5 +1,5 @@
//
// $Id: Deck.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $
// $Id: Deck.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -72,16 +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));
}
@@ -104,16 +101,13 @@ public class Deck implements CardCodes,
*/
public Hand dealHand (int size)
{
if(cards.size() < size)
{
if(cards.size() < size) {
return null;
}
else
{
else {
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));
cards.remove(cards.size()-1);
}
src/java/com/threerings/parlor/card/data/Hand.java
+3 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: Hand.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $
// $Id: Hand.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -57,10 +57,8 @@ public class Hand implements CardCodes,
Iterator it = cards.iterator();
while(it.hasNext())
{
if(((Card)it.next()).getSuit() == suit)
{
while(it.hasNext()) {
if(((Card)it.next()).getSuit() == suit) {
members++;
}
}